clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #235 from simonlnu/master 

string fix: typo. slow down scroll to top in dispys
This commit is contained in:
Simon 2012-04-14 13:25:51 -07:00
parent 6591b292a1 6278b2a923
commit 4ef5b9c4e3
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/security.php Normal file → Executable file
View File

@ -326,7 +326,7 @@ function check_form_security_token($typename = '', $formname = 'form_security_to
} }
function check_form_security_std_err_msg() { 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') { function check_form_security_token_redirectOnErr($err_redirect, $typename = '', $formname = 'form_security_token') {
if (!check_form_security_token($typename, $formname)) { if (!check_form_security_token($typename, $formname)) {

2
util/messages.po
View File

@ -6596,7 +6596,7 @@ msgstr ""
#: ../../include/security.php:329 #: ../../include/security.php:329
msgid "" msgid ""
"The form security token was not correct. This probably happened because the " "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 "" msgstr ""
#: ../../include/Contact.php:145 ../../include/conversation.php:813 #: ../../include/Contact.php:145 ../../include/conversation.php:813

2
view/de/messages.po
View File

@ -6405,7 +6405,7 @@ msgstr "Willkommen zurück "
#: ../../include/security.php:329 #: ../../include/security.php:329
msgid "" msgid ""
"The form security token was not correct. This probably happened because the " "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." 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 #: ../../include/Contact.php:137 ../../include/conversation.php:813

2
view/de/strings.php
View File

@ -1441,7 +1441,7 @@ $a->strings["image/photo"] = "Bild/Foto";
$a->strings["Welcome "] = "Willkommen "; $a->strings["Welcome "] = "Willkommen ";
$a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch."; $a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch.";
$a->strings["Welcome back "] = "Willkommen zurück "; $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 status"] = "Status anzeigen";
$a->strings["View profile"] = "Profil anzeigen"; $a->strings["View profile"] = "Profil anzeigen";
$a->strings["View photos"] = "Fotos ansehen"; $a->strings["View photos"] = "Fotos ansehen";

2
view/theme/dispy-dark/theme.php
View File

@ -120,7 +120,7 @@ function dispy_dark_init(&$a) {
}); });
$('a[href=#top]').click(function() { $('a[href=#top]').click(function() {
$('html, body').animate({scrollTop:0}, '500'); $('html, body').animate({scrollTop:0}, 'slow');
return false; return false;
}); });

2
view/theme/dispy/theme.php
View File

@ -120,7 +120,7 @@ function dispy_init(&$a) {
}); });
$('a[href=#top]').click(function() { $('a[href=#top]').click(function() {
$('html, body').animate({scrollTop:0}, '500'); $('html, body').animate({scrollTop:0}, 'slow');
return false; return false;
}); });