From: jenkins-bot Date: Mon, 7 Dec 2015 12:45:26 +0000 (+0000) Subject: Merge "Change wording of 'wlshowtime' for ease of localisation" X-Git-Tag: 1.31.0-rc.0~8777 X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22auteur_infos%22%2C%20%22id_auteur=%24id%22%29%20.%20%22?a=commitdiff_plain;h=220285ddd27b7f2971e9619940c48a8eee122cd0;hp=-c;p=lhc%2Fweb%2Fwiklou.git Merge "Change wording of 'wlshowtime' for ease of localisation" --- 220285ddd27b7f2971e9619940c48a8eee122cd0 diff --combined languages/i18n/en.json index 32e9b00685,440845bc5e..4d66f44ca1 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@@ -35,7 -35,6 +35,7 @@@ "tog-watchlisthidebots": "Hide bot edits from the watchlist", "tog-watchlisthideminor": "Hide minor edits from the watchlist", "tog-watchlisthideliu": "Hide edits by logged in users from the watchlist", + "tog-watchlistreloadautomatically": "Reload the watchlist automatically whenever a filter is changed (JavaScript required)", "tog-watchlisthideanons": "Hide edits by anonymous users from the watchlist", "tog-watchlisthidepatrolled": "Hide patrolled edits from the watchlist", "tog-watchlisthidecategorization": "Hide categorization of pages", @@@ -471,7 -470,6 +471,7 @@@ "wrongpasswordempty": "Password entered was blank.\nPlease try again.", "passwordtooshort": "Passwords must be at least {{PLURAL:$1|1 character|$1 characters}}.", "passwordtoolong": "Passwords cannot be longer than {{PLURAL:$1|1 character|$1 characters}}.", + "passwordtoopopular": "Commonly chosen passwords cannot be used. Please choose a more unique password.", "password-name-match": "Your password must be different from your username.", "password-login-forbidden": "The use of this username and password has been forbidden.", "mailmypassword": "Reset password", @@@ -1929,7 -1927,7 +1929,7 @@@ "wlshowlast": "Show last $1 hours $2 days", "watchlistall2": "all", "watchlist-hide": "Hide", - "wlshowtime": "Show last:", + "wlshowtime": "Period of time to display:", "wlshowhideminor": "minor edits", "wlshowhidebots": "bots", "wlshowhideliu": "registered users",