Now with RELEASE-NOTES and correct translations for watchlist filtering

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 35ab439..b7bb284 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -66,7 +66,10 @@ fully support the editing toolbar, but was found to be too confusing.
 * Experimental feature to allow translation of block expiry times
   Implementation only for Finnish currently
 * (bug 3284) Ipblocklist paging, substring search
+* Allow filtering of robot edits in Special:Watchlist by stting 
+  $wgFilterRobotsWL = true.
 
+>>>>>>> 1.394
 
 === Caveats ===
 

diff --git a/languages/Language.php b/languages/Language.php
index adee494..8bde56d 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1238,7 +1238,7 @@ at the bottom of the screen (deleting a content page also deletes the accompanyi
 'wlshowlast'           => 'Show last $1 hours $2 days $3',
 'wlsaved'              => 'This is a saved version of your watchlist.',
 'wlhideshowown'        => '$1 my edits.',
-'wlhideshowown'        => '$1 robot edits.',
+'wlhideshowbots'       => '$1 robot edits.',
 'wlshow'               => 'Show',
 'wlhide'               => 'Hide',
 

diff --git a/languages/LanguageDa.php b/languages/LanguageDa.php
index 466cd20..656740e 100644 (file)
--- a/languages/LanguageDa.php
+++ b/languages/LanguageDa.php
@@ -1035,7 +1035,7 @@ i bunden af skærmen.",
 'wlshow'               => 'Vis',
 'wlhide'               => 'Skjul',
 'wlhideshowown'                => '$1 mine redigeringer.',
-'wlhideshowown'                => '$1 robotredigeringer.',
+'wlhideshowbots'               => '$1 robotredigeringer.',
 'enotif_mailer'                => '{{SITENAME}} informationsmail',
 'enotif_reset'                 => 'Marker alle sider som besøgt',
 'enotif_newpagetext'=> 'Dette er en ny side.',