diff --git a/README.txt b/README.txt
index 4445b0c1e..3ea1574b6 100644
--- a/README.txt
+++ b/README.txt
@@ -6,8 +6,16 @@ To compile:
libspeex-dev libspeexdsp-dev libxslt1-dev libprotobuf-dev protobuf-compiler cmake \
libcurl4-openssl-dev
+ - create project directory (e.g. ~/retroshare) and check out the source code
+ # mkdir ~/retroshare
+ # cd ~/retroshare && svn co svn://svn.code.sf.net/p/retroshare/code/trunk trunk
+
+ - create a new directory named lib
+ # mkdir lib
+
- get source code for libssh-0.5.4, unzip it, and create build directory (if needed)
+ # cd lib
# wget https://red.libssh.org/attachments/download/41/libssh-0.5.4.tar.gz
# tar zxvf libssh-0.5.4.tar.gz
# cd libssh-0.5.4
@@ -15,16 +23,44 @@ To compile:
# cd build
# cmake -DWITH_STATIC_LIB=ON ..
# make
- # cd ../..
-
- - go to retroshare-nogui, and compile it
+ # cd ../../..
- # cd ../../retroshare-nogui
- # qmake
+ - get source code for sqlcipher, and build it (only needed for GXS)
+
+ # cd lib
+ # git clone git://github.com/sqlcipher/sqlcipher.git
+ # cd sqlcipher
+ # ./configure --enable-tempstore=yes CFLAGS="-DSQLITE_HAS_CODEC" \
+ LDFLAGS="-lcrypto"
# make
+ # cd ..
+
+ - go to your svn base directory
+ # cd trunk
+
+ - go to libbitdht and compile it
+ # cd libbitdht/src && qmake && make clean && make -j 4
+
+ - go to openpgpsdk and compile it
+ # cd ../../openpgpsdk/src && qmake && make clean && make -j 4
+
+ - go to supportlibs and compile it
+ # cd ../../supportlibs/pegmarkdown && qmake && make clean && make -j 4
+
+ - go to libretroshare and compile it
+ # cd ../../libretroshare/src && qmake && make clean && make -j 4
+
+ - go to rsctrl and compile it
+ # cd ../../rsctrl/src && make &&
+
+ - go to retroshare-nogui, and compile it
+ # cd ../../retroshare-nogui/src && qmake && make clean && make -j 4
+
+ - go to retroshare gui and compile it
+ # cd ../../retroshare-gui/src && qmake && make clean && make -j 4
+
+ - to use the SSH RS server (nogui):
- - to use the SSH RS server:
-
# ssh-keygen -t rsa -f rs_ssh_host_rsa_key # this makes a RSA
# ./retroshare-nogui -G # generates a login+passwd hash for the RSA key used.
# ./retroshare-nogui -S 7022 -U[SSLid] -P [Passwd hash]
diff --git a/retroshare-gui/src/lang/retroshare_en.ts b/retroshare-gui/src/lang/retroshare_en.ts
index 68074708f..a7deaff37 100644
--- a/retroshare-gui/src/lang/retroshare_en.ts
+++ b/retroshare-gui/src/lang/retroshare_en.ts
@@ -1380,6 +1380,14 @@ Double click lobbies to enter and chat.
%1 invites you to chat lobby named %2
+
+ Remove Auto Subscribe
+
+
+
+ Add Auto Subscribe
+
+ ChatMsgItem
@@ -2141,6 +2149,14 @@ Some services (Discovery, anonymous routing) can be switched off globally, which
<html><head/><body><p align="justify">Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you're downloading the file.</p><p align="justify">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's file list. </p></body></html>
+
+ Encryption
+
+
+
+ Not connected
+
+ ConnectFriendWizard
@@ -3722,22 +3738,6 @@ p, li { white-space: pre-wrap; }
Private chat invite created
-
- Messenging invite creation failed
-
-
-
- The creation of the messenging invite failed
-
-
-
- Messenging invite created
-
-
-
- Your new messenging chat invite has been copied to clipboard. You can now paste it as a Retroshare link.
-
- Create distant chat invite
@@ -3750,6 +3750,22 @@ p, li { white-space: pre-wrap; }
Your new chat invite has been created. You can now copy/paste it as a Retroshare link.
+
+ Messaging invite creation failed
+
+
+
+ The creation of the messaging invite failed
+
+
+
+ Messaging invite created
+
+
+
+ Your new messaging chat invite has been copied to clipboard. You can now paste it as a Retroshare link.
+
+ CryptoPage
@@ -6993,6 +7009,21 @@ before you can comment
+
+ GxsIdChooser
+
+ Loading
+
+
+
+ Not found
+
+
+
+ No Signature
+
+
+HashBox
@@ -10626,14 +10657,6 @@ Reported error is: %2
Select who can contact you:
-
- Messenging link is expired
-
-
-
- This Messenging link is expired. The destination peer will not receive it.
-
- Chat link is expired
@@ -10646,10 +10669,6 @@ Reported error is: %2
Chat link cannot be decrypted
-
- This chat link is encrypted with a key that is not yours. You can't used it. Key ID =
-
- The link could not be decrypted.
@@ -10662,10 +10681,6 @@ Reported error is: %2
The link is signed by an unknown key.
-
- Chat connexion is not possible
-
- Hash error
@@ -10686,6 +10701,22 @@ Reported error is: %2
Secured tunnel is working
+
+ Messaging link is expired
+
+
+
+ This Messaging link is expired. The destination peer will not receive it.
+
+
+
+ This chat link is encrypted with a key that is not yours. You can't use it. Key ID =
+
+
+
+ Chat connection is not possible
+
+ QuickStartWizard