| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -66,7 +66,10 @@ |
| 67 | 67 | * Experimental feature to allow translation of block expiry times |
| 68 | 68 | Implementation only for Finnish currently |
| 69 | 69 | * (bug 3284) Ipblocklist paging, substring search |
| | 70 | +* Allow filtering of robot edits in Special:Watchlist by stting |
| | 71 | + $wgFilterRobotsWL = true. |
| 70 | 72 | |
| | 73 | +>>>>>>> 1.394 |
| 71 | 74 | |
| 72 | 75 | === Caveats === |
| 73 | 76 | |
| Index: trunk/phase3/languages/Language.php |
| — | — | @@ -1238,7 +1238,7 @@ |
| 1239 | 1239 | 'wlshowlast' => 'Show last $1 hours $2 days $3', |
| 1240 | 1240 | 'wlsaved' => 'This is a saved version of your watchlist.', |
| 1241 | 1241 | 'wlhideshowown' => '$1 my edits.', |
| 1242 | | -'wlhideshowown' => '$1 robot edits.', |
| | 1242 | +'wlhideshowbots' => '$1 robot edits.', |
| 1243 | 1243 | 'wlshow' => 'Show', |
| 1244 | 1244 | 'wlhide' => 'Hide', |
| 1245 | 1245 | |
| Index: trunk/phase3/languages/LanguageDa.php |
| — | — | @@ -1035,7 +1035,7 @@ |
| 1036 | 1036 | 'wlshow' => 'Vis', |
| 1037 | 1037 | 'wlhide' => 'Skjul', |
| 1038 | 1038 | 'wlhideshowown' => '$1 mine redigeringer.', |
| 1039 | | -'wlhideshowown' => '$1 robotredigeringer.', |
| | 1039 | +'wlhideshowbots' => '$1 robotredigeringer.', |
| 1040 | 1040 | 'enotif_mailer' => '{{SITENAME}} informationsmail', |
| 1041 | 1041 | 'enotif_reset' => 'Marker alle sider som besøgt', |
| 1042 | 1042 | 'enotif_newpagetext'=> 'Dette er en ny side.', |