at end of day, some files probably without conflicts so far

7 files changed, 58 insertions, 2 deletions

diff --git a/view/en/invite.casual.subject.tpl b/view/en/invite.casual.subject.tpl
new file mode 100644
index 000000000..e3c7c91fc
--- /dev/null
+++ b/view/en/invite.casual.subject.tpl
@@ -0,0 +1 @@
+Please join us on {{$projectname}} {{$invite_loc}}
\ No newline at end of file
diff --git a/view/en/invite.casual.tpl b/view/en/invite.casual.tpl
new file mode 100644
index 000000000..4fd031c63
--- /dev/null
+++ b/view/en/invite.casual.tpl
@@ -0,0 +1,16 @@
+{{* tpl EN casual, to invite friendly to those knowing me *}}
+Please join my community on {{$projectname}}.
+{{$linktxt}}	{{$invite_where}}
+
+You will need to supply this invitation code: 
+	{{$invite_code}}
+
+Or:
+
+1. Register at any {{$projectname}} location 
+   (they are all inter-connected).
+2. Enter my {{$Projectname}} network address into the site searchbar.
+   {{$invite_whereami}}
+   or visit {{$invite_whoami}}
+3. Click [Connect]
+
diff --git a/view/en/invite.formal.subject.tpl b/view/en/invite.formal.subject.tpl
new file mode 100644
index 000000000..3c5a92763
--- /dev/null
+++ b/view/en/invite.formal.subject.tpl
@@ -0,0 +1 @@
+Invitation for your network access on {{$invite_loc}}
\ No newline at end of file
diff --git a/view/en/invite.formal.tpl b/view/en/invite.formal.tpl
new file mode 100644
index 000000000..5f70de00a
--- /dev/null
+++ b/view/en/invite.formal.tpl
@@ -0,0 +1,32 @@
+{{* tpl EN formal, to invite most polite, like company members or business partners *}}
+Please join the communication platform {{$projectname}} and this message contains the
+essential data for initially connecting to.
+
+The site is to arrive here: {{$invite_whereami}}
+
+Your access is just prepared with an invite code
+
+	{{$invite_code}}
+
+what please is to enter into the field of the register form, that is shown when the
+link "I have an invite code" will be clicked. Please also enter your email address
+in the next field. We want to let you know, the invite code is bound to your email
+address and not transferable.
+
+For security reasons you have to supply an account password that is and should remain
+only known by yourself. The non visible password has to be typed in twice to prevent
+mistyping. The password is required later always when you want to login on the site.
+
+Depending on the site's configuration, you may receive another email to your address
+with a validation code, that is to enter into the form such email will point to. This
+kind of some inconvience helps to grow security for the site.
+
+Depending on the site's configuration, an instance administrator finally has to 
+confirm your access. Please be patient because that will not performed immediatly
+in real time.
+
+Kind regards,
+and wish to have best success on the site.
+
+Disclaimer:
+...
\ No newline at end of file
diff --git a/view/en/invite.material.subject.tpl b/view/en/invite.material.subject.tpl
new file mode 100644
index 000000000..b74c99aa4
--- /dev/null
+++ b/view/en/invite.material.subject.tpl
@@ -0,0 +1 @@
+Invitation {{$invite_loc}}
\ No newline at end of file
diff --git a/view/en/invite.material.tpl b/view/en/invite.material.tpl
new file mode 100644
index 000000000..db1613083
--- /dev/null
+++ b/view/en/invite.material.tpl
@@ -0,0 +1 @@
+{{* tpl en material, to invite with the essential data in brief *}}
\ No newline at end of file
diff --git a/view/en/register_verify_member.tpl b/view/en/register_verify_member.tpl
index 9bdd7fa51..5db51a2e2 100644
--- a/view/en/register_verify_member.tpl
+++ b/view/en/register_verify_member.tpl
@@ -15,15 +15,19 @@ Your validation code is
 {{$hash}}
 
 
+{{if $due}}{{$due}}{{/if}} 
+
+
+
 If you registered this account, please enter the validation code when requested or visit the following link:
 
-{{$siteurl}}/regver/allow/{{$hash}} 
+{{$siteurl}}/regate/{{$mail}}
 
 
 To deny the request and remove the account, please visit:
 
 
-{{$siteurl}}/regver/deny/{{$hash}}
+{{$siteurl}}/regate/{{$mail}}{{if $ko}}/{{$ko}}{{/if}} 
 
 
 Thank you.