r49534 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r49533‎ | r49534 | r49535 >
Date:22:23, 15 April 2009
Author:dale
Status:deferred
Tags:
Comment:
fixed 'upload' msg conflict
Modified paths:
  • /trunk/extensions/MetavidWiki/languages/MV_Messages.php (modified) (history)
  • /trunk/extensions/MetavidWiki/skins/mv_embed/libAddMedia/remoteSearchDriver.js (modified) (history)

Diff [purge]

Index: trunk/extensions/MetavidWiki/languages/MV_Messages.php
@@ -85,7 +85,7 @@
8686 'rsd_no_results' => 'No search results for <b>$1</b>',
8787 'rsd_results_next' => 'next',
8888 'rsd_results_prev' => 'previous',
89 - 'upload' => 'Upload',
 89+ 'mv_upload' => 'Upload',
9090 'rsd_layout' => 'Layout:',
9191 'rsd_resource_edit' => 'Edit resource: $1',
9292 'resource_description_page'=> "Resource Description Page",
Index: trunk/extensions/MetavidWiki/skins/mv_embed/libAddMedia/remoteSearchDriver.js
@@ -15,7 +15,7 @@
1616 "rsd_results_prev" : "previous ",
1717 "rsd_no_results" : "No search results for <b>$1</b>",
1818
19 - "upload" : "Upload",
 19+ "mv_upload" : "Upload",
2020 "rsd_layout" : "Layout:",
2121 "rsd_resource_edit" : "Edit Resource: $1",
2222 "resource_description_page": "Resource Description Page",

Status & tagging log