Merge pull request #763 from silke/master

Added link to import a profile im register tpl

mod/register.php

@@ -278,7 +278,9 @@ function register_content(&$a) {
 		'$nickname'  => $nickname,
 		'$license'   => $license,
 		'$sitename'  => $a->get_hostname(),
-      
+		'$importh'   => t('Import'),
+		'$importt'   => t('Import your profile to this friendica instance'),
+
 	));
 	return $o;
 

view/templates/register.tpl

@@ -62,7 +62,11 @@
 		<input type="submit" name="submit" id="register-submit-button" value="{{$regbutt}}" />
 	</div>
 	<div id="register-submit-end" ></div>
-    
+
+<h3>{{$importh}}</h3>
+	<div id ="import-profile">
+		<a href="/uimport">{{$importt}}</a>
+	</div>
 </form>
 
 {{$license}}