From 5b0611ded93aed1023aa9ea86defbdfecd7c5323 Mon Sep 17 00:00:00 2001 From: Theo Chatzimichos Date: Thu, 10 Mar 2011 01:34:51 +0200 Subject: Update limit-login-attempts and smart-youtube --- .../limit-login-attempts-nl_NL.po | 134 ++++++++--------- .../limit-login-attempts-sv_SE.mo | Bin 5524 -> 5385 bytes .../limit-login-attempts-sv_SE.po | 143 +++++++++--------- .../limit-login-attempts/limit-login-attempts.php | 91 +++++++++++- .../limit-login-attempts/limit-login-attempts.pot | 161 +++++++++------------ plugins/limit-login-attempts/readme.txt | 15 +- plugins/smart-youtube/readme.txt | 5 +- plugins/smart-youtube/smartyoutube.class.php | 4 +- plugins/smart-youtube/smartyoutube.php | 2 +- 9 files changed, 306 insertions(+), 249 deletions(-) (limited to 'plugins') diff --git a/plugins/limit-login-attempts/limit-login-attempts-nl_NL.po b/plugins/limit-login-attempts/limit-login-attempts-nl_NL.po index 59841f63..07ad4eeb 100755 --- a/plugins/limit-login-attempts/limit-login-attempts-nl_NL.po +++ b/plugins/limit-login-attempts/limit-login-attempts-nl_NL.po @@ -1,223 +1,223 @@ -# Limit Login Attempts Swedish Translation +# Limit Login Attempts German Translation # Copyright (C) 2009 Johan Eenfeldt # This file is distributed under the same license as the Wordpress package. # Johan Eenfeldt , 2009. # msgid "" msgstr "" -"Project-Id-Version: limit-login-attempts 1.2\n" +"Project-Id-Version: limit-login-attempts 1.3\n" "Report-Msgid-Bugs-To: http://wordpress.org/tag/limit-login-attempts\n" "POT-Creation-Date: 2009-01-28 17:17+0000\n" -"PO-Revision-Date: 2009-07-15 13:14+0100\n" -"Last-Translator: Rune G \n" -"Language-Team: DigitalHverdag \n" +"PO-Revision-Date: 2010-03-19 13:52+0100\n" +"Last-Translator: BjornW \n" +"Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Poedit-Language: Norwegian Bokmal\n" -"X-Poedit-Country: NORWAY\n" +"X-Poedit-Language: German\n" +"X-Poedit-Country: GERMANY\n" #: limit-login-attempts.php:372 #, php-format msgid "%d hour" msgid_plural "%d hours" -msgstr[0] "%d time" -msgstr[1] "%d timer" +msgstr[0] "%d uur" +msgstr[1] "%d uren" #: limit-login-attempts.php:378 #, php-format msgid "%d minute" msgid_plural "%d minutes" -msgstr[0] "%d minutt" -msgstr[1] "%d minutter" +msgstr[0] "%d minute" +msgstr[1] "%d minuten" #: limit-login-attempts.php:381 #, php-format msgid "[%s] Too many failed login attempts" -msgstr "[%s] For mange påloggingsforsøk" +msgstr "[%s] Teveel gefaalde login pogingen" #: limit-login-attempts.php:383 #, php-format msgid "%d failed login attempts (%d lockout(s)) from IP: %s" -msgstr "%d påloggingsforsøk (stoppet %d gang(er)) fra IP: %s" +msgstr "%d gefaalde login pogingen (%d blokkades) van IP: %s" #: limit-login-attempts.php:387 #, php-format msgid "Last user attempted: %s" -msgstr "Siste brukernavn som feilet : %s" +msgstr "Laatste inlogpoging werd gedaan met de gebruikersnaam: %s" #: limit-login-attempts.php:390 #, php-format msgid "IP was blocked for %s" -msgstr "IP blokkert i %s" +msgstr "IP was geblokkeerd voor %s." #: limit-login-attempts.php:445 msgid "ERROR: Too many failed login attempts." -msgstr "Feil: For mange påloggingsforsøk." +msgstr "FOUT: Teveel gefaalde inlogpogingen." #: limit-login-attempts.php:449 msgid "Please try again later." -msgstr "Prøv igjen senere" +msgstr "Probeer het later nogmaals" #: limit-login-attempts.php:456 #, php-format msgid "Please try again in %d hour." msgid_plural "Please try again in %d hours." -msgstr[0] "Prøv igjen om %d time." -msgstr[1] "Prøv igjen om %d timer." +msgstr[0] ".Probeer het over %d uur nogmaals." +msgstr[1] "Probeer het over %d uren nogmaals." #: limit-login-attempts.php:458 #, php-format msgid "Please try again in %d minute." msgid_plural "Please try again in %d minutes." -msgstr[0] "Prøv igjen om %d minutt." -msgstr[1] "Prøv igjen om %d minutter." +msgstr[0] "Probeer het over %d minuut nogmaals" +msgstr[1] "Probeer het over %d minuten nogmaals." #: limit-login-attempts.php:487 #, php-format msgid "%d attempt remaining." msgid_plural "%d attempts remaining." -msgstr[0] "%d forsøk gjenstår." -msgstr[1] "%d forsøk gjenstår." +msgstr[0] "Nog %d loginpoging mogelijk." +msgstr[1] "Nog %d loginpogingen mogelijk." #: limit-login-attempts.php:551 msgid "ERROR: Incorrect username or password." -msgstr "Feil: Feil brukernavn eller passord." +msgstr "FOUT: Ongeldige gebruikersnaam of wachtwoord." #: limit-login-attempts.php:714 msgid "IP|Internet address" -msgstr "IP" +msgstr "IP|Internet adres" #: limit-login-attempts.php:714 msgid "Tried to log in as" -msgstr "Prøvde å logge inn som" +msgstr "Inlogpoging als" #: limit-login-attempts.php:719 #, php-format msgid "%d lockout" msgid_plural "%d lockouts" -msgstr[0] "%d blokkering" -msgstr[1] "%d blokkeringer" +msgstr[0] "%d Blokkade" +msgstr[1] "%d Blokkades" #: limit-login-attempts.php:743 msgid "Cleared IP log" -msgstr "Nullstill IP loggen" +msgstr "IP log is gewist" #: limit-login-attempts.php:751 msgid "Reset lockout count" -msgstr "Nullstill antall blokkeringer" +msgstr "Reset blokkades teller" #: limit-login-attempts.php:759 msgid "Cleared current lockouts" -msgstr "Fjernet gjeldende blokkeringer" +msgstr "Actieve blokkades zijn gewist" #: limit-login-attempts.php:788 msgid "Options changed" -msgstr "Innstillinger endret" +msgstr "Instellingen zijn gewijzigd" #: limit-login-attempts.php:799 msgid "NOTE: Only works in Wordpress 2.7 or later" -msgstr "NB: Du må bruker WordPress 2.7 eller nyere" +msgstr "NB: Werkt alleen vanaf Wordpress 2.7 of hogere versie nummers" #: limit-login-attempts.php:815 #, php-format msgid "It appears the site is reached directly (from your IP: %s)" -msgstr "Det ser ut som om du kan nå bloggen direkte (fra din IP: %s)" +msgstr "Het lijkt erop dat de site direct te bereiken is (van uw IP-adres: %s)" #: limit-login-attempts.php:817 #, php-format msgid "It appears the site is reached through a proxy server (proxy IP: %s, your IP: %s)" -msgstr "Det ser ut som om bloggen din er bak en proxy server (proxy IP: %s, din IP: %s)" +msgstr "Het lijkt erop dat de site te bereiken is via een proxy server, (Proxy Server IP adres: %s, Uw IP-adres: %s)" #: limit-login-attempts.php:825 #, php-format msgid "Current setting appears to be invalid. Please make sure it is correct. Further information can be found here" -msgstr "Dine innstillinger kan være feil. Sjekk at de er korrekte. Mer informasjon her" +msgstr "De huidige instelling lijkt ongeldig te zijn. Pas deze zo aan dat deze wel geldig is, informatie over hoe u dit kunt doen kunt u vinden in de FAQ (in het Engels)." #: limit-login-attempts.php:833 msgid "Limit Login Attempts Settings" -msgstr "Limit Login Attempts Innstillinger" +msgstr "Limit Login Attempts Instellingen" #: limit-login-attempts.php:834 msgid "Statistics" -msgstr "Statistikk" +msgstr "Statistieken" #: limit-login-attempts.php:838 msgid "Total lockouts" -msgstr "Totalt antall blokkeringer" +msgstr "Totaal aantal blokkades" #: limit-login-attempts.php:841 msgid "Reset Counter" -msgstr "Nullstill teller" +msgstr "Teller resetten" #: limit-login-attempts.php:842 #, php-format msgid "%d lockout since last reset" msgid_plural "%d lockouts since last reset" -msgstr[0] "%d blokkering siden siste nullstilling" -msgstr[1] "%d blokkeringer siden siste nullstilling" +msgstr[0] "%d Blokkade sinds de laatste reset" +msgstr[1] "%d Blokkades sinds de laatste reset" #: limit-login-attempts.php:843 msgid "No lockouts yet" -msgstr "Ingen blokkeringer enda" +msgstr "Nog geen blokkades actief" #: limit-login-attempts.php:848 msgid "Active lockouts" -msgstr "Aktive blokkeringer" +msgstr "Actieve blokkades" #: limit-login-attempts.php:850 msgid "Restore Lockouts" -msgstr "Fjern blokkeringer" +msgstr "Blokkades opheffen" #: limit-login-attempts.php:851 #, php-format msgid "%d IP is currently blocked from trying to log in" -msgstr "%d IP står på blokkeringslisten" +msgstr "%d IP is op dit moment voor inloggen geblokkeerd" #: limit-login-attempts.php:857 msgid "Options" -msgstr "Innstillinger" +msgstr "Instellingen" #: limit-login-attempts.php:861 msgid "Lockout" -msgstr "Blokkering" +msgstr "Blokkade" #: limit-login-attempts.php:863 msgid "allowed retries" -msgstr "Antall påloggingsforsøk" +msgstr "mogelijke inlogpogingen" #: limit-login-attempts.php:864 msgid "minutes lockout" -msgstr "minutters blokkering" +msgstr "Aantal minuten geblokkeerd na een gefaalde inlogpoging" #: limit-login-attempts.php:865 msgid "lockouts increase lockout time to" -msgstr "Blokkeringer øker blokkeringstiden til" +msgstr "Blokkades verhogen de blokkade tijd naar" #: limit-login-attempts.php:865 msgid "hours" -msgstr "timer" +msgstr "uren" #: limit-login-attempts.php:866 msgid "hours until retries are reset" -msgstr "timer til nullstilling" +msgstr "aantal uren voordat het aantal ondernomen pogingen wordt gereset" #: limit-login-attempts.php:870 msgid "Site connection" -msgstr "Blogg forbindelse" +msgstr "Verbinding naar deze website" #: limit-login-attempts.php:876 msgid "Direct connection" -msgstr "Direkte forbindelse" +msgstr "Directe verbinding" #: limit-login-attempts.php:881 msgid "From behind a reversy proxy" -msgstr "Bak en omvendt proxy" +msgstr "Via een reverse-proxy" #: limit-login-attempts.php:887 msgid "Handle cookie login" -msgstr "Behandle pålogginger med cookies" +msgstr "Omgaan met cookie loginverzoeken" #: limit-login-attempts.php:889 msgid "Yes" @@ -225,39 +225,39 @@ msgstr "Ja" #: limit-login-attempts.php:889 msgid "No" -msgstr "Nei" +msgstr "Nee" #: limit-login-attempts.php:894 msgid "Notify on lockout" -msgstr "Gi melding om blokkering" +msgstr "Waarschuwen in het geval van een blokkade" #: limit-login-attempts.php:896 msgid "Log IP" -msgstr "Logg IP" +msgstr "Log IP adres" #: limit-login-attempts.php:897 msgid "Email to admin after" -msgstr "Send epost til admin etter" +msgstr "Email de beheerder na" #: limit-login-attempts.php:897 msgid "lockouts" -msgstr "blokkeringer" +msgstr "Blokkades" #: limit-login-attempts.php:902 msgid "Change Options" -msgstr "Endre innstillinger" +msgstr "Instellingen aanpassen" #: limit-login-attempts.php:910 msgid "Lockout log" -msgstr "Blokkerings logg" +msgstr "Log van blokkades" #: limit-login-attempts.php:914 msgid "Clear Log" -msgstr "Nullstill loggen" +msgstr "Log wissen" #. Plugin Name of an extension msgid "Limit Login Attempts" -msgstr "Begrense påloggingsforsøk" +msgstr "Limit Login Attempts" #. Plugin URI of an extension msgid "http://devel.kostdoktorn.se/limit-login-attempts" @@ -265,7 +265,7 @@ msgstr "http://devel.kostdoktorn.se/limit-login-attempts" #. Description of an extension msgid "Limit rate of login attempts, including by way of cookies, for each IP." -msgstr "Begrenser antall påloggingsforsøk, inkludert forsøk med cookies, for alle IPer" +msgstr "Beperkt het aantal inlogpogingen, inclusief bij het gebruik van cookies, voor elk IP adres." #. Author of an extension msgid "Johan Eenfeldt" diff --git a/plugins/limit-login-attempts/limit-login-attempts-sv_SE.mo b/plugins/limit-login-attempts/limit-login-attempts-sv_SE.mo index 34484239..472bdc24 100644 Binary files a/plugins/limit-login-attempts/limit-login-attempts-sv_SE.mo and b/plugins/limit-login-attempts/limit-login-attempts-sv_SE.mo differ diff --git a/plugins/limit-login-attempts/limit-login-attempts-sv_SE.po b/plugins/limit-login-attempts/limit-login-attempts-sv_SE.po index 17fc935b..65335770 100755 --- a/plugins/limit-login-attempts/limit-login-attempts-sv_SE.po +++ b/plugins/limit-login-attempts/limit-login-attempts-sv_SE.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: limit-login-attempts 1.2\n" "Report-Msgid-Bugs-To: http://wordpress.org/tag/limit-login-attempts\n" -"POT-Creation-Date: 2009-01-28 17:17+0000\n" -"PO-Revision-Date: 2009-01-28 18:25+0100\n" +"POT-Creation-Date: 2011-02-17 15:08:09+00:00\n" +"PO-Revision-Date: 2011-02-17 16:15+0100\n" "Last-Translator: Johan Eenfeldt \n" "Language-Team: Swedish\n" "MIME-Version: 1.0\n" @@ -16,260 +16,247 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: limit-login-attempts.php:372 -#, php-format +#: limit-login-attempts.php:474 msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d timme" msgstr[1] "%d timmar" -#: limit-login-attempts.php:378 -#, php-format +#: limit-login-attempts.php:480 msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minut" msgstr[1] "%d minuter" -#: limit-login-attempts.php:381 -#, php-format +#: limit-login-attempts.php:485 msgid "[%s] Too many failed login attempts" msgstr "[%s] För många misslyckade inloggningar" -#: limit-login-attempts.php:383 -#, php-format +#: limit-login-attempts.php:487 msgid "%d failed login attempts (%d lockout(s)) from IP: %s" msgstr "%d misslyckade inloggningar (blockad %d gång(er)) från IP: %s" -#: limit-login-attempts.php:387 -#, php-format +#: limit-login-attempts.php:491 msgid "Last user attempted: %s" msgstr "Misslyckades senast med användare : %s" -#: limit-login-attempts.php:390 -#, php-format +#: limit-login-attempts.php:494 msgid "IP was blocked for %s" msgstr "IP blockerades i %s" -#: limit-login-attempts.php:445 +#: limit-login-attempts.php:551 msgid "ERROR: Too many failed login attempts." msgstr "Fel: För många misslyckade försök." -#: limit-login-attempts.php:449 +#: limit-login-attempts.php:555 msgid "Please try again later." msgstr "Försök igen senare." -#: limit-login-attempts.php:456 -#, php-format +#: limit-login-attempts.php:562 msgid "Please try again in %d hour." msgid_plural "Please try again in %d hours." msgstr[0] "Försök igen om %d timme." msgstr[1] "Försök igen om %d timmar." -#: limit-login-attempts.php:458 -#, php-format +#: limit-login-attempts.php:564 msgid "Please try again in %d minute." msgid_plural "Please try again in %d minutes." msgstr[0] "Försök igen om %d minut." msgstr[1] "Försök igen om %d minuter." -#: limit-login-attempts.php:487 -#, php-format +#: limit-login-attempts.php:593 msgid "%d attempt remaining." msgid_plural "%d attempts remaining." msgstr[0] "%d försök återstår." msgstr[1] "%d försök återstår." -#: limit-login-attempts.php:551 +#: limit-login-attempts.php:658 msgid "ERROR: Incorrect username or password." msgstr "Fel: Felaktigt användarnamn eller lösenord." -#: limit-login-attempts.php:714 -msgid "IP|Internet address" +#: limit-login-attempts.php:826 +msgctxt "Internet address" +msgid "IP" msgstr "IP" -#: limit-login-attempts.php:714 +#: limit-login-attempts.php:826 msgid "Tried to log in as" msgstr "Försökte logga in som" -#: limit-login-attempts.php:719 -#, php-format +#: limit-login-attempts.php:831 msgid "%d lockout" msgid_plural "%d lockouts" msgstr[0] "%d blockering" msgstr[1] "%d blockeringar" -#: limit-login-attempts.php:743 +#: limit-login-attempts.php:860 msgid "Cleared IP log" msgstr "Rensade IP loggen" -#: limit-login-attempts.php:751 +#: limit-login-attempts.php:868 msgid "Reset lockout count" msgstr "Nollställde räknaren för blockeringar" -#: limit-login-attempts.php:759 +#: limit-login-attempts.php:876 msgid "Cleared current lockouts" msgstr "Tog bort aktuella blockeringar" -#: limit-login-attempts.php:788 +#: limit-login-attempts.php:905 msgid "Options changed" msgstr "Inställningar ändrade" -#: limit-login-attempts.php:799 -msgid "NOTE: Only works in Wordpress 2.7 or later" -msgstr "OBS: Fungerar endast i WordPress 2.7 eller senare" - -#: limit-login-attempts.php:815 -#, php-format +#: limit-login-attempts.php:923 msgid "It appears the site is reached directly (from your IP: %s)" msgstr "Sajten tycks vara direktansluten (från din IP: %s)" -#: limit-login-attempts.php:817 -#, php-format +#: limit-login-attempts.php:925 msgid "It appears the site is reached through a proxy server (proxy IP: %s, your IP: %s)" msgstr "Sajten tycks ansluta genom en proxy server (proxy IP: %s, din IP: %s)" -#: limit-login-attempts.php:825 -#, php-format +#: limit-login-attempts.php:933 msgid "Current setting appears to be invalid. Please make sure it is correct. Further information can be found here" msgstr "Nuvarande inställningar kan vara fel. Säkerställ att de är korrekta. Mer information kan hittas här" -#: limit-login-attempts.php:833 +#: limit-login-attempts.php:941 msgid "Limit Login Attempts Settings" msgstr "Limit Login Attempts Inställningar" -#: limit-login-attempts.php:834 +#: limit-login-attempts.php:942 msgid "Statistics" msgstr "Statistik" -#: limit-login-attempts.php:838 +#: limit-login-attempts.php:947 msgid "Total lockouts" msgstr "Antal blockeringar" -#: limit-login-attempts.php:841 +#: limit-login-attempts.php:950 msgid "Reset Counter" msgstr "Nollställ räknare" -#: limit-login-attempts.php:842 -#, php-format +#: limit-login-attempts.php:951 msgid "%d lockout since last reset" msgid_plural "%d lockouts since last reset" msgstr[0] "%d blockering sedan räknaren nollställdes" msgstr[1] "%d blockeringar sedan räknaren nollställdes" -#: limit-login-attempts.php:843 +#: limit-login-attempts.php:952 msgid "No lockouts yet" msgstr "Inga blockeringar har skett ännu" -#: limit-login-attempts.php:848 +#: limit-login-attempts.php:957 msgid "Active lockouts" msgstr "Aktiva blockeringar" -#: limit-login-attempts.php:850 +#: limit-login-attempts.php:959 msgid "Restore Lockouts" msgstr "Ta bort blockeringar" -#: limit-login-attempts.php:851 -#, php-format +#: limit-login-attempts.php:960 msgid "%d IP is currently blocked from trying to log in" msgstr "%d IP är för närvarande blockerade från att logga in" -#: limit-login-attempts.php:857 +#: limit-login-attempts.php:966 msgid "Options" msgstr "Inställningar" -#: limit-login-attempts.php:861 +#: limit-login-attempts.php:971 msgid "Lockout" msgstr "Blockering" -#: limit-login-attempts.php:863 +#: limit-login-attempts.php:973 msgid "allowed retries" msgstr "tillåtna misslyckanden" -#: limit-login-attempts.php:864 +#: limit-login-attempts.php:974 msgid "minutes lockout" msgstr "minuters blockering" -#: limit-login-attempts.php:865 +#: limit-login-attempts.php:975 msgid "lockouts increase lockout time to" msgstr "blockeringar ökar tiden till" -#: limit-login-attempts.php:865 +#: limit-login-attempts.php:975 msgid "hours" msgstr "timmar" -#: limit-login-attempts.php:866 +#: limit-login-attempts.php:976 msgid "hours until retries are reset" msgstr "timmar tills misslyckanden nollställs" -#: limit-login-attempts.php:870 +#: limit-login-attempts.php:980 msgid "Site connection" msgstr "Sajten ansluter" -#: limit-login-attempts.php:876 +#: limit-login-attempts.php:986 msgid "Direct connection" msgstr "Direktansluten" -#: limit-login-attempts.php:881 +#: limit-login-attempts.php:991 msgid "From behind a reversy proxy" msgstr "Bakom en reverse proxy" -#: limit-login-attempts.php:887 +#: limit-login-attempts.php:997 msgid "Handle cookie login" msgstr "Hantera inloggning med kakor" -#: limit-login-attempts.php:889 +#: limit-login-attempts.php:999 msgid "Yes" msgstr "Ja" -#: limit-login-attempts.php:889 +#: limit-login-attempts.php:999 msgid "No" msgstr "Nej" -#: limit-login-attempts.php:894 +#: limit-login-attempts.php:1003 msgid "Notify on lockout" msgstr "Notifiera om blockering" -#: limit-login-attempts.php:896 +#: limit-login-attempts.php:1005 msgid "Log IP" msgstr "Logga IP" -#: limit-login-attempts.php:897 +#: limit-login-attempts.php:1006 msgid "Email to admin after" msgstr "E-post till administratör efter" -#: limit-login-attempts.php:897 +#: limit-login-attempts.php:1006 msgid "lockouts" msgstr "blockeringar" -#: limit-login-attempts.php:902 +#: limit-login-attempts.php:1011 msgid "Change Options" msgstr "Ändra Inställningar" -#: limit-login-attempts.php:910 +#: limit-login-attempts.php:1019 msgid "Lockout log" msgstr "Log över blockeringar" -#: limit-login-attempts.php:914 +#: limit-login-attempts.php:1024 msgid "Clear Log" msgstr "Rensa Log" -#. Plugin Name of an extension +#. Plugin Name of the plugin/theme msgid "Limit Login Attempts" msgstr "Limit Login Attempts" -#. Plugin URI of an extension +#. Plugin URI of the plugin/theme msgid "http://devel.kostdoktorn.se/limit-login-attempts" msgstr "http://devel.kostdoktorn.se/limit-login-attempts" -#. Description of an extension +#. Description of the plugin/theme msgid "Limit rate of login attempts, including by way of cookies, for each IP." msgstr "Limit rate of login attempts, including by way of cookies, for each IP." -#. Author of an extension +#. Author of the plugin/theme msgid "Johan Eenfeldt" msgstr "Johan Eenfeldt" -#. Author URI of an extension +#. Author URI of the plugin/theme msgid "http://devel.kostdoktorn.se" msgstr "http://devel.kostdoktorn.se" +#~ msgid "IP|Internet address" +#~ msgstr "IP" +#~ msgid "NOTE: Only works in Wordpress 2.7 or later" +#~ msgstr "OBS: Fungerar endast i WordPress 2.7 eller senare" + diff --git a/plugins/limit-login-attempts/limit-login-attempts.php b/plugins/limit-login-attempts/limit-login-attempts.php index 38ad97d2..0407a8ea 100755 --- a/plugins/limit-login-attempts/limit-login-attempts.php +++ b/plugins/limit-login-attempts/limit-login-attempts.php @@ -5,7 +5,8 @@ Description: Limit rate of login attempts, including by way of cookies, for each IP. Author: Johan Eenfeldt Author URI: http://devel.kostdoktorn.se - Version: 1.6.0 + Text Domain: limit-login-attempts + Version: 1.6.1 Copyright 2008 - 2011 Johan Eenfeldt @@ -102,8 +103,16 @@ function limit_login_setup() { add_action('wp_login_failed', 'limit_login_failed'); if (limit_login_option('cookies')) { add_action('plugins_loaded', 'limit_login_handle_cookies', 99999); - add_action('auth_cookie_bad_hash', 'limit_login_failed_cookie'); add_action('auth_cookie_bad_username', 'limit_login_failed_cookie'); + + global $wp_version; + + if (version_compare($wp_version, '3.0', '>=')) { + add_action('auth_cookie_bad_hash', 'limit_login_failed_cookie_hash'); + add_action('auth_cookie_valid', 'limit_login_valid_cookie', 10, 2); + } else { + add_action('auth_cookie_bad_hash', 'limit_login_failed_cookie'); + } } add_filter('wp_authenticate_user', 'limit_login_wp_authenticate_user', 99999, 2); add_filter('shake_error_codes', 'limit_login_failure_shake'); @@ -212,13 +221,89 @@ function limit_login_handle_cookies() { } -/* Action: failed cookie login wrapper for limit_login_failed() */ +/* + * Action: failed cookie login hash + * + * Make sure same invalid cookie doesn't get counted more than once. + * + * Requires WordPress version 3.0.0, previous versions use limit_login_failed_cookie() + */ +function limit_login_failed_cookie_hash($cookie_elements) { + limit_login_clear_auth_cookie(); + + /* + * Under some conditions an invalid auth cookie will be used multiple + * times, which results in multiple failed attempts from that one + * cookie. + * + * Unfortunately I've not been able to replicate this consistently and + * thus have not been able to make sure what the exact cause is. + * + * Probably it is because a reload of for example the admin dashboard + * might result in multiple requests from the browser before the invalid + * cookie can be cleard. + * + * Handle this by only counting the first attempt when the exact same + * cookie is attempted for a user. + */ + + extract($cookie_elements, EXTR_OVERWRITE); + + // Check if cookie is for a valid user + $user = get_userdatabylogin($username); + if (!$user) { + // "shouldn't happen" for this action + limit_login_failed($username); + return; + } + + $previous_cookie = get_user_meta($user->ID, 'limit_login_previous_cookie', true); + if ($previous_cookie && $previous_cookie == $cookie_elements) { + // Identical cookies, ignore this attempt + return; + } + + // Store cookie + if ($previous_cookie) + update_user_meta($user->ID, 'limit_login_previous_cookie', $cookie_elements); + else + add_user_meta($user->ID, 'limit_login_previous_cookie', $cookie_elements, true); + + limit_login_failed($username); +} + + +/* + * Action: successful cookie login + * + * Clear any stored user_meta. + * + * Requires WordPress version 3.0.0, not used in previous versions + */ +function limit_login_valid_cookie($cookie_elements, $user) { + /* + * As all meta values get cached on user load this should not require + * any extra work for the common case of no stored value. + */ + + if (get_user_meta($user->ID, 'limit_login_previous_cookie')) { + delete_user_meta($user->ID, 'limit_login_previous_cookie'); + } +} + + +/* Action: failed cookie login (calls limit_login_failed()) */ function limit_login_failed_cookie($cookie_elements) { limit_login_clear_auth_cookie(); + /* + * Invalid username gets counted every time. + */ + limit_login_failed($cookie_elements['username']); } + /* Make sure auth cookie really get cleared (for this session too) */ function limit_login_clear_auth_cookie() { wp_clear_auth_cookie(); diff --git a/plugins/limit-login-attempts/limit-login-attempts.pot b/plugins/limit-login-attempts/limit-login-attempts.pot index 39fed346..58a32f03 100755 --- a/plugins/limit-login-attempts/limit-login-attempts.pot +++ b/plugins/limit-login-attempts/limit-login-attempts.pot @@ -1,282 +1,257 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Johan Eenfeldt -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy +# Copyright (C) 2010 Limit Login Attempts +# This file is distributed under the same license as the Limit Login Attempts package. msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: Limit Login Attempts 1.6.1\n" "Report-Msgid-Bugs-To: http://wordpress.org/tag/limit-login-attempts\n" -"POT-Creation-Date: 2009-01-28 17:17+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" +"POT-Creation-Date: 2011-02-17 15:08:09+00:00\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" +"PO-Revision-Date: 2010-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" -#: limit-login-attempts.php:372 -#, php-format +#: limit-login-attempts.php:474 msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: limit-login-attempts.php:378 -#, php-format +#: limit-login-attempts.php:480 msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: limit-login-attempts.php:381 -#, php-format +#: limit-login-attempts.php:485 msgid "[%s] Too many failed login attempts" msgstr "" -#: limit-login-attempts.php:383 -#, php-format -msgid "" -"%d failed login attempts (%d lockout(s)) from IP: %s" +#: limit-login-attempts.php:487 +msgid "%d failed login attempts (%d lockout(s)) from IP: %s" msgstr "" -#: limit-login-attempts.php:387 -#, php-format -msgid "" -"Last user attempted: %s" +#: limit-login-attempts.php:491 +msgid "Last user attempted: %s" msgstr "" -#: limit-login-attempts.php:390 -#, php-format +#: limit-login-attempts.php:494 msgid "IP was blocked for %s" msgstr "" -#: limit-login-attempts.php:445 +#: limit-login-attempts.php:551 msgid "ERROR: Too many failed login attempts." msgstr "" -#: limit-login-attempts.php:449 +#: limit-login-attempts.php:555 msgid "Please try again later." msgstr "" -#: limit-login-attempts.php:456 -#, php-format +#: limit-login-attempts.php:562 msgid "Please try again in %d hour." msgid_plural "Please try again in %d hours." msgstr[0] "" msgstr[1] "" -#: limit-login-attempts.php:458 -#, php-format +#: limit-login-attempts.php:564 msgid "Please try again in %d minute." msgid_plural "Please try again in %d minutes." msgstr[0] "" msgstr[1] "" -#: limit-login-attempts.php:487 -#, php-format +#: limit-login-attempts.php:593 msgid "%d attempt remaining." msgid_plural "%d attempts remaining." msgstr[0] "" msgstr[1] "" -#: limit-login-attempts.php:551 +#: limit-login-attempts.php:658 msgid "ERROR: Incorrect username or password." msgstr "" -#: limit-login-attempts.php:714 -msgid "IP|Internet address" +#: limit-login-attempts.php:826 +msgctxt "Internet address" +msgid "IP" msgstr "" -#: limit-login-attempts.php:714 +#: limit-login-attempts.php:826 msgid "Tried to log in as" msgstr "" -#: limit-login-attempts.php:719 -#, php-format +#: limit-login-attempts.php:831 msgid "%d lockout" msgid_plural "%d lockouts" msgstr[0] "" msgstr[1] "" -#: limit-login-attempts.php:743 +#: limit-login-attempts.php:860 msgid "Cleared IP log" msgstr "" -#: limit-login-attempts.php:751 +#: limit-login-attempts.php:868 msgid "Reset lockout count" msgstr "" -#: limit-login-attempts.php:759 +#: limit-login-attempts.php:876 msgid "Cleared current lockouts" msgstr "" -#: limit-login-attempts.php:788 +#: limit-login-attempts.php:905 msgid "Options changed" msgstr "" -#: limit-login-attempts.php:799 -msgid "NOTE: Only works in Wordpress 2.7 or later" -msgstr "" - -#: limit-login-attempts.php:815 -#, php-format +#: limit-login-attempts.php:923 msgid "It appears the site is reached directly (from your IP: %s)" msgstr "" -#: limit-login-attempts.php:817 -#, php-format +#: limit-login-attempts.php:925 msgid "" "It appears the site is reached through a proxy server (proxy IP: %s, your " "IP: %s)" msgstr "" -#: limit-login-attempts.php:825 -#, php-format +#: limit-login-attempts.php:933 msgid "" "Current setting appears to be invalid. Please make sure it " "is correct. Further information can be found here" msgstr "" -#: limit-login-attempts.php:833 +#: limit-login-attempts.php:941 msgid "Limit Login Attempts Settings" msgstr "" -#: limit-login-attempts.php:834 +#: limit-login-attempts.php:942 msgid "Statistics" msgstr "" -#: limit-login-attempts.php:838 +#: limit-login-attempts.php:947 msgid "Total lockouts" msgstr "" -#: limit-login-attempts.php:841 +#: limit-login-attempts.php:950 msgid "Reset Counter" msgstr "" -#: limit-login-attempts.php:842 -#, php-format +#: limit-login-attempts.php:951 msgid "%d lockout since last reset" msgid_plural "%d lockouts since last reset" msgstr[0] "" msgstr[1] "" -#: limit-login-attempts.php:843 +#: limit-login-attempts.php:952 msgid "No lockouts yet" msgstr "" -#: limit-login-attempts.php:848 +#: limit-login-attempts.php:957 msgid "Active lockouts" msgstr "" -#: limit-login-attempts.php:850 +#: limit-login-attempts.php:959 msgid "Restore Lockouts" msgstr "" -#: limit-login-attempts.php:851 -#, php-format +#: limit-login-attempts.php:960 msgid "%d IP is currently blocked from trying to log in" msgstr "" -#: limit-login-attempts.php:857 +#: limit-login-attempts.php:966 msgid "Options" msgstr "" -#: limit-login-attempts.php:861 +#: limit-login-attempts.php:971 msgid "Lockout" msgstr "" -#: limit-login-attempts.php:863 +#: limit-login-attempts.php:973 msgid "allowed retries" msgstr "" -#: limit-login-attempts.php:864 +#: limit-login-attempts.php:974 msgid "minutes lockout" msgstr "" -#: limit-login-attempts.php:865 +#: limit-login-attempts.php:975 msgid "lockouts increase lockout time to" msgstr "" -#: limit-login-attempts.php:865 +#: limit-login-attempts.php:975 msgid "hours" msgstr "" -#: limit-login-attempts.php:866 +#: limit-login-attempts.php:976 msgid "hours until retries are reset" msgstr "" -#: limit-login-attempts.php:870 +#: limit-login-attempts.php:980 msgid "Site connection" msgstr "" -#: limit-login-attempts.php:876 +#: limit-login-attempts.php:986 msgid "Direct connection" msgstr "" -#: limit-login-attempts.php:881 +#: limit-login-attempts.php:991 msgid "From behind a reversy proxy" msgstr "" -#: limit-login-attempts.php:887 +#: limit-login-attempts.php:997 msgid "Handle cookie login" msgstr "" -#: limit-login-attempts.php:889 +#: limit-login-attempts.php:999 msgid "Yes" msgstr "" -#: limit-login-attempts.php:889 +#: limit-login-attempts.php:999 msgid "No" msgstr "" -#: limit-login-attempts.php:894 +#: limit-login-attempts.php:1003 msgid "Notify on lockout" msgstr "" -#: limit-login-attempts.php:896 +#: limit-login-attempts.php:1005 msgid "Log IP" msgstr "" -#: limit-login-attempts.php:897 +#: limit-login-attempts.php:1006 msgid "Email to admin after" msgstr "" -#: limit-login-attempts.php:897 +#: limit-login-attempts.php:1006 msgid "lockouts" msgstr "" -#: limit-login-attempts.php:902 +#: limit-login-attempts.php:1011 msgid "Change Options" msgstr "" -#: limit-login-attempts.php:910 +#: limit-login-attempts.php:1019 msgid "Lockout log" msgstr "" -#: limit-login-attempts.php:914 +#: limit-login-attempts.php:1024 msgid "Clear Log" msgstr "" -#. Plugin Name of an extension +#. Plugin Name of the plugin/theme msgid "Limit Login Attempts" msgstr "" -#. Plugin URI of an extension +#. Plugin URI of the plugin/theme msgid "http://devel.kostdoktorn.se/limit-login-attempts" msgstr "" -#. Description of an extension +#. Description of the plugin/theme msgid "Limit rate of login attempts, including by way of cookies, for each IP." msgstr "" -#. Author of an extension +#. Author of the plugin/theme msgid "Johan Eenfeldt" msgstr "" -#. Author URI of an extension +#. Author URI of the plugin/theme msgid "http://devel.kostdoktorn.se" msgstr "" diff --git a/plugins/limit-login-attempts/readme.txt b/plugins/limit-login-attempts/readme.txt index 39b229be..5b2ba085 100755 --- a/plugins/limit-login-attempts/readme.txt +++ b/plugins/limit-login-attempts/readme.txt @@ -2,10 +2,10 @@ Contributors: johanee Tags: login, security, authentication Requires at least: 2.8 -Tested up to: 3.1-RC1 -Stable tag: 1.6.0 +Tested up to: 3.1-RC4 +Stable tag: 1.6.1 -Limit rate of login attempts, including by way of cookies, for each IP. +Limit rate of login attempts, including by way of cookies, for each IP. Fully customizable. == Description == @@ -23,7 +23,7 @@ Features * Optional logging, optional email notification * Handles server behind reverse proxy -Translations: Bulgarian, Brazilian Portuguese, Catalan, Chinese (Traditional), Czech, Dutch, French, Finnish, German, Hungarian, Norwegian, Persian, Romanian, Russian, Spanish, Swedish, Turkish +Translations: Bulgarian, Brazilian Portuguese, Catalan, Chinese (Traditional), Czech, Dutch, Finnish, French, German, Hungarian, Norwegian, Persian, Romanian, Russian, Spanish, Swedish, Turkish Plugin uses standard actions and filters only. @@ -67,6 +67,13 @@ If you have access to the database (for example through phpMyAdmin) you can clea == Changelog == += 1.6.1 = +* (WordPress 3.0+) An invalid cookie can sometimes get sent multiple times before it gets cleared, resulting in multiple failed attempts or even a lockout from a single invalid cookie. Store the latest failed cookie to make sure we only count it as one failed attempt +* Define "Text Domain" correctly +* Include correct Dutch tranlation file. Thanks to Martin1 for noticing. Thanks again to Bjorn Wijers for the translation +* Updated POT file for this version +* Tested against WordPress 3.1-RC4 + = 1.6.0 = * Happy New Year * Tested against WordPress 3.1-RC1 diff --git a/plugins/smart-youtube/readme.txt b/plugins/smart-youtube/readme.txt index f6127694..acdecfe6 100644 --- a/plugins/smart-youtube/readme.txt +++ b/plugins/smart-youtube/readme.txt @@ -3,7 +3,7 @@ Contributors: freediver Donate link: https://www.networkforgood.org/donation/MakeDonation.aspx?ORGID2=520781390 Tags: youtube, video, play, media, Post, posts, admin Requires at least: 2.0 -Tested up to: 3.0.1 +Tested up to: 3.1 Stable tag: trunk Smart Youtube plugin allows you to insert full featured YouTube videos into your post, comments and in RSS feed. @@ -37,6 +37,9 @@ Plugin by Vladimir Prelovac. Looking for options['rel'] ? 'checked="checked"' : ''; - $disp_rel2 = $disp_rel == 'on' ? '' : 'checked="checked"'; + $disp_rel = $this->options['rel'] ? 'checked="checked"' : ''; + $disp_rel2 = $this->options['rel'] ? '' : 'checked="checked"'; $disp_border = $this->options['border'] ? 'checked="checked"' : ''; $disp_color = $this->options['color']; $disp_posts = $this->options['posts'] == 'on' ? 'checked="checked"' : '' ; diff --git a/plugins/smart-youtube/smartyoutube.php b/plugins/smart-youtube/smartyoutube.php index 86423b04..7c5af877 100644 --- a/plugins/smart-youtube/smartyoutube.php +++ b/plugins/smart-youtube/smartyoutube.php @@ -4,7 +4,7 @@ Plugin Name: Smart Youtube Plugin URI: http://www.prelovac.com/vladimir/wordpress-plugins/smart-youtube Description: Insert YouTube videos in posts, comments and RSS feeds with ease and full customization. Author: Vladimir Prelovac -Version: 3.8.3 +Version: 3.8.4 Author URI: http://www.prelovac.com/vladimir/ -- cgit v1.2.3-65-gdbad