diff options
| author | Michael <icarus@dabo.de> | 2012-02-23 20:53:22 +0100 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-02-23 20:53:22 +0100 |
| commit | 0409b5cdba003b6ce90d5ad0181e81c06af95ab1 (patch) | |
| tree | c677adb7c0e8140bdb1e115a95d1aa23fdf734ed /view/admin_remoteupdate.tpl | |
| parent | 311e35731c52102cbce3befc6343f179080ad38c (diff) | |
| parent | 8cacff69858c2ad097bafb80c93405e79c311edf (diff) | |
| download | volse-hubzilla-0409b5cdba003b6ce90d5ad0181e81c06af95ab1.tar.gz volse-hubzilla-0409b5cdba003b6ce90d5ad0181e81c06af95ab1.tar.bz2 volse-hubzilla-0409b5cdba003b6ce90d5ad0181e81c06af95ab1.zip | |
Merge remote branch 'upstream/master'
Conflicts:
include/bbcode.php
Diffstat (limited to 'view/admin_remoteupdate.tpl')
| -rwxr-xr-x | view/admin_remoteupdate.tpl | 4 |
1 files changed, 2 insertions, 2 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 }} |