* fixed missing autoload mvTextInterface.js reference

* removed deprecated ctypetext
* moved simpleForm output to upload api names
* fixed syntax error in libTimedText

diff --git a/js2/mwEmbed/libAddMedia/mvBaseUploadInterface.js b/js2/mwEmbed/libAddMedia/mvBaseUploadInterface.js
index 69ee3bb..35fd85a 100644 (file)
--- a/js2/mwEmbed/libAddMedia/mvBaseUploadInterface.js
+++ b/js2/mwEmbed/libAddMedia/mvBaseUploadInterface.js
@@ -202,11 +202,7 @@ mvBaseUploadInterface.prototype = {
                        
                        //add json format
                        if( $j(_this.editForm).find("[name='format']").length == 0)
-                               $j(_this.editForm).append('<input type="hidden" name="format" value="jsonfm">');
-                       
-                       //add text format type request (IE tries to "run"/download the script otherwise) 
-                       if( $j(_this.editForm).find("[name='ctypetext']").length == 0)
-                               $j(_this.editForm).append('<input type="hidden" name="ctypetext" value="true">');                               
+                               $j(_this.editForm).append('<input type="hidden" name="format" value="jsonfm">');                
                        
                        //map the form vars to api vars:  
                        $j(_this.editForm).find('#wpUploadFile').attr('name', 'file');

diff --git a/js2/mwEmbed/libAddMedia/remoteSearchDriver.js b/js2/mwEmbed/libAddMedia/remoteSearchDriver.js
index 45329ad..b5a9eb8 100644 (file)
--- a/js2/mwEmbed/libAddMedia/remoteSearchDriver.js
+++ b/js2/mwEmbed/libAddMedia/remoteSearchDriver.js
@@ -66,7 +66,7 @@ var default_remote_search_options = {
                                          //@@todo (should get that from the api or inpage vars)
                                         
        'enable_upload_tab':true, // if we want to enable an uploads tab:       
-       'upload_api_target'        : 'http://127.0.0.1/wiki_trunk/api.php' // can be local or the url of the upload api.
+       'upload_api_target'        : 'http://localhost/wiki_trunk/api.php' // can be local or the url of the upload api.
 }
 if(typeof wgServer == 'undefined')
        wgServer = '';
@@ -586,11 +586,11 @@ remoteSearchDriver.prototype = {
                                        "api_target" :  _this.upload_api_target ,
                                        "ondone_cb"     : function( resultData ){
                                                var cat = resultData;
-                                               debugger;                                               
+                                               debugger;                                                       
                                                return false;
                                        }
                                })
