This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via ee8d4868ce56a8c787d8595c042d07e77ef76b2f (commit)
via 9068fefc2b1c6e7f3903df0de71a78096b8ea879 (commit)
via cb34f2f14a67b40644a81cb8ddb4c541c6004cc4 (commit)
via 4573bbc4c89b8cc8505d94fec14748ec35be322c (commit)
via 5bf66f046c94224d7699dde42c03ca5bb2f5cc43 (commit)
from e2c16ec549c3915b428785fac6301176679e4ab1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ee8d4868ce56a8c787d8595c042d07e77ef76b2f
Author: Sylvain Beucler <[email protected]>
Date: Mon Jun 1 10:56:06 2015 +0200
Move text change to master, to maintain strings freeze and maintain
existing translations
diff --git a/src/www/account/editsshkeys.php b/src/www/account/editsshkeys.php
index 1e2a184..b400c51 100644
--- a/src/www/account/editsshkeys.php
+++ b/src/www/account/editsshkeys.php
@@ -65,10 +65,10 @@ if (count($sshKeysArray)) {
echo $HTML->openForm(array('action' =>
util_make_uri('/account/?action=addsshkey'), 'method' => 'post', 'enctype' =>
'multipart/form-data'));
echo html_e('h2', array(), _('Add a new ssh key'));
echo html_e('p', array(), _('To avoid having to type your password every time
for your SSH developer account, you may upload your public key(s) here and they
will be placed on the server in your ~/.ssh/authorized_keys file. Uploaded SSH
keys are effective <em>immediately</em>.'));
-echo html_e('p', array(), _('To generate a public key, run the program
\'ssh-keygen\' (you can use both protocol 1 or 2). The public key will be
placed at \'~/.ssh/identity.pub\' (protocol version 1) and
\'~/.ssh/id_dsa.pub\' or \'~/.ssh/id_rsa.pub\' (protocol version 2). Read the
ssh documentation for further information on sharing keys.'));
+echo html_e('p', array(), _('To generate a public key, run the program
\'ssh-keygen\' (you can use both protocol 1 or 2). The public key will be
placed at \'~/.ssh/identity.pub\' (protocol version 1) and
\'~/.ssh/id_dsa.pub\', \'~/.ssh/id_rsa.pub\', \'~/.ssh/id_ecdsa.pub\' or
\'~/.ssh/id_ed25519.pub\' (protocol version 2). Read the ssh documentation for
further information on sharing keys.'));
echo html_e('p', array(), html_e('em', array(), _('Important: Make sure there
are no line breaks. After submitting, verify that the number of keys in your
file is what you expected.')));
echo html_e('textarea', array('rows' => 10, 'cols' => 80, 'name' =>
'authorized_key', 'style' => 'width:90%;'), '', false);
-echo html_e('p', array(), _('Or upload your \'~/.ssh/identity.pub\' (protocol
version 1) or \'~/.ssh/id_dsa.pub\' or \'~/.ssh/id_rsa.pub\' (protocol version
2)'));
+echo html_e('p', array(), _('Or upload your \'~/.ssh/identity.pub\' (protocol
version 1) or \'~/.ssh/id_dsa.pub\', \'~/.ssh/id_rsa.pub\',
\'~/.ssh/id_ecdsa.pub\' or \'~/.ssh/id_ed25519.pub\' (protocol version 2)'));
echo html_e('input', array('type' => 'file', 'name' => 'uploaded_filekey'));
echo html_e('p', array(), html_e('input', array('type' => 'submit', 'name' =>
'submit', 'value' => _('Add'))));
echo $HTML->closeForm();
commit 9068fefc2b1c6e7f3903df0de71a78096b8ea879
Merge: e2c16ec cb34f2f
Author: Sylvain Beucler <[email protected]>
Date: Mon Jun 1 10:55:17 2015 +0200
Merge branch '6.0'
-----------------------------------------------------------------------
Summary of changes:
src/AUTHORS | 1 +
src/debian/fusionforge-common.docs | 1 +
src/rpm/fusionforge.spec.in | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/AUTHORS b/src/AUTHORS
index d0d1944..d139ac1 100644
--- a/src/AUTHORS
+++ b/src/AUTHORS
@@ -39,6 +39,7 @@ Philip Schwartz
Guillaume Smet
Reinhard Spisser
Franck Villaume
+Sylvain Beucler
See also AUTHORS.gforge and AUTHORS.sourceforge for prior contributors.
diff --git a/src/debian/fusionforge-common.docs
b/src/debian/fusionforge-common.docs
index 02e838e..1122c5a 100644
--- a/src/debian/fusionforge-common.docs
+++ b/src/debian/fusionforge-common.docs
@@ -1,4 +1,5 @@
README
AUTHORS
+CHANGES
docs/README.Themes
docs/README.Plugins
diff --git a/src/rpm/fusionforge.spec.in b/src/rpm/fusionforge.spec.in
index 2541075..b50319c 100644
--- a/src/rpm/fusionforge.spec.in
+++ b/src/rpm/fusionforge.spec.in
@@ -95,7 +95,7 @@ integrated into one web site and managed through a web
interface.
This package contains files and programs used by several other
subpackages.
%files common -f common.rpmfiles -f %{name}.lang
-%doc AUTHORS* CHANGES COPYING INSTALL.TXT README
+%doc AUTHORS* CHANGES COPYING README
%doc docs/*
%doc rpm/README.fedora
%post common
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
