Register 'uploading' label globally

program/include/rcmail.php

@@ -458,7 +458,7 @@ class rcmail extends rcube
 
         // add some basic labels to client
         $this->output->add_label('loading', 'servererror', 'connerror', 'requesttimedout',
-            'refreshing', 'windowopenerror', 'uploadingmany', 'close', 'save', 'cancel',
+            'refreshing', 'windowopenerror', 'uploadingmany', 'uploading', 'close', 'save', 'cancel',
             'alerttitle', 'confirmationtitle', 'delete', 'continue', 'ok');
 
         return $this->output;

program/steps/mail/compose.inc

@@ -75,13 +75,13 @@ if (!is_array($COMPOSE)) {
 
 // add some labels to client
 $OUTPUT->add_label('notuploadedwarning', 'savingmessage', 'siginserted', 'responseinserted',
-    'messagesaved', 'converting', 'editorwarning', 'uploading', 'uploadingmany',
+    'messagesaved', 'converting', 'editorwarning', 'discard',
     'fileuploaderror', 'sendmessage', 'newresponse', 'responsename', 'responsetext', 'save',
     'savingresponse', 'restoresavedcomposedata', 'restoremessage', 'delete', 'restore', 'ignore',
     'selectimportfile', 'messageissent', 'loadingdata', 'nopubkeyfor', 'nopubkeyforsender',
     'encryptnoattachments','encryptedsendialog','searchpubkeyservers', 'importpubkeys',
     'encryptpubkeysfound',  'search', 'close', 'import', 'keyid', 'keylength', 'keyexpired',
-    'keyrevoked', 'keyimportsuccess', 'keyservererror', 'attaching', 'namex', 'attachmentrename', 'discard'
+    'keyrevoked', 'keyimportsuccess', 'keyservererror', 'attaching', 'namex', 'attachmentrename'
 );
 
 $OUTPUT->set_pagetitle($RCMAIL->gettext('compose'));

program/steps/settings/edit_identity.inc

@@ -52,7 +52,7 @@ else {
 $OUTPUT->include_script('list.js');
 $OUTPUT->add_handler('identityform', 'rcube_identity_form');
 $OUTPUT->set_env('identities_level', IDENTITIES_LEVEL);
-$OUTPUT->add_label('deleteidentityconfirm', 'uploading', 'generate',
+$OUTPUT->add_label('deleteidentityconfirm', 'generate',
     'encryptioncreatekey', 'openmailvelopesettings', 'encryptionprivkeysinmailvelope',
     'encryptionnoprivkeysinmailvelope', 'keypaircreatesuccess');