-                       });
+                       });     
                }else{
                        //setup the proxy  
                        js_log('do proxy:: ' + parseUri( _this.upload_api_target ).host);

diff --git a/js2/mwEmbed/libAddMedia/simpleUploadForm.js b/js2/mwEmbed/libAddMedia/simpleUploadForm.js
index 3094599..0dfd001 100644 (file)
--- a/js2/mwEmbed/libAddMedia/simpleUploadForm.js
+++ b/js2/mwEmbed/libAddMedia/simpleUploadForm.js
@@ -24,6 +24,7 @@ var default_form_options = {
 
 (function($) {
        $.fn.simpleUploadForm = function( opt , callback){
+               var _this = this;
                //set the options: 
                for(var i in default_form_options){
                        if(!opt[i])
@@ -38,30 +39,39 @@ var default_form_options = {
                                        
                //@@todo this is just a proof of concept
                //much todo to improved this web form
-               get_mw_token('File:MyRandomFileTokenCheck', opt.api_target, function(eToken){           
-                       debugger;       
+               get_mw_token('File:MyRandomFileTokenCheck', opt.api_target, function(eToken){   
+                               
                        if( !eToken || eToken == '+\\' ){
                                $(this.selector).html( gM('error_not_loggedin') );
                                return false;
                        }
-                       
+                       //build the api based upload form: 
                        var o = '<div style="margin: 0 auto;width:450px;">'+
-                               '<form id="suf-upload" enctype="multipart/form-data" action="" method="post">'  +       
-                               '<label for="wpUploadFile">' + gM('select_file') + '</label><br>'+                                                                      
-                               '<input type="file" style="display: inline;" name="wpUploadFile" id="wpUploadFile" size="10"/><br>' +           
-                               '<label for="wpDestFile">' +gM('destfilename') + '</label><br>'+
-                                       '<input type="text" id="wpDestFile" name="wpDestFile" size="30" /><br>'+
-                               '<label for="wpUploadDescription">' + gM('summary') + ':</label><br>' +
-                                       '<textarea cols="30" rows="3" id="wpUploadDescription" name="wpUploadDescription" tabindex="3"/><br>'+ 
-                                       gM('select_ownwork') + '<br>' + 
+                               '<form id="suf-upload" enctype="multipart/form-data" action="' + opt.api_target + '" method="post">'  +
+                               //hidden input: 
+                               '<input type="hidden" name="action" value="upload">'+
+                               '<input type="hidden" name="format" value="jsonfm">'+
+                               '<input type="hidden" name="token" value="'+ eToken +'">' +
+                               
+                               //api form name set:
+                               '<label for="file">' + gM('select_file') + '</label><br>'+                                                                      
+                               '<input type="file" style="display: inline;" name="file" size="15"/><br>' +             
+                               
+                               '<label for="filename">' +gM('destfilename') + '</label><br>'+
+                               '<input type="text" name="filename" size="30" /><br>'+
+                               
+                               '<label for="comment">' + gM('summary') + ':</label><br>' +
+                               '<textarea cols="30" rows="3" name="comment" tabindex="3"/><br>'+
+                                
+                               gM('select_ownwork') + '<br>' + 
                                '<input type="checkbox" id="wpLicence" name="wpLicence" value="cc-by-sa">' + gM('licence_cc-by-sa') + '<br>' +                  
                                                        
                                '<input type="submit" accesskey="s" value="' + gM('upload') + '" name="wpUploadBtn" id="wpUploadBtn"  tabindex="9"/>' +
                                //close the form and div  
-                               '</form></div>';                
+                               '</form></div>';                                        
                                
                        //set the target with the form output:
-                       $( this.selector ).html( o );                   
+                       $( _this.selector ).html( o );                  
                        //by default dissable: 
                        $j('#wpUploadBtn').attr('disabled', 'disabled');
                        

diff --git a/js2/mwEmbed/mv_embed.js b/js2/mwEmbed/mv_embed.js
index eb167a8..58ad9cd 100644 (file)
--- a/js2/mwEmbed/mv_embed.js
+++ b/js2/mwEmbed/mv_embed.js
@@ -1,5 +1,5 @@
 /*
- * ~mv_embed version 1.0~
+ * ~mv_embed ~
  * for details see: http://metavid.org/wiki/index.php/Mv_embed
  *
  * All Metavid Wiki code is Released under the GPL2
@@ -20,7 +20,7 @@ if( MV_EMBED_VERSION ){
        MV_DO_INIT=false;       
 }
 //used to grab fresh copies of scripts. (should be changed on commit)  
-var MV_EMBED_VERSION = '1.0r18';
+var MV_EMBED_VERSION = '1.0r19';
 
 /*
  * Configuration variables (can be set from some precceding script) 
@@ -231,8 +231,7 @@ lcPaths( 'libTimedText/', [
 ]);
 
 //depencency mapping for css files for self contained included plugins:
-lcCssPath({
-       '$j.ui'                         : 'jquery/' + jQueryUiVN + '.custom.css',
+lcCssPath({    
        '$j.Jcrop'                      : 'libClipEdit/Jcrop/css/jquery.Jcrop.css',
        '$j.fn.ColorPicker'     : 'libClipEdit/colorpicker/css/colorpicker.css'
 })

diff --git a/js2/mwEmbed/php/jsAutoloadLocalClasses.php b/js2/mwEmbed/php/jsAutoloadLocalClasses.php
index c9ad238..b63ddf0 100644 (file)
--- a/js2/mwEmbed/php/jsAutoloadLocalClasses.php
+++ b/js2/mwEmbed/php/jsAutoloadLocalClasses.php
@@ -85,6 +85,7 @@ $wgJSAutoloadLocalClasses['mvPlayList']               = $wgMwEmbedDirectory . 'libSequencer/
 $wgJSAutoloadLocalClasses['mvSequencer']               = $wgMwEmbedDirectory . 'libSequencer/mvSequencer.js';
 $wgJSAutoloadLocalClasses['mvSequencer']               = $wgMwEmbedDirectory . 'libSequencer/mvSequencer.js';
 $wgJSAutoloadLocalClasses['mvFirefoggRender']  = $wgMwEmbedDirectory . 'libSequencer/mvFirefoggRender.js';
-
-// libTimedText:
 $wgJSAutoloadLocalClasses['mvTimedEffectsEdit']        = $wgMwEmbedDirectory . 'libSequencer/mvTimedEffectsEdit.js';
+
+// libTimedText
+$wgJSAutoloadLocalClasses['mvTextInterface']   = $wgMwEmbedDirectory . 'libTimedText/mvTextInterface.js';

diff --git a/js2/mwEmbed/php/languages/mwEmbed.i18n.php b/js2/mwEmbed/php/languages/mwEmbed.i18n.php
index c452374..db69ba0 100644 (file)
--- a/js2/mwEmbed/php/languages/mwEmbed.i18n.php
+++ b/js2/mwEmbed/php/languages/mwEmbed.i18n.php
@@ -10,53 +10,77 @@
 #<JAVASCRIPT EN REPLACE>
 $messages['en'] = array(
        /*
-       * js file: /libTimedText/mvTextInterface.js
+       * js file: /libSequencer/mvSequencer.js
        */
-       'select_transcript_set' => 'Select Layers',
-       'auto_scroll' => 'auto scroll',
-       'close' => 'close',
-       'improve_transcript' => 'Improve',
+       'menu_clipedit' => 'Edit Media',
+       'menu_transition' => 'Transitions & Effects',
+       'menu_cliplib' => 'Add Media',
+       'menu_resource_overview' => 'Resource Overview',
+       'menu_options' => 'Options',
+       'loading_timeline' => 'Loading TimeLine <blink>...</blink>',
+       'loading_user_rights' => 'Loading user rights <blink>...</blink>',
+       'no_edit_permissions' => 'You don\'t have permissions to save changes to this sequence',
+       'edit_clip' => 'Edit Clip',
+       'edit_save' => 'Save Sequence Changes',
+       'saving_wait' => 'Save in Progress (please wait)',
+       'save_done' => 'Save Done',
+       'edit_cancel' => 'Cancel Sequence Edit',
+       'edit_cancel_confirm' => 'Are you sure you want to cancel your edit. Changes will be lost',
+       'zoom_in' => 'Zoom In',
+       'zoom_out' => 'Zoom Out',
+       'cut_clip' => 'Cut Clips',
+       'expand_track' => 'Expand Track',
+       'colapse_track' => 'Collapse Track',
+       'play_from_position' => 'Play From Playline Position',
+       'pixle2sec' => 'pixles to seconds',
+       'rmclip' => 'Remove Clip',
+       'clip_in' => 'clip in',
+       'clip_out' => 'clip out',
+       'mv_welcome_to_sequencer' => '<h3>Welcome to the sequencer demo</h3> very <b>limited</b> functionality right now. Not much documentation yet either',
+       'no_selected_resource' => '<h3>No Resource Selected</h3> Select a Clip to enable editing',
+       'error_edit_multiple' => '<h3>Multiple Resources Selected</h3> Select a single clip to edit it',
+       'mv_editor_options' => 'Editor options',
+       'mv_editor_mode' => 'Editor mode',
+       'mv_simple_editor_desc' => 'simple editor (iMovie style)',
+       'mv_advanced_editor_desc' => 'advanced editor (Final Cut style)',
+       'mv_other_options' => 'Other Options',
+       'mv_contextmenu_opt' => 'Enable Context Menus',
+       'mv_sequencer_credit_line' => 'Developed by <a href="http://kaltura.com">Kaltura, Inc.</a>  in partnership with the <a href="http://wikimediafoundation.org/wiki/Home">Wikimedia Foundation</a> ( <a href="#">more info</a> )',
 
        /*
-       * js file: /libAddMedia/mvBaseUploadInterface.js
+       * js file: /libSequencer/mvTimedEffectsEdit.js
        */
-       'upload-transcode-in-progress' => 'Doing Transcode & Upload (do not close this window)',
-       'upload-in-progress' => 'Upload in Progress (do not close this window)',
-       'upload-transcoded-status' => 'Transcoded',
-       'uploaded-status' => 'Uploaded',
-       'wgfogg_wrong_version' => 'You have firefogg installed but its outdated, <a href="http://firefogg.org">please upgrade</a> ',
-       'upload-stats-fileprogres' => '$1 of $2',
-       'mv_upload_completed' => 'Your upload is complete',
-       'mv_upload_done' => 'Your upload <i>should be</i> accessible <a href="$1">here</a>',
-       'upload-unknown-size' => 'Unknown size',
-       'mv-cancel-confim' => 'Are you sure you want to cancel?',
-       'successfulupload' => 'Successful Upload',
-       'uploaderror' => 'Upload error',
-       'uploadwarning' => 'Upload warning',
-       'unknown-error' => 'Unknown Error',
-       'return-to-form' => 'Return to form',
-       'file-exists-duplicate' => 'This file is a duplicate of the following file',
-       'fileexists' => 'A file with this name exists already, please check <b><tt>$1</tt></b> if you are not sure if you want to change it.',
-       'fileexists-thumb' => '<center><b>Existing file</b></center>',
-       'ignorewarning' => 'Ignore warning and save file anyway',
-       'file-thumbnail-no' => 'The filename begins with <b><tt>$1</tt></b>',
-       'go-to-resource' => 'Go to Resource Page',
-       'upload-misc-error' => 'Unknown upload error',
-       'wgfogg_waring_bad_extension' => 'You have selected a file with an unsuported extension (<a href="http://commons.wikimedia.org/wiki/Commons:Firefogg#Supported_File_Types">more information</a>).',
-       'cancel-button' => 'Cancel',
-       'ok-button' => 'OK',
+       'transition_in' => 'Transition In',
+       'transition_out' => 'Transition Out',
+       'effects' => 'Effects Stack',
+       'remove_transition' => 'Remove Transition',
+       'edit_transin' => 'Edit Transition Into Clip',
+       'edit_transout' => 'Edit Transition Out of Clip',
 
        /*
-       * js file: /libAddMedia/mvAdvFirefogg.js
+       * js file: /libClipEdit/mvClipEdit.js
        */
-       'help-sticky' => 'Help (Click to Stick)',
-       'fogg-cg-preset' => 'Preset: <strong>$1</strong>',
-       'fogg-cg-quality' => 'Basic Quality and Resolution Control',
-       'fogg-cg-meta' => 'Meta Data for the Clip',
-       'fogg-cg-range' => 'Encoding Range',
-       'fogg-cg-advVideo' => 'Advanced Video Encoding Controls',
-       'fogg-cg-advAudio' => 'Advanced Audio Encoding Controls',
-       'fogg-preset-custom' => 'Custom Settings',
+       'mv_crop' => 'Crop Image',
+       'mv_apply_crop' => 'Apply Crop to Image',
+       'mv_reset_crop' => 'Rest Crop',
+       'mv_insert_image_page' => 'Insert Into page',
+       'mv_insert_into_sequence' => 'Insert Into Sequence',
+       'mv_preview_insert' => 'Preview Insert',
+       'mv_cancel_image_insert' => 'Cancel Insert',
+       'sc_fileopts' => 'Clip Detail Edit',
+       'sc_inoutpoints' => 'Set In-Out points',
+       'sc_overlays' => 'Overlays',
+       'sc_audio' => 'Audio Control',
+       'sc_duration' => 'Duration',
+       'mv_template_properties' => 'Template Properties',
+       'mv_custom_title' => 'Custom Title',
+       'mv_edit_properties' => 'Edit Properties',
+       'mv_other_properties' => 'Other Properties',
+       'mv_resource_page' => 'Resource Page:',
+       'mv_set_in_out_points' => 'Set in-out points',
+       'mv_start_time' => 'Start Time',
+       'mv_end_time' => 'End Time',
+       'mv_preview_inout' => 'Preview/Play In-out points',
 
        /*
        * js file: /libAddMedia/searchLibs/metavidSearch.js
@@ -68,22 +92,6 @@ $messages['en'] = array(
        */
        'imported_from' => '$1 imported from [$2 $3]. See the original [$4 resource page] for more info',
 
-       /*
-       * js file: /libAddMedia/mvFirefogg.js
-       */
-       'fogg-select_file' => 'Select File',
-       'fogg-select_new_file' => 'Select New File',
-       'fogg-select_url' => 'Select Url',
-       'fogg-save_local_file' => 'Save Ogg',
-       'fogg-check_for_fogg' => 'Checking for Firefogg <blink>...</blink>',
-       'fogg-installed' => 'Firefogg is Installed',
-       'fogg-for_improved_uplods' => 'For Improved uploads: ',
-       'fogg-please_install' => '<a href="$1">Install Firefogg</a>. More <a href="http://commons.wikimedia.org/wiki/Commons:Firefogg">about firefogg</a>',
-       'fogg-use_latest_fox' => 'Please first install <a href="http://www.mozilla.com/en-US/firefox/upgrade.html?from=firefogg">Firefox 3.5</a> (or later). <i>then revisit this page to install the <b>firefogg</b> extention</i>',
-       'fogg-passthrough_mode' => 'Your selected file is already ogg or not a video file',
-       'fogg-transcoding' => 'Encoding Video to Ogg',
-       'fogg-encoding-done' => 'Encoding Done',
-
        /*
        * js file: /libAddMedia/remoteSearchDriver.js
        */
@@ -95,7 +103,7 @@ $messages['en'] = array(
        'rsd_results_next' => 'next ',
        'rsd_results_prev' => 'previous ',
        'rsd_no_results' => 'No search results for <b>$1</b>',
-       'mv_upload' => 'Upload',
+       'upload_tab' => 'Upload',
        'rsd_layout' => 'Layout:',
        'rsd_resource_edit' => 'Edit Resource: $1',
        'resource_description_page' => 'Resource Description Page',
@@ -111,54 +119,94 @@ $messages['en'] = array(
        'no_import_by_url' => 'This User or Wiki <b>can not</b> import assets from remote URLs. </p><p> Do you need to Login? </p><p> If permissions are set you may have to enable $wgAllowCopyUploads, <a href="http://www.mediawiki.org/wiki/Manual:$wgAllowCopyUploads">more info</a></p>',
        'results_from' => 'Results from <a href="$1" target="_new" >$2</a>',
        'missing_desc_see_soruce' => 'This Asset is missing a description. Please see the [$1 orginal source] and help describe it',
+       'rsd_config_error' => 'Add media Wizard configuation error: $1',
 
        /*
-       * js file: /libSequencer/mvSequencer.js
+       * js file: /libAddMedia/mvFirefogg.js
        */
-       'menu_clipedit' => 'Edit Media',
-       'menu_transition' => 'Transitions & Effects',
-       'menu_cliplib' => 'Add Media',
-       'menu_resource_overview' => 'Resource Overview',
-       'menu_options' => 'Options',
-       'loading_timeline' => 'Loading TimeLine <blink>...</blink>',
-       'loading_user_rights' => 'Loading user rights <blink>...</blink>',
-       'no_edit_permissions' => 'You don\'t have permissions to save changes to this sequence',
-       'edit_clip' => 'Edit Clip',
-       'edit_save' => 'Save Sequence Changes',
-       'saving_wait' => 'Save in Progress (please wait)',
-       'save_done' => 'Save Done',
-       'edit_cancel' => 'Cancel Sequence Edit',
-       'edit_cancel_confirm' => 'Are you sure you want to cancel your edit. Changes will be lost',
-       'zoom_in' => 'Zoom In',
-       'zoom_out' => 'Zoom Out',
-       'cut_clip' => 'Cut Clips',
-       'expand_track' => 'Expand Track',
-       'colapse_track' => 'Collapse Track',
-       'play_from_position' => 'Play From Playline Position',
-       'pixle2sec' => 'pixles to seconds',
-       'rmclip' => 'Remove Clip',
-       'clip_in' => 'clip in',
-       'clip_out' => 'clip out',
-       'mv_welcome_to_sequencer' => '<h3>Welcome to the sequencer demo</h3> very <b>limited</b> functionality right now. Not much documentation yet either',
-       'no_selected_resource' => '<h3>No Resource Selected</h3> Select a Clip to enable editing',
-       'error_edit_multiple' => '<h3>Multiple Resources Selected</h3> Select a single clip to edit it',
-       'mv_editor_options' => 'Editor options',
-       'mv_editor_mode' => 'Editor mode',
-       'mv_simple_editor_desc' => 'simple editor (iMovie style)',
-       'mv_advanced_editor_desc' => 'advanced editor (Final Cut style)',
-       'mv_other_options' => 'Other Options',
-       'mv_contextmenu_opt' => 'Enable Context Menus',
-       'mv_sequencer_credit_line' => 'Developed by <a href="http://kaltura.com">Kaltura, Inc.</a>  in partnership with the <a href="http://wikimediafoundation.org/wiki/Home">Wikimedia Foundation</a> ( <a href="#">more info</a> )',
+       'fogg-select_file' => 'Select File',
+       'fogg-select_new_file' => 'Select New File',
+       'fogg-select_url' => 'Select Url',
+       'fogg-save_local_file' => 'Save Ogg',
+       'fogg-check_for_fogg' => 'Checking for Firefogg <blink>...</blink>',
+       'fogg-installed' => 'Firefogg is Installed',
+       'fogg-for_improved_uplods' => 'For Improved uploads: ',
+       'fogg-please_install' => '<a href="$1">Install Firefogg</a>. More <a href="http://commons.wikimedia.org/wiki/Commons:Firefogg">about firefogg</a>',
+       'fogg-use_latest_fox' => 'Please first install <a href="http://www.mozilla.com/en-US/firefox/upgrade.html?from=firefogg">Firefox 3.5</a> (or later). <i>then revisit this page to install the <b>firefogg</b> extention</i>',
+       'fogg-passthrough_mode' => 'Your selected file is already ogg or not a video file',
+       'fogg-transcoding' => 'Encoding Video to Ogg',
+       'fogg-encoding-done' => 'Encoding Done',
 
        /*
-       * js file: /libSequencer/mvTimedEffectsEdit.js
+       * js file: /libAddMedia/mvBaseUploadInterface.js
        */
-       'transition_in' => 'Transition In',
-       'transition_out' => 'Transition Out',
-       'effects' => 'Effects Stack',
-       'remove_transition' => 'Remove Transition',
-       'edit_transin' => 'Edit Transition Into Clip',
-       'edit_transout' => 'Edit Transition Out of Clip',
+       'upload-transcode-in-progress' => 'Doing Transcode & Upload (do not close this window)',
+       'upload-in-progress' => 'Upload in Progress (do not close this window)',
+       'upload-transcoded-status' => 'Transcoded',
+       'uploaded-status' => 'Uploaded',
+       'wgfogg_wrong_version' => 'You have firefogg installed but its outdated, <a href="http://firefogg.org">please upgrade</a> ',
+       'upload-stats-fileprogres' => '$1 of $2',
+       'mv_upload_completed' => 'Your upload is complete',
+       'mv_upload_done' => 'Your upload <i>should be</i> accessible <a href="$1">here</a>',
+       'upload-unknown-size' => 'Unknown size',
+       'mv-cancel-confim' => 'Are you sure you want to cancel?',
+       'successfulupload' => 'Successful Upload',
+       'uploaderror' => 'Upload error',
+       'uploadwarning' => 'Upload warning',
+       'unknown-error' => 'Unknown Error',
+       'return-to-form' => 'Return to form',
+       'file-exists-duplicate' => 'This file is a duplicate of the following file',
+       'fileexists' => 'A file with this name exists already, please check <b><tt>$1</tt></b> if you are not sure if you want to change it.',
+       'fileexists-thumb' => '<center><b>Existing file</b></center>',
+       'ignorewarning' => 'Ignore warning and save file anyway',
+       'file-thumbnail-no' => 'The filename begins with <b><tt>$1</tt></b>',
+       'go-to-resource' => 'Go to Resource Page',
+       'upload-misc-error' => 'Unknown upload error',
+       'wgfogg_waring_bad_extension' => 'You have selected a file with an unsuported extension (<a href="http://commons.wikimedia.org/wiki/Commons:Firefogg#Supported_File_Types">more information</a>).',
+       'cancel-button' => 'Cancel',
+       'ok-button' => 'OK',
+
+       /*
+       * js file: /libAddMedia/simpleUploadForm.js
+       */
+       'select_file' => 'Select File',
+       'more_licence_options' => 'For more licence options view the <a href="$1">normal upload page</a>',
+       'select_ownwork' => 'I am uploading entirely my own work, and licencing it under:',
+       'licence_cc-by-sa' => 'Creative Commons Share Alike (3.0)',
+       'upload' => 'Upload File',
+       'destfilename' => 'Destination filename:',
+       'summary' => 'Summary',
+       'error_not_loggedin' => 'You don\'t appear to be logged in or don\'t have upload privlages.',
+
+       /*
+       * js file: /libAddMedia/mvAdvFirefogg.js
+       */
+       'help-sticky' => 'Help (Click to Stick)',
+       'fogg-cg-preset' => 'Preset: <strong>$1</strong>',
+       'fogg-cg-quality' => 'Basic Quality and Resolution Control',
+       'fogg-cg-meta' => 'Meta Data for the Clip',
+       'fogg-cg-range' => 'Encoding Range',
+       'fogg-cg-advVideo' => 'Advanced Video Encoding Controls',
+       'fogg-cg-advAudio' => 'Advanced Audio Encoding Controls',
+       'fogg-preset-custom' => 'Custom Settings',
+
+       /*
+       * js file: /libTimedText/mvTextInterface.js
+       */
+       'select_transcript_set' => 'Select Layers',
+       'auto_scroll' => 'auto scroll',
+       'close' => 'close',
+       'improve_transcript' => 'Improve',
+
+       /*
+       * js file: /mv_embed.js
+       */
+       'loading_txt' => 'loading <blink>...</blink>',
+       'loading_title' => 'Loading...',
+       'size-gigabytes' => '$1 GB',
+       'size-megabytes' => '$1 MB',
+       'size-kilobytes' => '$1 K',
+       'size-bytes' => '$1 B',
 
        /*
        * js file: /libEmbedVideo/embedVideo.js
@@ -200,40 +248,5 @@ $messages['en'] = array(
        'mv_generic_missing_plugin' => 'You browser does not appear to support playback type: <b>$1</b><br> visit the <a href="http://commons.wikimedia.org/wiki/Commons:Media_help">Playback Methods</a> page to download a player<br>',
        'mv_for_best_experience' => 'For a better video playback experience we recommend:<br> <b><a href="http://www.mozilla.com/en-US/firefox/upgrade.html?from=mwEmbed">Firefox 3.5</a></b>',
        'mv_do_not_warn_again' => 'Dissmiss for now.',
-
-       /*
-       * js file: /libClipEdit/mvClipEdit.js
-       */
-       'mv_crop' => 'Crop Image',
-       'mv_apply_crop' => 'Apply Crop to Image',
-       'mv_reset_crop' => 'Rest Crop',
-       'mv_insert_image_page' => 'Insert Into page',
-       'mv_insert_into_sequence' => 'Insert Into Sequence',
-       'mv_preview_insert' => 'Preview Insert',
-       'mv_cancel_image_insert' => 'Cancel Insert',
-       'sc_fileopts' => 'Clip Detail Edit',
-       'sc_inoutpoints' => 'Set In-Out points',
-       'sc_overlays' => 'Overlays',
-       'sc_audio' => 'Audio Control',
-       'sc_duration' => 'Duration',
-       'mv_template_properties' => 'Template Properties',
-       'mv_custom_title' => 'Custom Title',
-       'mv_edit_properties' => 'Edit Properties',
-       'mv_other_properties' => 'Other Properties',
-       'mv_resource_page' => 'Resource Page:',
-       'mv_set_in_out_points' => 'Set in-out points',
-       'mv_start_time' => 'Start Time',
-       'mv_end_time' => 'End Time',
-       'mv_preview_inout' => 'Preview/Play In-out points',
-
-       /*
-       * js file: /mv_embed.js
-       */
-       'loading_txt' => 'loading <blink>...</blink>',
-       'loading_title' => 'Loading...',
-       'size-gigabytes' => '$1 GB',
-       'size-megabytes' => '$1 MB',
-       'size-kilobytes' => '$1 K',
-       'size-bytes' => '$1 B',
 );
 #</JAVASCRIPT EN REPLACE>
\ No newline at end of file

diff --git a/js2/mwEmbed/php/maintenance/mergeJavascriptMsg.php b/js2/mwEmbed/php/maintenance/mergeJavascriptMsg.php
index 669cb9d..8a80730 100644 (file)
--- a/js2/mwEmbed/php/maintenance/mergeJavascriptMsg.php
+++ b/js2/mwEmbed/php/maintenance/mergeJavascriptMsg.php
@@ -70,7 +70,7 @@ function doJsonMerge( $json_txt ){
                }
                return $out;
     } else {
-        print "could not get any json vars\n";
+        print "could not get any json vars from:$curFileName \n";
         return '';
     }
 }