| Index: trunk/extensions/Translate/groups/Wikia/extensions.txt |
| — | — | @@ -51,7 +51,7 @@ |
| 52 | 52 | Edit Account |
| 53 | 53 | file = EditAccount/SpecialEditAccount.i18n.php |
| 54 | 54 | |
| 55 | | -# Conflicting keys from MediaWiki SVN's Editocunt |
| | 55 | +# Conflicting keys from MediaWiki SVN's Editcount |
| 56 | 56 | # Key 8:editcount already belongs to ext-editcount, conflict with wikia-editcount |
| 57 | 57 | # Key 8:editcount_username already belongs to ext-editcount, conflict with wikia-editcount |
| 58 | 58 | # Key 8:editcount_submit already belongs to ext-editcount, conflict with wikia-editcount |
| — | — | @@ -63,8 +63,19 @@ |
| 64 | 64 | |
| 65 | 65 | Edit Research |
| 66 | 66 | |
| 67 | | -Flickr Import |
| 68 | | -var = wgFlickrImportMessages |
| | 67 | +# Conflicting keys from MediaWiki SVN's ImportFreeImages |
| | 68 | +# Key 8:importfreeimages already belongs to ext-importfreeimages, conflict with wikia-flickrimport |
| | 69 | +# Key 8:importfreeimages_description already belongs to ext-importfreeimages, conflict with wikia-flickrimport |
| | 70 | +# Key 8:importfreeimages_noapikey already belongs to ext-importfreeimages, conflict with wikia-flickrimport |
| | 71 | +# Key 8:importfreeimages_nophotosfound already belongs to ext-importfreeimages, conflict with wikia-flickrimport |
| | 72 | +# Key 8:importfreeimages_owner already belongs to ext-importfreeimages, conflict with wikia-flickrimport |
| | 73 | +# Key 8:importfreeimages_importthis already belongs to ext-importfreeimages, conflict with wikia-flickrimport |
| | 74 | +# Key 8:importfreeimages_next already belongs to ext-importfreeimages, conflict with wikia-flickrimport |
| | 75 | +# Key 8:importfreeimages_filefromflickr already belongs to ext-importfreeimages, conflict with wikia-flickrimport |
| | 76 | +# Key 8:importfreeimages_promptuserforfilename already belongs to ext-importfreeimages, conflict with wikia-flickrimport |
| | 77 | +# Key 8:importfreeimages_returntoform already belongs to ext-importfreeimages, conflict with wikia-flickrimport |
| | 78 | +#Flickr Import |
| | 79 | +#var = wgFlickrImportMessages |
| 69 | 80 | |
| 70 | 81 | Force Subject For New Section |
| 71 | 82 | |