Merge branch 'pull'

10 files changed, 18 insertions, 18 deletions

diff --git a/view/admin_remoteupdate.tpl b/view/admin_remoteupdate.tpl
index 41ecfaf85..874c6e626 100755
--- a/view/admin_remoteupdate.tpl
+++ b/view/admin_remoteupdate.tpl
@@ -62,7 +62,7 @@
 	<div class="background"></div>
 	<div class="panel">
 		<div class="panel_in">
-			<h1>Friendika Update</h1>
+			<h1>Friendica Update</h1>
 			<div class="panel_text"></div>
 			<div class="panel_actions">
 				<input type="button" value="$close" class="panel_action_close">
@@ -81,7 +81,7 @@
 	{{ if $canwrite }}
 		<div class="submit"><input type="submit" name="remoteupdate" value="$submit" /></div>
 	{{ else }}
-		<h3>Your friendika installation is not writable by web server.</h3>
+		<h3>Your friendica installation is not writable by web server.</h3>
 		{{ if $canftp }}
 			<p>You can try to update via FTP</p>
 			{{ inc field_input.tpl with $field=$ftphost }}{{ endinc }}
diff --git a/view/auto_request.tpl b/view/auto_request.tpl
index 377da25c5..204fcf247 100755
--- a/view/auto_request.tpl
+++ b/view/auto_request.tpl
@@ -4,7 +4,7 @@
 <p id="dfrn-request-intro">
 $page_desc<br />
 <ul id="dfrn-request-networks">
-<li><a href="http://friendika.com" title="$friendika">$friendika</a></li>
+<li><a href="http://friendica.com" title="$friendica">$friendica</a></li>
 <li><a href="http://joindiaspora.com" title="$diaspora">$diaspora</a> $diasnote</li>
 <li><a href="http://ostatus.org" title="$public_net" >$statusnet</a></li>
 </ul>
diff --git a/view/cs/htconfig.tpl b/view/cs/htconfig.tpl
index 87ded77fd..5d116dd99 100755
--- a/view/cs/htconfig.tpl
+++ b/view/cs/htconfig.tpl
@@ -53,8 +53,8 @@ $a->config['php_path'] = '$phpath';
 
 // URL adresy globálního adresáře.
 
-$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit';
-$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search=';
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
 
 // PuSH - také zvaný jako  pubsubhubbub URL. Tímto zajistíte doručování veřejných přízpěvků stejně rychle jako těch soukromých
 
diff --git a/view/de/htconfig.tpl b/view/de/htconfig.tpl
index c535cefa6..76709ea75 100755
--- a/view/de/htconfig.tpl
+++ b/view/de/htconfig.tpl
@@ -49,8 +49,8 @@ $a->config['php_path'] = '$phpath';
 
 // Location of global directory submission page.
 
-$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit';
-$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search=';
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
 
 // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
 
diff --git a/view/dfrn_request.tpl b/view/dfrn_request.tpl
index 3f4300da6..cd98a4daa 100755
--- a/view/dfrn_request.tpl
+++ b/view/dfrn_request.tpl
@@ -4,7 +4,7 @@
 <p id="dfrn-request-intro">
 $page_desc<br />
 <ul id="dfrn-request-networks">
-<li><a href="http://friendika.com" title="$friendika">$friendika</a></li>
+<li><a href="http://friendica.com" title="$friendica">$friendica</a></li>
 <li><a href="http://joindiaspora.com" title="$diaspora">$diaspora</a> $diasnote</li>
 <li><a href="http://ostatus.org" title="$public_net" >$statusnet</a></li>
 </ul>
diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl
index 3eb2da070..9e39eeb59 100755
--- a/view/en/htconfig.tpl
+++ b/view/en/htconfig.tpl
@@ -49,8 +49,8 @@ $a->config['php_path'] = '$phpath';
 
 // Location of global directory submission page.
 
-$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit';
-$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search=';
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
 
 // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
 
diff --git a/view/es/htconfig.tpl b/view/es/htconfig.tpl
index 9f6e282ab..6158f6a33 100755
--- a/view/es/htconfig.tpl
+++ b/view/es/htconfig.tpl
@@ -49,8 +49,8 @@ $a->config['php_path'] = '$phpath';
 
 // Location of global directory submission page.
 
-$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit';
-$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search=';
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
 
 // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
 
diff --git a/view/fr/htconfig.tpl b/view/fr/htconfig.tpl
index c535cefa6..76709ea75 100755
--- a/view/fr/htconfig.tpl
+++ b/view/fr/htconfig.tpl
@@ -49,8 +49,8 @@ $a->config['php_path'] = '$phpath';
 
 // Location of global directory submission page.
 
-$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit';
-$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search=';
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
 
 // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
 
diff --git a/view/it/htconfig.tpl b/view/it/htconfig.tpl
index 9f6e282ab..6158f6a33 100755
--- a/view/it/htconfig.tpl
+++ b/view/it/htconfig.tpl
@@ -49,8 +49,8 @@ $a->config['php_path'] = '$phpath';
 
 // Location of global directory submission page.
 
-$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit';
-$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search=';
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
 
 // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
 
diff --git a/view/sv/htconfig.tpl b/view/sv/htconfig.tpl
index c535cefa6..76709ea75 100755
--- a/view/sv/htconfig.tpl
+++ b/view/sv/htconfig.tpl
@@ -49,8 +49,8 @@ $a->config['php_path'] = '$phpath';
 
 // Location of global directory submission page.
 
-$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit';
-$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search=';
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
 
 // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts