Less translations

interfaces/Glitter/templates/include_modals.tmpl

@@ -333,7 +333,7 @@
                                     <span class="glyphicon glyphicon-lock"></span>
                                 <span class="glyphicon glyphicon-floppy-saved"></span>
                                 </span>
-                                <input type="text" class="form-control" id="nzb_password" placeholder="$T('Glitter-unpackPassword')" data-bind="value: filelist.modalPassword" />
+                                <input type="text" class="form-control" id="nzb_password" placeholder="$T('srv-password')" data-bind="value: filelist.modalPassword" />
                                 <button type="submit" class="btn btn-default">$T('Glitter-submit')</button>
                             </div>
                         </div>
@@ -401,13 +401,13 @@
                         </div>
                     </fieldset>
                     <fieldset>
-                        <legend>$T('Glitter-unpackPassword')</legend>
+                        <legend>$T('srv-password')</legend>
                         <div class="form-group">
                             <div class="input-group">
                                 <span class="input-group-addon">
                                     <span class="glyphicon glyphicon-lock"></span>
                                 </span>
-                                <input type="text" class="form-control" id="retry_job_password" placeholder="$T('Glitter-unpackPassword')" />
+                                <input type="text" class="form-control" id="retry_job_password" placeholder="$T('srv-password')" />
                             </div>
                         </div>
                     </fieldset>

interfaces/Glitter/templates/main.tmpl

@@ -115,7 +115,7 @@
                         <li data-toggle="tooltip" data-placement="bottom" title="$T('Glitter-statusInterfaceOptions')" data-bind="click: loadStatusInfo">
                             <a href="#modal_options" data-toggle="modal"><span class="glyphicon glyphicon-wrench"></span></a>
                         </li>
-                        <li data-toggle="tooltip" data-placement="bottom" title="$T('Glitter-configure')">
+                        <li data-toggle="tooltip" data-placement="bottom" title="SABnzbd $T('menu-config')">
                             <a href="config"><span class="glyphicon glyphicon-cog"></span></a>
                         </li>
                         <li class="dropdown">
@@ -657,7 +657,7 @@
             glitterTranslate.noSelect = "$T('Glitter-noSelect')";
             glitterTranslate.sendThanks = "$T('Glitter-sendThanks')";
             glitterTranslate.chooseFile = "$T('Glitter-chooseFile')";
-            glitterTranslate.orphanedJobsMsg = "$T('Glitter-orphanedJobsMsg')";
+            glitterTranslate.orphanedJobsMsg = "$T('explain-orphans')";
             glitterTranslate.updateAvailable = "$T('Glitter-updateAvailable')";
             glitterTranslate.defaultText = "$T('default')";
             
@@ -680,6 +680,8 @@
             glitterTranslate.status['Script'] = "$T('stage-script')";
             glitterTranslate.status['Source'] = "$T('stage-source')";
             glitterTranslate.status['Servers'] = "$T('stage-servers')";
+            glitterTranslate.status['WARNING'] = "$T('Glitter-warning')";
+            glitterTranslate.status['ERROR'] = "$T('Glitter-error')";
 
             glitterTranslate.pp = [];
             glitterTranslate.pp['Download'] = "$T('pp-none')";

interfaces/Glitter/templates/static/javascripts/glitter.js

