Merge pull request #235 from simonlnu/master

string fix: typo. slow down scroll to top in dispys

6 files changed, 7 insertions, 7 deletions

diff --git a/include/security.php b/include/security.php
index 66622fd33..fc816e5d7 100644..100755
--- a/include/security.php
+++ b/include/security.php
@@ -326,7 +326,7 @@ function check_form_security_token($typename = '', $formname = 'form_security_to
 }
 
 function check_form_security_std_err_msg() {
-	return t('The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before subitting it.') . EOL;
+	return t('The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it.') . EOL;
 }
 function check_form_security_token_redirectOnErr($err_redirect, $typename = '', $formname = 'form_security_token') {
 	if (!check_form_security_token($typename, $formname)) {
@@ -344,4 +344,4 @@ function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'f
 		header('HTTP/1.1 403 Forbidden');
 		killme();
 	}
-}
\ No newline at end of file
+}
diff --git a/util/messages.po b/util/messages.po
index d09b1cfc0..b61581587 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6596,7 +6596,7 @@ msgstr ""
 #: ../../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 ""
 
 #: ../../include/Contact.php:145 ../../include/conversation.php:813
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/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;
 		});