rev update
This commit is contained in:
friendica
parent
cd109b5adf
commit
c2af97ef61
5 changed files with 29 additions and 27 deletions
2
boot.php
2
boot.php
|
|
@ -11,7 +11,7 @@ require_once('include/cache.php');
|
|||
require_once('library/Mobile_Detect/Mobile_Detect.php');
|
||||
|
||||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||
define ( 'FRIENDICA_VERSION', '3.0.1471' );
|
||||
define ( 'FRIENDICA_VERSION', '3.0.1473' );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
||||
define ( 'DB_UPDATE_VERSION', 1156 );
|
||||
|
||||
|
|
|
|||
|
|
@ -247,6 +247,8 @@ function register_content(&$a) {
|
|||
|
||||
call_hooks('register_form',$arr);
|
||||
|
||||
$o = $arr['template'];
|
||||
|
||||
$o = replace_macros($o, array(
|
||||
'$oidhtml' => $oidhtml,
|
||||
'$invitations' => get_config('system','invitation_only'),
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@
|
|||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: 3.0.1471\n"
|
||||
"Project-Id-Version: 3.0.1473\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2012-09-19 10:00-0700\n"
|
||||
"POT-Creation-Date: 2012-09-21 10:00-0700\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
|
@ -3048,38 +3048,38 @@ msgstr ""
|
|||
msgid "Include your profile in member directory?"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/register.php:253
|
||||
#: ../../mod/register.php:255
|
||||
msgid "Membership on this site is by invitation only."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/register.php:254
|
||||
#: ../../mod/register.php:256
|
||||
msgid "Your invitation ID: "
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/register.php:257 ../../mod/admin.php:444
|
||||
#: ../../mod/register.php:259 ../../mod/admin.php:444
|
||||
msgid "Registration"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/register.php:265
|
||||
#: ../../mod/register.php:267
|
||||
msgid "Your Full Name (e.g. Joe Smith): "
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/register.php:266
|
||||
#: ../../mod/register.php:268
|
||||
msgid "Your Email Address: "
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/register.php:267
|
||||
#: ../../mod/register.php:269
|
||||
msgid ""
|
||||
"Choose a profile nickname. This must begin with a text character. Your "
|
||||
"profile address on this site will then be '<strong>nickname@$sitename</"
|
||||
"strong>'."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/register.php:268
|
||||
#: ../../mod/register.php:270
|
||||
msgid "Choose a nickname: "
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/register.php:271 ../../include/nav.php:81 ../../boot.php:887
|
||||
#: ../../mod/register.php:273 ../../include/nav.php:81 ../../boot.php:887
|
||||
msgid "Register"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -7852,7 +7852,7 @@ msgstr ""
|
|||
msgid "Sharing notification from Diaspora network"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/diaspora.php:2202
|
||||
#: ../../include/diaspora.php:2211
|
||||
msgid "Attachments:"
|
||||
msgstr ""
|
||||
|
||||
|
|
|
|||
|
|
@ -1,22 +1,22 @@
|
|||
|
||||
Dear $[username],
|
||||
Dear $username,
|
||||
|
||||
Great news... '$[fn]' at '$[dfrn_url]' has accepted
|
||||
your connection request at '$[sitename]'.
|
||||
Great news... '$fn' at '$dfrn_url' has accepted
|
||||
your connection request at '$sitename'.
|
||||
|
||||
You are now mutual friends and may exchange status updates, photos, and email
|
||||
without restriction.
|
||||
|
||||
Please visit your 'Contacts' page at $[sitename] if you wish to make
|
||||
Please visit your 'Contacts' page at $sitename if you wish to make
|
||||
any changes to this relationship.
|
||||
|
||||
$[siteurl]
|
||||
$siteurl
|
||||
|
||||
[For instance, you may create a separate profile with information that is not
|
||||
available to the general public - and assign viewing rights to '$[fn]'].
|
||||
available to the general public - and assign viewing rights to '$fn'].
|
||||
|
||||
Sincerely,
|
||||
|
||||
$[sitename] Administrator
|
||||
$sitename Administrator
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,22 +1,22 @@
|
|||
|
||||
Dear $[username],
|
||||
Dear $username,
|
||||
|
||||
'$[fn]' at '$[dfrn_url]' has accepted
|
||||
your connection request at '$[sitename]'.
|
||||
'$fn' at '$dfrn_url' has accepted
|
||||
your connection request at '$sitename'.
|
||||
|
||||
'$[fn]' has chosen to accept you a "fan", which restricts
|
||||
'$fn' has chosen to accept you a "fan", which restricts
|
||||
some forms of communication - such as private messaging and some profile
|
||||
interactions. If this is a celebrity or community page, these settings were
|
||||
applied automatically.
|
||||
|
||||
'$[fn]' may choose to extend this into a two-way or more permissive
|
||||
'$fn' may choose to extend this into a two-way or more permissive
|
||||
relationship in the future.
|
||||
|
||||
You will start receiving public status updates from '$[fn]',
|
||||
You will start receiving public status updates from '$fn',
|
||||
which will appear on your 'Network' page at
|
||||
|
||||
$[siteurl]
|
||||
$siteurl
|
||||
|
||||
Sincerely,
|
||||
|
||||
$[sitename] Administrator
|
||||
$sitename Administrator
|
||||
|
|
|
|||
Loading…
Reference in a new issue