@@ -497,7 +497,7 @@ $(function() {
                         // Reformat CSS label and date
                         var warningData = {
                             index: index,
-                            type: warningSplit[1],
+                            type: glitterTranslate.status[warningSplit[1]].slice(0, -1),
                             text: warningSplit.slice(2).join('<br/>'), // Recombine if multiple lines
                             date: $.format.date(warningSplit[0], self.dateFormat() + ' HH:mm'),
                             css: (warningSplit[1] == "ERROR" ? "danger" : warningSplit[1] == "WARNING" ? "warning" : "info"),
@@ -833,10 +833,11 @@ $(function() {
                 
             // Show message (maybe it was there from before!)
             if(localStorage.getItem('lastOrphanedMsg') == 'true') {
+                console.log('asdas')
                 self.allMessages.push({
                     index: 'lastOrphanedMsg',
                     type: 'INFO',
-                    text: glitterTranslate.orphanedJobsMsg.replace('ICON_PLACEHOLDER', '<span class="glyphicon glyphicon-wrench"></span>'),
+                    text: glitterTranslate.orphanedJobsMsg + ' <a href="#" onclick="$(\'a[href=#modal_options]\').click().parent().click()"><span class="glyphicon glyphicon-wrench"></span></a>',
                     css: 'info',
                     clear: function() { self.clearMessages('lastOrphanedMsg')}
                 });

interfaces/Glitter/templates/static/stylesheets/glitter.css

@@ -578,7 +578,7 @@ tr.queueitem>td:first-child>a {
     max-width: 700px;
     float: right;
     position: relative;
-    z-index: 999;
+    z-index: 900;
 }
 
 .multioperations-selector .add-nzb-inputbox {

sabnzbd/skintext.py

@@ -746,7 +746,6 @@ SKIN_TEXT = {
     'Glitter-multiOperations' : TT('Multi-Operations'),
     'Glitter-multiSelect' : TT('Hold shift key to select a range'),
     'Glitter-checkAll' : TT('Check all'),
-    'Glitter-configure' : TT('SABnzbd settings'),
     'Glitter-restartSab' : TT('Restart SABnzbd'),
     'Glitter-onFinish' : TT('On queue finish'),
     'Glitter-statusInterfaceOptions' : TT('Status and interface options'),
@@ -757,7 +756,9 @@ SKIN_TEXT = {
     'Glitter-lostConnection' : TT('Lost connection to SABnzbd..'),
     'Glitter-afterRestart' : TT('In case of SABnzbd restart this screen will disappear automatically!'),
     'Glitter-disabled' : TT('Disabled'),
-    'Glitter-interfaceOptions' : TT('Web Interface').title(),
+    'Glitter-warning' : TT('WARNING:'),
+    'Glitter-error' : TT('ERROR:'),
+    'Glitter-interfaceOptions' : TT('Web Interface'),
     'Glitter-interfaceRefresh' : TT('Refresh rate'),
     'Glitter-useGlobalOptions' : TT('Use global interface settings'),
     'Glitter-queueItemLimit' : TT('Queue item limit'),
@@ -780,7 +781,6 @@ SKIN_TEXT = {
     'Glitter-chooseFile' : TT('Browse'),
     'Glitter-addnzbFilename' : TT('Optionally specify a filename'),
     'Glitter-nzbFormats' : TT('Formats: .nzb, .rar, .zip, .gz, .bz2'),
-    'Glitter-unpackPassword' : TT('Password for unpacking'),
     'Glitter-submit' : TT('Submit'),
     'Glitter-openInfoURL' : TT('Open Informational URL'),
     'Glitter-sendThanks' : TT('Submitted. Thank you!'),
@@ -795,7 +795,6 @@ SKIN_TEXT = {
     'Glitter-confirmClear1Download' : TT('Are you sure?'),
     'Glitter-grabbing' : TT('Grabbing NZB...'),
     'Glitter-updateAvailable' : TT('Update Available!'),
-    'Glitter-orphanedJobsMsg' : TT('There are orphaned job folders, click on ICON_PLACEHOLDER to take care of them'), #: Don't translate ICON_PLACEHOLDER 
     'Glitter-custom' : TT('Custom'),
     'Glitter-pausePrompt': TT('How long or untill when do you want to pause? (in English!) <br />Example: "50min", "3 hours", "20:00" or "tomorrow 7pm"'), #: Don't translate the examples! Keep the ", do not replace by ' !
     'Glitter-pausePromptFail': TT('Sorry, we could not interpret that. <br />Try again.'),