http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73455

Revision: 73455
Author:   siebrand
Date:     2010-09-21 11:05:49 +0000 (Tue, 21 Sep 2010)

Log Message:
-----------
Update 'fbconnect-mergebox' a bit and comment it out because it has not yet 
been implemented.

Modified Paths:
--------------
    trunk/extensions/FBConnect/FBConnect.i18n.php

Modified: trunk/extensions/FBConnect/FBConnect.i18n.php
===================================================================
--- trunk/extensions/FBConnect/FBConnect.i18n.php       2010-09-21 09:40:50 UTC 
(rev 73454)
+++ trunk/extensions/FBConnect/FBConnect.i18n.php       2010-09-21 11:05:49 UTC 
(rev 73455)
@@ -73,13 +73,14 @@
        
 $1",
        'fbconnect-merge'    => 'Merge your wiki account with your Facebook ID',
+/*
        'fbconnect-mergebox' => 'This feature has not yet been implemented.
-Accounts can be merged manually with [[Special:Renameuser]] if it is installed.
-For more information, please visit 
[[MediaWikiWiki:Extension:Renameuser|Extension:Renameuser]].
+Accounts can be [[Special:Renameuser|merged manually]] if the 
[http://mediawiki.org/wiki/Extension:Renameuser|Rename user extension] has been 
installed.
 
 $1
 
 Note: This can be undone by a sysop.',
+*/
        'fbconnect-logoutbox'=> '$1
        
 This will also log you out of Facebook and all connected sites, including this 
wiki.',



_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to