http://www.mediawiki.org/wiki/Special:Code/MediaWiki/60732
Revision: 60732
Author: siebrand
Date: 2010-01-06 14:28:01 +0000 (Wed, 06 Jan 2010)
Log Message:
-----------
Disable FlickrImport because of conflicting keys
Modified Paths:
--------------
trunk/extensions/Translate/groups/Wikia/extensions.txt
Modified: trunk/extensions/Translate/groups/Wikia/extensions.txt
===================================================================
--- trunk/extensions/Translate/groups/Wikia/extensions.txt 2010-01-06
14:00:17 UTC (rev 60731)
+++ trunk/extensions/Translate/groups/Wikia/extensions.txt 2010-01-06
14:28:01 UTC (rev 60732)
@@ -51,7 +51,7 @@
Edit Account
file = EditAccount/SpecialEditAccount.i18n.php
-# Conflicting keys from MediaWiki SVN's Editocunt
+# Conflicting keys from MediaWiki SVN's Editcount
# Key 8:editcount already belongs to ext-editcount, conflict with
wikia-editcount
# Key 8:editcount_username already belongs to ext-editcount, conflict with
wikia-editcount
# Key 8:editcount_submit already belongs to ext-editcount, conflict with
wikia-editcount
@@ -63,8 +63,19 @@
Edit Research
-Flickr Import
-var = wgFlickrImportMessages
+# Conflicting keys from MediaWiki SVN's ImportFreeImages
+# Key 8:importfreeimages already belongs to ext-importfreeimages, conflict
with wikia-flickrimport
+# Key 8:importfreeimages_description already belongs to ext-importfreeimages,
conflict with wikia-flickrimport
+# Key 8:importfreeimages_noapikey already belongs to ext-importfreeimages,
conflict with wikia-flickrimport
+# Key 8:importfreeimages_nophotosfound already belongs to
ext-importfreeimages, conflict with wikia-flickrimport
+# Key 8:importfreeimages_owner already belongs to ext-importfreeimages,
conflict with wikia-flickrimport
+# Key 8:importfreeimages_importthis already belongs to ext-importfreeimages,
conflict with wikia-flickrimport
+# Key 8:importfreeimages_next already belongs to ext-importfreeimages,
conflict with wikia-flickrimport
+# Key 8:importfreeimages_filefromflickr already belongs to
ext-importfreeimages, conflict with wikia-flickrimport
+# Key 8:importfreeimages_promptuserforfilename already belongs to
ext-importfreeimages, conflict with wikia-flickrimport
+# Key 8:importfreeimages_returntoform already belongs to ext-importfreeimages,
conflict with wikia-flickrimport
+#Flickr Import
+#var = wgFlickrImportMessages
Force Subject For New Section
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
