aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/auto_request.tpl2
-rw-r--r--view/de/messages.po2
-rw-r--r--view/de/strings.php2
-rw-r--r--view/dfrn_request.tpl2
-rw-r--r--view/theme/dispy-dark/theme.php2
-rw-r--r--view/theme/dispy/theme.php2
6 files changed, 6 insertions, 6 deletions
diff --git a/view/auto_request.tpl b/view/auto_request.tpl
index 2958397c9..961de9bb3 100644
--- a/view/auto_request.tpl
+++ b/view/auto_request.tpl
@@ -7,7 +7,7 @@ $page_desc<br />
<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>
-<li>$emailnet</li>
+{{ if $emailnet }}<li>$emailnet</li>{{ endif }}
</ul>
</p>
<p>
diff --git a/view/de/messages.po b/view/de/messages.po
index 87994b980..c834ec328 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -6405,7 +6405,7 @@ msgstr "Willkommen zurück "
#: ../../include/security.php:329
msgid ""
"The form security token was not correct. This probably happened because the "
-"form has been opened for too long (>3 hours) before subitting it."
+"form has been opened for too long (>3 hours) before submitting it."
msgstr "Der Formular-Sicherheits-Token war nicht korrekt. Der Grund ist wahrscheinlich, dass das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde."
#: ../../include/Contact.php:137 ../../include/conversation.php:813
diff --git a/view/de/strings.php b/view/de/strings.php
index a68a77a75..6a43f049e 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -1441,7 +1441,7 @@ $a->strings["image/photo"] = "Bild/Foto";
$a->strings["Welcome "] = "Willkommen ";
$a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch.";
$a->strings["Welcome back "] = "Willkommen zurück ";
-$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before subitting it."] = "Der Formular-Sicherheits-Token war nicht korrekt. Der Grund ist wahrscheinlich, dass das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde.";
+$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Der Formular-Sicherheits-Token war nicht korrekt. Der Grund ist wahrscheinlich, dass das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde.";
$a->strings["View status"] = "Status anzeigen";
$a->strings["View profile"] = "Profil anzeigen";
$a->strings["View photos"] = "Fotos ansehen";
diff --git a/view/dfrn_request.tpl b/view/dfrn_request.tpl
index d8aa8b181..bd3bcbc42 100644
--- a/view/dfrn_request.tpl
+++ b/view/dfrn_request.tpl
@@ -7,7 +7,7 @@ $page_desc<br />
<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>
-<li>$emailnet</li>
+{{ if $emailnet }}<li>$emailnet</li>{{ endif }}
</ul>
$invite_desc
</p>
diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php
index affffc9cb..d5d489be2 100644
--- a/view/theme/dispy-dark/theme.php
+++ b/view/theme/dispy-dark/theme.php
@@ -120,7 +120,7 @@ function dispy_dark_init(&$a) {
});
$('a[href=#top]').click(function() {
- $('html, body').animate({scrollTop:0}, '500');
+ $('html, body').animate({scrollTop:0}, 'slow');
return false;
});
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index 8af61d78b..edc9b9548 100644
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -120,7 +120,7 @@ function dispy_init(&$a) {
});
$('a[href=#top]').click(function() {
- $('html, body').animate({scrollTop:0}, '500');
+ $('html, body').animate({scrollTop:0}, 'slow');
return false;
});