Merge remote-tracking branch 'upstream/master'

diff --git a/view/en/register_adminadd_eml.tpl b/view/en/register_adminadd_eml.tpl
new file mode 100644 (file)
index 0000000..6d32480
--- /dev/null
+++ b/view/en/register_adminadd_eml.tpl
@@ -0,0 +1,32 @@
+Dear {{$username}},
+       the administrator of {{$sitename}} has set up an account for you.
+
+The login details are as follows:
+
+
+Site Location: {{$siteurl}}
+Login Name:    {{$email}}
+Password:      {{$password}}
+
+You may change your password from your account "Settings" page after logging 
+in.
+
+Please take a few moments to review the other account settings on that page.
+
+You may also wish to add some basic information to your default profile 
+(on the "Profiles" page) so that other people can easily find you.
+
+We recommend setting your full name, adding a profile photo,
+adding some profile "keywords" (very useful in making new friends) - and 
+perhaps what country you live in; if you do not wish to be more specific
+than that.
+
+We fully respect your right to privacy, and none of these items are necessary. 
+If you are new and do not know anybody here, they may help
+you to make some new and interesting friends.  
+
+
+Thank you and welcome to {{$sitename}}.
+
+Sincerely,
+       {{$sitename}} Administrator

diff --git a/view/pt-br/messages.po b/view/pt-br/messages.po
index 2c15e370e1d9813d27c5fa1e8346c46d17c39788..3089e54f50a337f44ecdc40441fe1bba05dcbf3b 100644 (file)
--- a/view/pt-br/messages.po
+++ b/view/pt-br/messages.po
@@ -20,7 +20,7 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
 "POT-Creation-Date: 2013-06-26 00:01-0700\n"
-"PO-Revision-Date: 2013-07-02 12:59+0000\n"
+"PO-Revision-Date: 2013-08-06 15:04+0000\n"
 "Last-Translator: Frederico Aracnus <frederico@teia.bio.br>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/friendica/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"

diff --git a/view/smarty3/register_adminadd_eml.tpl b/view/smarty3/register_adminadd_eml.tpl
deleted file mode 100644 (file)
index 6d32480..0000000
--- a/view/smarty3/register_adminadd_eml.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-Dear {{$username}},
-       the administrator of {{$sitename}} has set up an account for you.
-
-The login details are as follows:
-
-
-Site Location: {{$siteurl}}
-Login Name:    {{$email}}
-Password:      {{$password}}
-
-You may change your password from your account "Settings" page after logging 
-in.
-
-Please take a few moments to review the other account settings on that page.
-
-You may also wish to add some basic information to your default profile 
-(on the "Profiles" page) so that other people can easily find you.
-
-We recommend setting your full name, adding a profile photo,
-adding some profile "keywords" (very useful in making new friends) - and 
-perhaps what country you live in; if you do not wish to be more specific
-than that.
-
-We fully respect your right to privacy, and none of these items are necessary. 
-If you are new and do not know anybody here, they may help
-you to make some new and interesting friends.  
-
-
-Thank you and welcome to {{$sitename}}.
-
-Sincerely,
-       {{$sitename}} Administrator