| Index: trunk/extensions/Translate/groups/Wikia/extensions.txt |
| — | — | @@ -115,11 +115,7 @@ |
| 116 | 116 | |
| 117 | 117 | Mag Cloud |
| 118 | 118 | |
| 119 | | -# Conflicting keys with Wikia Blogs extension |
| 120 | | -# Key 8:blog-avatar-preferences-title already belongs to wikia-blogs, conflict with wikia-masthead |
| 121 | | -# Key 8:removeavatar already belongs to ext-socialprofile-userprofile, conflict with wikia-masthead |
| 122 | | -#Masthead |
| 123 | | -#file = Masthead/Masthead.i18n.php |
| | 119 | +Masthead |
| 124 | 120 | |
| 125 | 121 | Most Popular Articles |
| 126 | 122 | file = MostPopularArticles/SpecialMostPopularArticles.i18n.php |