Line chart UI tweaks

added italian language

app/icons/no-power.svg

@@ -0,0 +1,3 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 512 512">
+<path d="M437.020 74.98c-48.353-48.351-112.64-74.98-181.020-74.98s-132.667 26.629-181.020 74.98c-48.351 48.353-74.98 112.64-74.98 181.020s26.629 132.667 74.98 181.020c48.353 48.351 112.64 74.98 181.020 74.98s132.667-26.629 181.020-74.98c48.351-48.353 74.98-112.64 74.98-181.020s-26.629-132.667-74.98-181.020zM448 256c0 41.407-13.177 79.794-35.556 111.19l-267.633-267.634c31.396-22.379 69.782-35.556 111.189-35.556 105.869 0 192 86.131 192 192zM64 256c0-41.407 13.177-79.793 35.556-111.189l267.635 267.634c-31.397 22.378-69.784 35.555-111.191 35.555-105.869 0-192-86.131-192-192z"></path>
+</svg>

app/icons/power.svg

@@ -0,0 +1,3 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 512 512">
+<path d="M192 0l-192 256h192l-128 256 448-320h-256l192-192z"></path>
+</svg>

app/js/app.js

@@ -42,8 +42,6 @@ function($rootScope, $location, $window, $doc, $state, $translate, localeFormat,
   // Global Reference variables
   $rootScope.insurance = { opts: [{ name: 'standard', pct: 0.05 }, { name: 'alpha', pct: 0.025 }, { name: 'beta', pct: 0.0375 }] };
   $rootScope.discounts = { opts: Discounts };
-  $rootScope.STATUS = ['', 'disabled', 'off', 'on'];
-  $rootScope.STATUS_CLASS = ['', 'disabled', 'warning', 'secondary-disabled'];
   $rootScope.sizeRatio = Persist.getSizeRatio();
   $rootScope.title = 'Coriolis';
 

app/js/controllers/controller-outfit.js

@@ -100,11 +100,12 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', '
   $scope.speedSeries = {
     xMin: 0,
     xMax: ship.cargoCapacity,
-    yMax: calcSpeed(ship.unladenMass, ship.speed, $scope.th.c, ship.pipSpeed)['4 Pips'],
+    yMax: calcSpeed(ship.unladenMass, ship.speed, ship.boost, $scope.th.c, ship.pipSpeed).boost,
     yMin: 0,
-    series: ['4 Pips', '2 Pips', '0 Pips'],
+    series: ['boost', '4 Pips', '2 Pips', '0 Pips'],
+    colors: ['#0088d2', '#ff8c0d', '#D26D00', '#c06400'],
     func: function(cargo) { // X Axis is Cargo
-      return calcSpeed(ship.unladenMass + $scope.fuel + cargo, ship.speed, $scope.th.c, ship.pipSpeed);
+      return calcSpeed(ship.unladenMass + $scope.fuel + cargo, ship.speed, ship.boost, $scope.th.c, ship.pipSpeed);
     }
   };
   $scope.speedChart = {
@@ -360,7 +361,7 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', '
     $scope.speedSeries.xMax = $scope.trSeries.xMax = $scope.jrSeries.xMax = ship.cargoCapacity;
     $scope.jrSeries.yMax = ship.unladenRange;
     $scope.trSeries.yMax = ship.unladenTotalRange;
-    $scope.speedSeries.yMax = calcSpeed(ship.unladenMass, ship.speed, $scope.th.c, ship.pipSpeed)['4 Pips'];
+    $scope.speedSeries.yMax = calcSpeed(ship.unladenMass, ship.speed, ship.boost, $scope.th.c, ship.pipSpeed).boost;
     updateRetrofitCosts();
     win.triggerHandler('pwrchange');
   }

app/js/directives/directive-bar-chart.js

@@ -6,12 +6,14 @@ angular.module('app').directive('barChart', ['$window', '$translate', '$rootScop
 
   function insertLinebreaks(d) {
     var el = d3.select(this);
-    var words = d.split('\n');
+    var lines = d.split('\n');
     el.text('').attr('y', -6);
-    for (var i = 0; i < words.length; i++) {
+    for (var i = 0; i < lines.length; i++) {
-      var tspan = el.append('tspan').text(words[i]);
+      var tspan = el.append('tspan').text(lines[i].length > 18 ? lines[i].substring(0, 15) + '...' : lines[i]);
       if (i > 0) {
         tspan.attr('x', -9).attr('dy', '1em');
+      } else {
+        tspan.attr('class', 'primary');
       }
     }
   }

app/js/directives/directive-line-chart.js

@@ -11,7 +11,7 @@ angular.module('app').directive('lineChart', ['$window', '$translate', '$rootSco
     link: function(scope, element) {
       var seriesConfig = scope.series,
           series = seriesConfig.series,
-          color = d3.scale.ordinal().range([ '#ff8c0d']),
+          color = d3.scale.ordinal().range(scope.series.colors ? scope.series.colors : ['#ff8c0d']),
           config = scope.config,
           labels = config.labels,
           margin = { top: 15, right: 15, bottom: 35, left: 60 },
@@ -42,16 +42,18 @@ angular.module('app').directive('lineChart', ['$window', '$translate', '$rootSco
           .attr('transform', 'rotate(-90)')
           .attr('y', -50)
           .attr('dy', '.1em')
-          .style('text-anchor', 'middle')
+          .style('text-anchor', 'middle');
-          .text($translate.instant(labels.yAxis.title) + ' (' + $translate.instant(labels.yAxis.unit) + ')');
+
       // Create X Axis SVG Elements
       var xLbl = vis.append('g').attr('class', 'x axis');
       var xTxt = xLbl.append('text')
           .attr('class', 'cap')
           .attr('y', 30)
           .attr('dy', '.1em')
-          .style('text-anchor', 'middle')
+          .style('text-anchor', 'middle');
-          .text($translate.instant(labels.xAxis.title) + ' (' + $translate.instant(labels.xAxis.unit) + ')');
+
+      // xTxt.append('tspan').attr('class', 'metric');
+      // yTxt.append('tspan').attr('class', 'metric');
 
       // Create and Add tooltip
       var tipHeight = 2 + (1.25 * (series ? series.length : 0.75));
@@ -64,9 +66,9 @@ angular.module('app').directive('lineChart', ['$window', '$translate', '$rootSco
         .attr('class', 'tip');
 
       tips.append('text')
-      .attr('class', 'label x')
+        .attr('class', 'label x')
-      .attr('dy', (-tipHeight / 2) + 'em')
+        .attr('dy', (-tipHeight / 2) + 'em')
-      .attr('y', '1.25em');
+        .attr('y', '1.25em');
 
       var background = vis.append('rect') // Background to capture hover/drag
         .attr('fill-opacity', 0)
@@ -203,8 +205,8 @@ angular.module('app').directive('lineChart', ['$window', '$translate', '$rootSco
         tips.selectAll('text.label.y').text(function(d, i) {
           var yVal = series ? y0[series[i]] : y0;
           yTotal += yVal;
-          return (series ? series[i] : '') + ' ' + fmtLong(yVal) + ' ' + $translate.instant(labels.yAxis.unit);
+          return (series ?  $translate.instant(series[i]) : '') + ' ' + fmtLong(yVal);
-        });
+        }).append('tspan').attr('class','metric').text(' ' + $translate.instant(labels.yAxis.unit));
 
         tips.selectAll('text').each(function() {
           if (this.getBBox().width > tipWidth) {
@@ -215,7 +217,7 @@ angular.module('app').directive('lineChart', ['$window', '$translate', '$rootSco
         tipWidth += 8;
         markers.selectAll('circle.marker').attr('cx', x(x0)).attr('cy', function(d, i) { return y(series ? y0[series[i]] : y0); });
         tips.selectAll('text.label').attr('x', flip ? -12 : 12).style('text-anchor', flip ? 'end' : 'start');
-        tips.selectAll('text.label.x').text(fmtLong(x0) + ' ' + $translate.instant(labels.xAxis.unit));
+        tips.selectAll('text.label.x').text(fmtLong(x0)).append('tspan').attr('class','metric').text(' ' + $translate.instant(labels.xAxis.unit));
         tips.attr('transform', 'translate(' + x(x0) + ',' + Math.max(minTransY, y(yTotal / (series ? series.length : 1))) + ')');
         tips.selectAll('rect')
           .attr('width', tipWidth + 4)
@@ -225,8 +227,8 @@ angular.module('app').directive('lineChart', ['$window', '$translate', '$rootSco
       }
 
       function updateFormats() {
-        xTxt.text($translate.instant(labels.xAxis.title) + ' (' + $translate.instant(labels.xAxis.unit) + ')');
+        xTxt.text($translate.instant(labels.xAxis.title)).append('tspan').attr('class', 'metric').text(' (' + $translate.instant(labels.xAxis.unit) + ')');
-        yTxt.text($translate.instant(labels.yAxis.title) + ' (' + $translate.instant(labels.yAxis.unit) + ')');
+        yTxt.text($translate.instant(labels.yAxis.title)).append('tspan').attr('class', 'metric').text(' (' + $translate.instant(labels.yAxis.unit) + ')');
         fmtLong = $rootScope.localeFormat.numberFormat('.2f');
         xAxis.tickFormat($rootScope.localeFormat.numberFormat('.2r'));
         yAxis.tickFormat($rootScope.localeFormat.numberFormat('.3r'));

app/js/i18n/en.js

@@ -1,218 +1,216 @@
 angular.module('app').config(['$translateProvider', function($translateProvider) {
-
+  $translateProvider.translations('en', {
-  $translateProvider
+    PHRASE_EXPORT_DESC: 'A detailed JSON export of your build for use in other sites and tools',
-    .translations('en', {
+    'A-Rated': 'A-Rated',
-      PHRASE_EXPORT_DESC: 'A detailed JSON export of your build for use in other sites and tools',
+    about: 'about',
-      'A-Rated': 'A-Rated',
+    action: 'action',
-      about: 'about',
+    added: 'added',
-      action: 'action',
+    Advanced: 'Advanced',
-      added: 'added',
+    'Advanced Discovery Scanner': 'Advanced Discovery Scanner',
-      Advanced: 'Advanced',
+    agility: 'agility',
-      'Advanced Discovery Scanner': 'Advanced Discovery Scanner',
+    alpha: 'alpha',
-      agility: 'agility',
+    ammo: 'ammo',
-      alpha: 'alpha',
+    PHRASE_CONFIRMATION: 'Are You Sure?',
-      ammo: 'ammo',
+    armour: 'armour',
-      PHRASE_CONFIRMATION: 'Are You Sure?',
+    am: 'Auto Field-Maintenance Unit',
-      armour: 'armour',
+    available: 'available',
-      am: 'Auto Field-Maintenance Unit',
+    backup: 'backup',
-      available: 'available',
+    'Basic Discovery Scanner': 'Basic Discovery Scanner',
-      backup: 'backup',
+    bl: 'Beam Laser',
-      'Basic Discovery Scanner': 'Basic Discovery Scanner',
+    beta: 'beta',
-      bl: 'Beam Laser',
+    bins: 'bins',
-      beta: 'beta',
+    boost: 'boost',
-      bins: 'bins',
+    build: 'build',
-      boost: 'boost',
+    'build name': 'Build Name',
-      build: 'build',
+    builds: 'builds',
-      'build name': 'Build Name',
+    bh: 'bulkheads',
-      builds: 'builds',
+    ul: 'Burst Laser',
-      bh: 'bulkheads',
+    buy: 'buy',
-      ul: 'Burst Laser',
+    cancel: 'cancel',
-      buy: 'buy',
+    c: 'Cannon',
-      cancel: 'cancel',
+    capital: 'capital',
-      c: 'Cannon',
+    cargo: 'cargo',
-      capital: 'capital',
+    'Cargo Hatch': 'Cargo Hatch',
-      cargo: 'cargo',
+    cr: 'Cargo Rack',
-      'Cargo Hatch': 'Cargo Hatch',
+    cs: 'Cargo Scanner',
-      cr: 'Cargo Rack',
+    cells: 'cells',
-      cs: 'Cargo Scanner',
+    'Chaff Launcher': 'Chaff Launcher',
-      cells: 'cells',
+    close: 'close',
-      'Chaff Launcher': 'Chaff Launcher',
+    cc: 'Collector Limpet Controller',
-      close: 'close',
+    compare: 'compare',
-      cc: 'Collector Limpet Controller',
+    'compare all': 'compare all',
-      compare: 'compare',
+    comparison: 'comparison',
-      'compare all': 'compare all',
+    comparisons: 'comparisons',
-      comparison: 'comparison',
+    component: 'component',
-      comparisons: 'comparisons',
+    cost: 'cost',
-      component: 'component',
+    costs: 'costs',
-      cost: 'cost',
+    cm: 'Countermeasure',
-      costs: 'costs',
+    CR: 'CR',
-      cm: 'Countermeasure',
+    create: 'create',
-      CR: 'CR',
+    'create new': 'create new',
-      create: 'create',
+    credits: 'credits',
-      'create new': 'create new',
+    Cytoscrambler: 'Cytoscrambler',
-      credits: 'credits',
+    damage: 'damage',
-      Cytoscrambler: 'Cytoscrambler',
+    delete: 'delete',
-      damage: 'damage',
+    'delete all': 'delete all',
-      delete: 'delete',
+    dep: 'dep',
-      'delete all': 'delete all',
+    deployed: 'deployed',
-      dep: 'dep',
+    'detailed export': 'detailed export',
-      deployed: 'deployed',
+    'Detailed Surface Scanner': 'Detailed Surface Scanner',
-      'detailed export': 'detailed export',
+    disabled: 'disabled',
-      'Detailed Surface Scanner': 'Detailed Surface Scanner',
+    discount: 'discount',
-      disabled: 'disabled',
+    Distruptor: 'Distruptor',
-      discount: 'discount',
+    dc: 'Docking Computer',
-      Distruptor: 'Distruptor',
+    done: 'done',
-      dc: 'Docking Computer',
+    DPS: 'DPS',
-      done: 'done',
+    'edit data': 'edit data',
-      DPS: 'DPS',
+    efficiency: 'efficiency',
-      'edit data': 'edit data',
+    'Electronic Countermeasure': 'Electronic Countermeasure',
-      efficiency: 'efficiency',
+    empty: 'empty',
-      'Electronic Countermeasure': 'Electronic Countermeasure',
+    Enforcer: 'Enforcer',
-      empty: 'empty',
+    ENG: 'ENG',
-      Enforcer: 'Enforcer',
+    'enter name': 'Enter Name',
-      ENG: 'ENG',
+    EPS: 'EPS',
-      'enter name': 'Enter Name',
+    export: 'export',
-      EPS: 'EPS',
+    fixed: 'fixed',
-      export: 'export',
+    forum: 'forum',
-      fixed: 'fixed',
+    fc: 'Fragment Cannon',
-      forum: 'forum',
+    fd: 'Frame Shift Drive',
-      fc: 'Fragment Cannon',
+    ws: 'Frame Shift Wake Scanner',
-      fd: 'Frame Shift Drive',
+    FSD: 'FSD',
-      ws: 'Frame Shift Wake Scanner',
+    fi: 'FSD Interdictor',
-      FSD: 'FSD',
+    fuel: 'fuel',
-      fi: 'FSD Interdictor',
+    fs: 'Fuel Scoop',
-      fuel: 'fuel',
+    ft: 'Fuel Tank',
-      fs: 'Fuel Scoop',
+    fx: 'Fuel Transfer Limpet Controller',
-      ft: 'Fuel Tank',
+    'full tank': 'full tank',
-      fx: 'Fuel Transfer Limpet Controller',
+    Gimballed: 'Gimballed',
-      'full tank': 'full tank',
+    H: 'H',
-      Gimballed: 'Gimballed',
+    hardpoints: 'hardpoints',
-      H: 'H',
+    hb: 'Hatch Breaker Limpet Controller',
-      hardpoints: 'hardpoints',
+    'Heat Sink Launcher': 'Heat Sink Launcher',
-      hb: 'Hatch Breaker Limpet Controller',
+    huge: 'huge',
-      'Heat Sink Launcher': 'Heat Sink Launcher',
+    hull: 'hull',
-      huge: 'huge',
+    hr: 'Hull Reinforcement Package',
-      hull: 'hull',
+    'Imperial Hammer': 'Imperial Hammer',
-      hr: 'Hull Reinforcement Package',
+    import: 'import',
-      'Imperial Hammer': 'Imperial Hammer',
+    'import all': 'import all',
-      import: 'import',
+    insurance: 'insurance',
-      'import all': 'import all',
+    'Intermediate Discovery Scanner': 'Intermediate Discovery Scanner',
-      insurance: 'insurance',
+    'internal compartments': 'internal compartments',
-      'Intermediate Discovery Scanner': 'Intermediate Discovery Scanner',
+    'jump range': 'jump range',
-      'internal compartments': 'internal compartments',
+    jumps: 'jumps',
-      'jump range': 'jump range',
+    kw: 'Kill Warrant Scanner',
-      jumps: 'jumps',
+    L: 'L',
-      kw: 'Kill Warrant Scanner',
+    laden: 'laden',
-      L: 'L',
+    language: 'language',
-      laden: 'laden',
+    large: 'large',
-      language: 'language',
+    ls: 'life support',
-      large: 'large',
+    'Lightweight Alloy': 'Lightweight Alloy',
-      ls: 'life support',
+    'lock factor': 'lock factor',
-      'Lightweight Alloy': 'Lightweight Alloy',
+    LS: 'Ls',
-      'lock factor': 'lock factor',
+    LY: 'LY',
-      LS: 'Ls',
+    M: 'M',
-      LY: 'LY',
+    'm/s': 'm/s',
-      M: 'M',
+    mass: 'mass',
-      'm/s': 'm/s',
+    max: 'max',
-      mass: 'mass',
+    'max mass': 'max mass',
-      max: 'max',
+    medium: 'medium',
-      'max mass': 'max mass',
+    'Military Grade Composite': 'Military Grade Composite',
-      medium: 'medium',
+    nl: 'Mine Launcher',
-      'Military Grade Composite': 'Military Grade Composite',
+    'Mining Lance': 'Mining Lance',
-      nl: 'Mine Launcher',
+    ml: 'Mining Laser',
-      'Mining Lance': 'Mining Lance',
+    'Mirrored Surface Composite': 'Mirrored Surface Composite',
-      ml: 'Mining Laser',
+    mr: 'Missile Rack',
-      'Mirrored Surface Composite': 'Mirrored Surface Composite',
+    mc: 'Multi-cannon',
-      mr: 'Missile Rack',
+    'net cost': 'net cost',
-      mc: 'Multi-cannon',
+    no: 'no',
-      'net cost': 'net cost',
+    PHRASE_NO_BUILDS: 'No builds added to comparison!',
-      no: 'no',
+    PHRASE_NO_RETROCH: 'No Retrofitting changes',
-      PHRASE_NO_BUILDS: 'No builds added to comparison!',
+    none: 'none',
-      PHRASE_NO_RETROCH: 'No Retrofitting changes',
+    'none created': 'none created',
-      none: 'none',
+    off: 'off',
-      'none created': 'none created',
+    on: 'on',
-      off: 'off',
+    optimal: 'optimal',
-      on: 'on',
+    'optimal mass': 'optimal mass',
-      optimal: 'optimal',
+    'optimize mass': 'optimize mass',
-      'optimal mass': 'optimal mass',
+    overwrite: 'overwrite',
-      'optimize mass': 'optimize mass',
+    Pacifier: 'Pacifier',
-      overwrite: 'overwrite',
+    'Pack-Hound': 'Pack-Hound',
-      Pacifier: 'Pacifier',
+    PHRASE_IMPORT: 'Paste JSON or import here',
-      'Pack-Hound': 'Pack-Hound',
+    pen: 'pen',
-      PHRASE_IMPORT: 'Paste JSON or import here',
+    penetration: 'penetration',
-      pen: 'pen',
+    permalink: 'permalink',
-      penetration: 'penetration',
+    pa: 'Plasma Accelerator',
-      permalink: 'permalink',
+    'Point Defence': 'Point Defence',
-      pa: 'Plasma Accelerator',
+    power: 'power',
-      'Point Defence': 'Point Defence',
+    pd: 'power distributor',
-      power: 'power',
+    pp: 'power plant',
-      pd: 'power distributor',
+    pri: 'pri',
-      pp: 'power plant',
+    priority: 'priority',
-      pri: 'pri',
+    psg: 'Prismatic Shield Generator',
-      priority: 'priority',
+    proceed: 'proceed',
-      psg: 'Prismatic Shield Generator',
+    pc: 'Prospector Limpet Controller',
-      proceed: 'proceed',
+    pl: 'Pulse Laser',
-      pc: 'Prospector Limpet Controller',
+    PWR: 'PWR',
-      pl: 'Pulse Laser',
+    rg: 'Rail Gun',
-      PWR: 'PWR',
+    range: 'range',
-      rg: 'Rail Gun',
+    rate: 'rate',
-      range: 'range',
+    'Reactive Surface Composite': 'Reactive Surface Composite',
-      rate: 'rate',
+    recharge: 'recharge',
-      'Reactive Surface Composite': 'Reactive Surface Composite',
+    rf: 'Refinery',
-      recharge: 'recharge',
+    'refuel time': 'refuel time',
-      rf: 'Refinery',
+    'Reinforced Alloy': 'Reinforced Alloy',
-      'refuel time': 'refuel time',
+    reload: 'reload',
-      'Reinforced Alloy': 'Reinforced Alloy',
+    rename: 'rename',
-      reload: 'reload',
+    repair: 'repair',
-      rename: 'rename',
+    reset: 'reset',
-      repair: 'repair',
+    ret: 'ret',
-      reset: 'reset',
+    retracted: 'retracted',
-      ret: 'ret',
+    'retrofit costs': 'retrofit costs',
-      retracted: 'retracted',
+    'retrofit from': 'retrofit from',
-      'retrofit costs': 'retrofit costs',
+    ROF: 'ROF',
-      'retrofit from': 'retrofit from',
+    S: 'S',
-      ROF: 'ROF',
+    save: 'save',
-      S: 'S',
+    sc: 'scanner',
-      save: 'save',
+    PHRASE_SELECT_BUILDS: 'Select Builds to Compare',
-      sc: 'scanner',
+    sell: 'sell',
-      PHRASE_SELECT_BUILDS: 'Select Builds to Compare',
+    s: 'sensors',
-      sell: 'sell',
+    settings: 'settings',
-      s: 'sensors',
+    sb: 'Shield Booster',
-      settings: 'settings',
+    scb: 'Shield Cell Bank',
-      sb: 'Shield Booster',
+    sg: 'Shield Generator',
-      scb: 'Shield Cell Bank',
+    shields: 'shields',
-      sg: 'Shield Generator',
+    ship: 'ship',
-      shields: 'shields',
+    ships: 'ships',
-      ship: 'ship',
+    shortened: 'shortened',
-      ships: 'ships',
+    size: 'size',
-      shortened: 'shortened',
+    skip: 'skip',
-      size: 'size',
+    small: 'small',
-      skip: 'skip',
+    speed: 'speed',
-      small: 'small',
+    standard: 'standard',
-      speed: 'speed',
+    'Standard Docking Computer': 'Standard Docking Computer',
-      standard: 'standard',
+    Stock: 'Stock',
-      'Standard Docking Computer': 'Standard Docking Computer',
+    SYS: 'SYS',
-      Stock: 'Stock',
+    T: 'T',
-      SYS: 'SYS',
+    T_LOAD: 't-load',
-      T: 'T',
+    'The Retributor': 'The Retributor',
-      T_LOAD: 't-load',
+    t: 'thrusters',
-      'The Retributor': 'The Retributor',
+    time: 'time',
-      t: 'thrusters',
+    tp: 'Torpedo Pylon',
-      time: 'time',
+    total: 'total',
-      tp: 'Torpedo Pylon',
+    'total range': 'total range',
-      total: 'total',
+    turret: 'turret',
-      'total range': 'total range',
+    type: 'type',
-      turret: 'turret',
+    U: 'U',
-      type: 'type',
+    unladen: 'unladen',
-      U: 'U',
+    PHRASE_UPDATE_RDY: 'Update Available! Click to Refresh',
-      unladen: 'unladen',
+    URL: 'URL',
-      PHRASE_UPDATE_RDY: 'Update Available! Click to Refresh',
+    utility: 'utility',
-      URL: 'URL',
+    'utility mounts': 'utility mounts',
-      utility: 'utility',
+    version: 'version',
-      'utility mounts': 'utility mounts',
+    WEP: 'WEP',
-      version: 'version',
+    yes: 'yes',
-      WEP: 'WEP',
+    PHRASE_BACKUP_DESC: 'Backup of all Coriolis data to save or transfer to another browser/device'
-      yes: 'yes',
+  });
-      PHRASE_BACKUP_DESC: 'Backup of all Coriolis data to save or transfer to another browser/device'
-    });
 }]);

app/js/i18n/es.js

@@ -17,247 +17,195 @@ angular.module('app').config(['$translateProvider', 'localeFormatProvider', func
   });
 
   $translateProvider.translations('es', {
-    PHRASE_EXPORT_DESC: 'Ein detaillierter JSON-Export Ihrer Konfiguration für die Verwendung in anderen Websites und Tools',
+    'PHRASE_EXPORT_DESC': 'Una detallada exportaci\u00f3n JSON de tu construcci\u00f3n para usarlo en otros sitios web y herramientas',
-    A_RATED: 'A-Klasse',
+    'A-Rated': 'Calidad-A',
-    ABOUT: 'Über',
+    'about': 'Acerca',
-    ACTION: 'Aktion',
+    'action': 'Acci\u00f3n',
-    ADDED: 'Hinzugefügt',
+    'added': 'A\u00f1adido',
-    ADDER: 'Adder',
+    'Advanced Discovery Scanner': 'Esc\u00e1ner de exploraci\u00f3n avanzado',
-    ADVANCED: 'Fortgeschritten',
+    'agility': 'Maniobrabilidad',
-    'Advanced Discovery Scanner': 'Fortgeschrittener Aufklärungsscanner',
+    'alpha': 'Alfa',
-    'Advanced Plasma Laser': 'Fortgeschrittener Plasma-Laser',
+    'ammo': 'Munici\u00f3n',
-    AGILITY: 'Beweglichkeit',
+    'PHRASE_CONFIRMATION': '\u00bfEst\u00e1s seguro?',
-    ALPHA: 'Alpha',
+    'armour': 'Blindaje',
-    AMMO: 'Munition',
+    'am': 'Unidad de auto-reparaciones',
-    ANACONDA: 'Anaconda',
+    'available': 'Disponible',
-    PHRASE_CONFIRMATION: 'Sind Sie sicher?',
+    'backup': 'Reserva',
-    ARMOUR: 'Panzerung',
+    'Basic Discovery Scanner': 'Esc\u00e1ner de exploraci\u00f3n b\u00e1sico',
-    ASP_EXPLORER: 'Asp Explorer',
+    'bl': 'L\u00e1ser de haz',
-    am: 'Automatische Feldwartungseinheit',
+    'bins': 'contenedores',
-    AVAILABLE: 'Verfügbar',
+    'boost': 'incrementar',
-    BACKUP: 'Sicherungsdatei',
+    'build': 'Construcci\u00f3n',
-    'Basic Discovery Scanner': 'Einfacher Aufklärungsscanner',
+    'build name': 'Nombre de la construcci\u00f3n',
-    bl: 'Strahlenlaser',
+    'builds': 'Construcciones',
-    BELUGA_LINER: 'Beluga Liner',
+    'bh': 'mamparos',
-    BETA: 'beta',
+    'ul': 'Laser de r\u00e1fagas',
-    BINS: 'Behälter',
+    'buy': 'Comprar',
-    BOOST: 'Boost',
+    'cancel': 'Cancelar',
-    BUILD: 'Konfiguration',
+    'c': 'Ca\u00f1\u00f3n',
-    BUILD_NAME: 'Konfigurationsname',
+    'capital': 'capital',
-    BUILDS: 'Konfigurationen',
+    'cargo': 'Carga',
-    BULKHEADS: 'Rumpfhüllenverstärkung',
+    'Cargo Hatch': 'Compuerta de carga',
-    ul: 'Salvenlaser',
+    'cr': 'Compartimento de carga',
-    BUY: 'Kaufen',
+    'cs': 'Esc\u00e1ner de carga',
-    CANCEL: 'Abbrechen',
+    'cells': 'celdas',
-    c: 'Kanone',
+    'Chaff Launcher': 'Lanzador de birutas',
-    CAPITAL: 'kapital',
+    'close': 'Cerrar',
-    CARGO: 'Fracht',
+    'cc': 'Controlador de Drones de Recogida',
-    CARGO_HATCH: 'Frachtluke',
+    'compare': 'Comparar',
-    cr: 'Frachtgestell',
+    'compare all': 'comparar todas',
-    cs: 'Frachtscanner',
+    'comparison': 'Comparativa',
-    CELLS: 'Zellen',
+    'comparisons': 'Comparativas',
-    CHAFF_LAUNCHER: 'Düppel-Werfer',
+    'component': 'Componente',
-    CLOSE: 'Schließen',
+    'cost': 'Coste',
-    COBRA_MK_III: 'Cobra MK III',
+    'costs': 'Costes',
-    COBRA_MK_IV: 'Cobra MK IV',
+    'cm': 'Contramedidas',
-    cc: 'Krallensteuerung: Sammler',
+    'create': 'Crear',
-    COMPARE: 'Vergleichen',
+    'create new': 'Crear nuevo',
-    COMPARE_ALL: 'Alles Vergleichen',
+    'credits': 'Cr\u00e9ditos',
-    COMPARISON: 'Vergleich',
+    'damage': 'Da\u00f1o',
-    COMPARISONS: 'Vergleiche',
+    'delete': 'Borrar',
-    COMPONENT: 'Komponente',
+    'delete all': 'Borrar todo',
-    COST: 'Kostet',
+    'dep': 'desp',
-    COSTS: 'Kosten',
+    'deployed': 'Desplegado',
-    cm: 'Gegenmaßnahme',
+    'detailed export': 'Exportacion detallada',
-    CR: 'CR',
+    'Detailed Surface Scanner': 'Escaner de exploraci\u00f3n detallada',
-    CREATE: 'Erstellen',
+    'disabled': 'Desactivado',
-    CREATE_NEW: 'Neu Erstellen',
+    'discount': 'Descuento',
-    CREDITS: 'Credits',
+    'dc': 'Ordenador de aterrizaje',
-    Cytoscrambler: 'Zytostreuer',
+    'done': 'Hecho',
-    DAMAGE: 'Schaden',
+    'DPS': 'DPS (Da\u00f1o Por Segundo)',
-    DELETE: 'Löschen',
+    'edit data': 'Editar datos',
-    DELETE_ALL: 'Alles Löschen',
+    'efficiency': 'Eficiencia',
-    DEP: 'Ausg',
+    'Electronic Countermeasure': 'Contramedidas electr\u00f3nicas',
-    DEPLOYED: 'Ausgefahren',
+    'empty': 'Vac\u00edo',
-    DETAILED_EXPORT: 'Detailiertes Exportieren',
+    'ENG': 'MOT',
-    'Detailed Surface Scanner': 'Detailoberflächenscanner',
+    'enter name': 'Introduce el nombre',
-    DIAMONDBACK_EXPLORER: 'Diamondback-Erkunder',
+    'export': 'exportar',
-    DIAMONDBACK_SCOUT: 'Diamondback-Aufklärer',
+    'fixed': 'fijo',
-    DISABLED: 'Deaktiviert',
+    'forum': 'Foro',
-    DISCOUNT: 'Rabatt',
+    'fc': 'Ca\u00f1\u00f3n de fragmentaci\u00f3n',
-    Distruptor: 'Disruptor',
+    'fd': 'Motor de salto',
-    dc: 'Standard-Landecomputer',
+    'ws': 'Esc\u00e1ner de Salto',
-    DOLPHIN: 'Dolphin',
+    'fi': 'Interdictor FSD',
-    DONE: 'Fertig',
+    'fuel': 'Combustible',
-    DPS: 'DPS',
+    'fs': 'Recolector de Combustible',
-    EAGLE: 'Eagle',
+    'ft': 'Tanque de combustible',
-    EDIT_DATA: 'Bearbeiten',
+    'fx': 'Sistema de Transferencia de Combustilble',
-    EFFICIENCY: 'Effizienz',
+    'full tank': 'Tanque lleno',
-    'Electronic Countermeasure': 'Elektronische Gegenmaßnahme',
+    'Gimballed': 'Card\u00e1n',
-    EMPTY: 'leer',
+    'H': 'E',
-    ENFORCER: 'Vollstrecker',
+    'hardpoints': 'Montura de armas',
-    ENG: 'FAH',
+    'hb': 'Controlador de Apertura de Bah\u00eda de Carga',
-    PHRASE_ENTER_BUILD_NAME: '',
+    'Heat Sink Launcher': 'Eyector de Acumulador de Calor',
-    EPS: 'en/s',
+    'huge': 'enorme',
-    EXPORT: 'Exportieren',
+    'hull': 'Casco',
-    FEDERAL_CORVETTE: 'Föderale Korvette',
+    'hr': 'Sistema de Casco Reforzado',
-    FEDERAL_DROPSHIP: 'Föderales Abwurfschiff',
+    'import': 'Importar',
-    FEDERAL_DROPSHIP_MK_II: 'Föderales Abwurfschiff Mk II',
+    'import all': 'Importar todo',
-    FEDERAL_GUNSHIP: 'Föderales Kanonenschiff',
+    'insurance': 'Seguro',
-    FER_DE_LANCE: 'Fer-de-Lance',
+    'Intermediate Discovery Scanner': 'Esc\u00e1ner de exploraci\u00f3n media',
-    FIXED: '',
+    'internal compartments': 'Compartimentos internos',
-    FORUM: 'Forum',
+    'jump range': 'Rango de salto',
-    fc: 'Splitterkanone',
+    'jumps': 'Saltos',
-    fd: 'Frameshift-Antrieb',
+    'kw': 'Esc\u00e1ner Detector de Recompensas',
-    ws: 'Sogwolkenscanner',
+    'L': 'G',
-    FSD: 'FSA',
+    'laden': 'Cargada',
-    fi: 'FSA-Unterbrecher',
+    'language': 'Idioma',
-    FUEL: 'Treibstoff',
+    'large': 'Grande',
-    fs: 'Treibstoffsammler',
+    'ls': 'Soporte vital',
-    ft: 'Treibstofftank',
+    'Lightweight Alloy': 'Aleaci\u00f3n ligera',
-    fx: 'Krallensteuerung Treibstoffstransfer',
+    'lock factor': 'factor de bloqueo',
-    FULL_TANK: 'Tank voll',
+    'mass': 'Masa',
-    GIMBALLED: 'Kardianisch',
+    'max': 'm\u00e1x',
-    H: 'H',
+    'max mass': 'Masa m\u00e1xima',
-    HARDPOINTS: 'Waffenaufhängungen',
+    'medium': 'medio',
-    hb: 'Krallen-Steuereinheit (Ladelukenöffner)',
+    'Military Grade Composite': 'Blindaje Militar',
-    HAULER: 'Hauler',
+    'nl': 'Lanzaminas',
-    'Heat Sink Launcher': 'Kühlkörperwerfer',
+    'Mining Lance': 'Lanza de miner\u00eda',
-    HUGE: 'Riesig',
+    'ml': 'L\u00e1ser de miner\u00eda',
-    HULL: 'Hülle',
+    'Mirrored Surface Composite': 'Blindaje Reflectante',
-    hr: 'Rumpfhüllenverstärkung (Paket)',
+    'mr': 'Bah\u00eda de Misiles',
-    IMPERIAL_CLIPPER: 'Imperialer Clipper',
+    'mc': 'Ca\u00f1\u00f3n m\u00faltiple',
-    IMPERIAL_COURIER: 'Imperialer Kurier',
+    'net cost': 'Coste neto',
-    IMPERIAL_CUTTER: 'Imperialer Cutter',
+    'PHRASE_NO_BUILDS': '\u00a1No se a\u00f1adieron plantillas para comparaci\u00f3n!',
-    IMPERIAL_EAGLE: 'Imperialer Eagle',
+    'PHRASE_NO_RETROCH': 'No hay cambios en los ajutes',
-    IMPERIAL_HAMMER: 'Imperialer Hammer',
+    'none': 'Nada',
-    IMPORT: 'Importieren',
+    'none created': 'Nada creado',
-    IMPORT_ALL: 'Alles Importieren',
+    'off': 'apagado',
-    INSURANCE: 'Versicherung',
+    'on': 'encendido',
-    'Intermediate Discover Scanner': 'Mittlerer Aufklärungsscanner',
+    'optimal': '\u00f3ptimo',
-    INTERNAL_COMPARTMENTS: 'Innenbereichkabine',
+    'optimal mass': 'masa \u00f3ptima',
-    JUMP_RANGE: 'Sprungreichweite',
+    'optimize mass': 'optimizar masa',
-    JUMPS: 'Sprünge',
+    'overwrite': 'Sobreescribir',
-    kw: 'Tötungsbefehlscanner',
+    'PHRASE_IMPORT': 'Pega el JSON o imp\u00f3rtalo aqu\u00ed',
-    KRAIT: 'Krait',
+    'penetration': 'penetraci\u00f3n',
-    L: 'L',
+    'permalink': 'enlace permanente',
-    LADEN: 'Beladen',
+    'pa': 'Acelerador de Plasma',
-    LANGUAGE: 'Sprache',
+    'Point Defence': 'Punto de Defensa',
-    LARGE: 'Groß',
+    'power': 'energ\u00eda',
-    ls: 'Lebenserhaltung',
+    'pd': 'distribuidor de energ\u00eda',
-    'Lightweight Alloy': 'Leichte Legierung',
+    'pp': 'Planta de Energ\u00eda',
-    LOCK_FACTOR: 'Massensperrefaktor',
+    'priority': 'prioridad',
-    LS: 'LS',
+    'proceed': 'Proceder',
-    LY: 'LJ',
+    'pc': 'Controlador de drones de prospecci\u00f3n',
-    M: 'M',
+    'pl': 'L\u00e1ser de Pulso',
-    'm/s': 'M/Sec.',
+    'PWR': 'POT',
-    MASS: 'Masse',
+    'rg': 'Ca\u00f1\u00f3n de Riel',
-    MAX: 'max',
+    'range': 'rango',
-    MAX_MASS: 'maximale Masse',
+    'rate': 'ratio',
-    MEDIUM: 'Mittel',
+    'Reactive Surface Composite': 'Blindaje Reactivo',
-    'Military Grade Composite': 'Militär-Komposit',
+    'recharge': 'recargar',
-    nl: 'Minenwerfer',
+    'rf': 'Refineria',
-    'Mining Lance': 'Lanzenabbaulaser',
+    'refuel time': 'Tiempo para repostar',
-    ml: 'Abbaulaser',
+    'Reinforced Alloy': 'Armadura reforzada',
-    'Mirrored Surface Composite': 'Gespiegelte-Oberfläche-Komposit',
+    'reload': 'Recargar',
-    mr: 'Raketenbatterie',
+    'rename': 'Renombrar',
-    mc: 'Mehrfachgeschütz',
+    'repair': 'Reparar',
-    NET_COST: 'Nettokosten',
+    'reset': 'Reiniciar',
-    NO: 'Nein',
+    'ret': 'PLE',
-    NO_RETROFITTING_CHANGES: 'Keine Umrüständerungen',
+    'retracted': 'plegadas',
-    NONE: 'Nichts',
+    'retrofit costs': 'costes de equipamiento',
-    NONE_CREATED: 'Nichts erstellt',
+    'retrofit from': 'equipamiento desde',
-    OFF: 'Aus',
+    'ROF': 'RDF',
-    ON: 'An',
+    'S': 'P',
-    OPTIMAL: 'optimal',
+    'save': 'guardar',
-    OPTIMAL_MASS: 'optimale Masse',
+    'sc': 'sc\u00e1ner',
-    OPTIMIZE_MASS: 'Masse optimieren',
+    'PHRASE_SELECT_BUILDS': 'Selecciona equipamientos para comparar',
-    ORCA: 'Orca',
+    'sell': 'Vender',
-    OVERWRITE: 'Überschreiben',
+    's': 'Sensores',
-    Pacifier: 'Friedensstifter',
+    'settings': 'Configuraci\u00f3n',
-    'Pack-Hound': 'Schwarmwerfer',
+    'sb': 'Potenciador de Escudos',
-    PANTHER_CLIPPER: 'Panter Clipper',
+    'scb': 'C\u00e9lula de Energ\u00eda de Escudos',
-    PHRASE_IMPORT: 'JSON hier einfügen oder hier importieren',
+    'sg': 'Generador de escudos',
-    PEN: 'Durchdr',
+    'shields': 'Escudos',
-    PENETRATION: 'Durchdringung',
+    'ship': 'Nave ',
-    PERMALINK: 'Permalink',
+    'ships': 'Naves',
-    pa: 'Plasmabeschleuniger',
+    'shortened': 'Abreviado',
-    POINT_DEFENCE: 'Punktverteidigung',
+    'size': 'Tama\u00f1o',
-    POWER: 'Energie',
+    'skip': 'omitir',
-    pd: 'Energieverteiler',
+    'small': 'Peque\u00f1o',
-    pp: 'Kraftwerk',
+    'speed': 'velocidad',
-    PRI: 'Prio',
+    'standard': 'est\u00e1ndar',
-    PRIORITY: 'Priorität',
+    'Standard Docking Computer': 'Computador de Atraque Est\u00e1ndar',
-    psg: 'Prismaschildgenerator',
+    'Stock': 'De serie',
-    PROCEED: 'Fortfahren',
+    'SYS': 'SIS',
-    pc: 'Krallensteuerung: Erzsucher',
+    'T_LOAD': 'c-t\u00e9rmica',
-    pl: 'Impulslaser',
+    't': 'Propulsores',
-    PWR: 'En',
+    'time': 'Tiempo',
-    PYTHON: 'Python',
+    'tp': 'Anclaje de torpedo',
-    rg: 'Schienenkanone',
+    'total': 'Total',
-    RANGE: 'Reichweite',
+    'total range': 'Rango total',
-    RATE: 'Rate',
+    'turret': 'torreta',
-    'Reactive Surface Composite': 'Reaktive-Oberfläche-Komposit',
+    'type': 'Tipo',
-    RECHARGE: 'Aufladen',
+    'unladen': 'Sin carga',
-    rf: 'Raffinerie',
+    'PHRASE_UPDATE_RDY': 'Actualizacion disponible! Haz click para recargar',
-    REFUEL_TIME: 'Auftankzeit',
+    'URL': 'Enlace',
-    'Reinforced Alloy': 'Verstärkte Legierungen',
+    'utility': 'utilidad',
-    RELOAD: 'Aktualisieren',
+    'utility mounts': 'monturas de utilidad',
-    RENAME: 'Umbenennen',
+    'version': 'Versi\u00f3n',
-    REPAIR: 'Reparieren',
+    'WEP': 'ARM',
-    RESET: 'Zurücksetzen',
+    'yes': 'si',
-    RET: 'eing',
+    'PHRASE_BACKUP_DESC': 'Copia de seguridad de todos los datos de Coriolis para guardarlos o transferirlos a otro navegador\/dispositivo'
-    RETRACTED: 'Eingefahren',
-    RETROFIT_COSTS: 'Nachrüstkosten',
-    RETROFIT_FROM: 'Nachrüsten von',
-    ROF: 'Kad',
-    S: 'S',
-    SAVE: 'Speichern',
-    sc: 'Scanner',
-    PHRASE_SELECT_BUILDS: 'Wähle Konfigurationen zum Vergleichen',
-    SELL: 'Verkaufen',
-    s: 'Sensoren',
-    SETTINGS: 'Konfiguration',
-    sb: 'Schildverstärker',
-    scb: 'Schildzellenbank',
-    sg: 'Schildgenerator',
-    SHIELDS: 'Schilde',
-    SHIP: 'Schiff',
-    SHIPS: 'Schiffe',
-    SHORTENED: 'Gekürzt',
-    SIDEWINDER: 'Sidewinder',
-    SIZE: 'Größe',
-    SKIP: 'Überspringen',
-    SMALL: 'S',
-    SPEED: 'Geschwindigkeit',
-    STANDARD: 'Standard',
-    STANDARD_DOCKING_COMPUTER: 'Landecomputer',
-    STOCK: 'Standard',
-    SYS: 'SYS',
-    T: 'T',
-    T_LOAD: 'T-Lad',
-    THE_HUNTER: 'The Hunter',
-    'The Retributor': 'Retributor',
-    t: 'Schubdüsen',
-    TIME: 'Dauer',
-    tp: 'Torpedoaufhängung',
-    TOTAL: 'Gesamt',
-    TOTAL_RANGE: 'Maximale Reichweite',
-    TURRET: 'Geschützturm',
-    TYPE: 'Typ',
-    TYPE_6_TRANSPORTER: 'Typ-6 Transporter',
-    TYPE_7_TRANSPORTER: 'Typ-7 Transporter',
-    TYPE_9_HEAVY: 'Typ-9 Transporter (schwer)',
-    U: 'U',
-    UNLADEN: 'Unbeladen',
-    UPDATE_NOTIFICATION: 'Update verfügbar! Klicken zum Aktualisieren',
-    URL: 'URL',
-    UTILITY: 'Werkzeug',
-    UTILITY_MOUNTS: 'Werkzeug-Steckplatz',
-    VERSION: 'Version',
-    VIPER: 'Viper',
-    VULTURE: 'Vulture',
-    WEP: 'WAF',
-    YES: 'Ja'
   });
 }]);

app/js/i18n/fr.js

@@ -20,17 +20,17 @@ angular.module('app').config(['$translateProvider', 'localeFormatProvider', func
     about: 'à propos',
     added: 'ajouté',
     Advanced: 'Avancé',
-    'Advanced Discovery Scanner': 'Scanner de découverte avancé',
+    'Advanced Discovery Scanner': 'Détecteur découverte avancé',
     agility: 'manœuvrabilité',
     ammo: 'munitions',
     PHRASE_CONFIRMATION: 'Êtes-vous sûr ?',
     armour: 'Armure',
-    am: 'Unité de réparation automatique',
+    am: 'Unité de maintenance de terrain auto',
     available: 'Disponibilité',
     backup: 'sauvegarde',
-    'Basic Discovery Scanner': 'Scanner de découverte simple',
+    'Basic Discovery Scanner': 'Détecteur découverte simple',
     bl: 'Rayon Laser',
-    bins: 'bacs',
+    bins: 'bennes',
     build: 'Configuration',
     'build name': 'Nom de la configuration',
     builds: 'Configurations',
@@ -40,9 +40,9 @@ angular.module('app').config(['$translateProvider', 'localeFormatProvider', func
     cancel: 'Annuler',
     c: 'Canon',
     cargo: 'Soute',
-    'Cargo Hatch': 'Ecoutille de soute',
+    'Cargo Hatch': 'Écoutille de soute',
     cr: 'Compartiment de soute',
-    cs: 'Scanner de soute',
+    cs: 'Détecteur de cargaison',
     cells: 'Cellules',
     'Chaff Launcher': 'Lanceur de paillettes',
     close: 'fermer',
@@ -64,15 +64,15 @@ angular.module('app').config(['$translateProvider', 'localeFormatProvider', func
     dep: 'depl',
     deployed: 'déployé',
     'detailed export': 'export détaillé',
-    'Detailed Surface Scanner': 'Scanner de surface détaillé',
+    'Detailed Surface Scanner': 'Détecteur surface détaillé',
     disabled: 'désactivé',
     discount: 'réduction',
     Distruptor: 'Disrupteur',
     dc: 'Ordinateur d\'appontage',
     done: 'Valider',
     'edit data': 'Editer donnée',
-    efficiency: 'efficience',
+    efficiency: 'efficacité',
-    'Electronic Countermeasure': 'Contre mesure électronique',
+    'Electronic Countermeasure': 'Contre-mesures électroniques',
     empty: 'Vide',
     'enter name': 'Entrer un nom',
     fixed: 'fixé',
@@ -83,28 +83,28 @@ angular.module('app').config(['$translateProvider', 'localeFormatProvider', func
     fuel: 'carburant',
     fs: 'Récupérateur de carburant',
     ft: 'Réservoir de carburant',
-    fx: 'Drone de ravitaillement',
+    fx: 'Contrôleur de ravitailleur',
     'full tank': 'Réservoir plein',
     Gimballed: 'Point',
     hardpoints: 'Points d\'emport',
     hb: 'Contrôle de patelle perce-soute',
-    'Heat Sink Launcher': 'Ejecteur de dissipateur thermique',
+    'Heat Sink Launcher': 'Éjecteur de dissipateur thermique',
     huge: 'Très grand',
     hull: 'Coque',
-    hr: 'Renfort de soute',
+    hr: 'Ensemble de mesures permettant de',
     'Imperial Hammer': 'Marteau impérial',
     import: 'Importer',
     'import all': 'Importer tout',
     insurance: 'Assurance',
-    'Intermediate Discovery Scanner': 'Scanner de découverte intermédiaire',
+    'Intermediate Discovery Scanner': 'Détecteur découverte intermédiaire',
     'internal compartments': 'compartiments internes',
     'jump range': 'Distance de saut',
     jumps: 'Sauts',
     kw: 'Détecteur d\'avis de recherche',
     laden: 'chargé',
-    language: 'Langage',
+    language: 'Langue',
     large: 'large',
-    ls: 'Support vital',
+    ls: 'Systèmes de survie',
     'Lightweight Alloy': 'alliage léger',
     'lock factor': 'facteur inhibition de masse',
     LS: 'SL',
@@ -115,8 +115,8 @@ angular.module('app').config(['$translateProvider', 'localeFormatProvider', func
     nl: 'Lance-mines',
     'Mining Lance': 'Lance de minage',
     ml: 'Laser minier',
-    'Mirrored Surface Composite': 'Composite à surface mirroir',
+    'Mirrored Surface Composite': 'Composite à surface miroir',
-    mr: 'Lance missiles',
+    mr: 'Batterie de missiles',
     mc: 'Canon multiple',
     'net cost': 'coûts nets',
     no: 'non',
@@ -137,15 +137,15 @@ angular.module('app').config(['$translateProvider', 'localeFormatProvider', func
     pa: 'accélérateur plasma',
     'Point Defence': 'Défense ponctuelle',
     power: 'énergie',
-    pd: 'distributeur d\'énérgie',
+    pd: 'Répartiteur de puissance',
-    pp: 'centrale d\'énergie',
+    pp: 'Générateur',
     priority: 'priorité',
     psg: 'générateur de bouclier prisme',
     proceed: 'continuer',
-    pc: 'Drône de minage',
+    pc: 'Contrôleur de prospecteur',
     pl: 'Laser à impulsion',
     PWR: 'P',
-    rg: 'Canon électromagnétique',
+    rg: 'Canon électrique',
     range: 'portée',
     rate: 'cadence',
     'Reactive Surface Composite': 'Composite à surface réactive',
@@ -166,7 +166,7 @@ angular.module('app').config(['$translateProvider', 'localeFormatProvider', func
     sc: 'scanner',
     PHRASE_SELECT_BUILDS: 'Sélectionner les configurations à comparer',
     sell: 'vendre',
-    s: 'détecteurs',
+    s: 'Capteurs',
     settings: 'paramètres',
     sb: 'Survolteur de bouclier',
     scb: 'Réserve de cellules d\'énergie',
@@ -179,9 +179,9 @@ angular.module('app').config(['$translateProvider', 'localeFormatProvider', func
     skip: 'Suivant',
     small: 'petit',
     speed: 'vitesse',
-    'Standard Docking Computer': 'ordinateur amarrage standard',
+    'Standard Docking Computer': 'Ordinateur d\'appontage standard',
     Stock: 'de base',
-    T_LOAD: 'degrés',
+    T_LOAD: 'Charge thermique',
     'The Retributor': 'Le Rétributeur',
     t: 'propulseurs',
     time: 'temps',
@@ -189,7 +189,7 @@ angular.module('app').config(['$translateProvider', 'localeFormatProvider', func
     'total range': 'Distance maximale',
     turret: 'tourelle',
     unladen: 'Non chargé',
-    PHRASE_UPDATE_RDY: 'Mise à jour disponible ! Cliquez pour rafraichir',
+    PHRASE_UPDATE_RDY: 'Mise à jour disponible ! Cliquez ici pour mettre à jour',
     utility: 'utilitaire',
     'utility mounts': 'Support utilitaire',
     WEP: 'ARM',

app/js/i18n/it.js

@@ -0,0 +1,133 @@
+angular.module('app').config(['$translateProvider', 'localeFormatProvider', function($translateProvider, localeFormatProvider) {
+
+    // Declare number format settings
+  localeFormatProvider.addFormat('es', {
+    decimal: ',',
+    thousands: '.',
+    grouping: [3],
+    currency: ['€', ''],
+    dateTime: '%A %e %B %Y, %X',
+    date: '%d/%m/%Y',
+    time: '%H:%M:%S',
+    periods: ['AM', 'PM'], // unused
+    days: ['Domenica', 'Lunedì', 'Martedì', 'Mercoledì', 'Giovedì', 'Venerdì', 'Sabato'],
+    shortDays: ['Dom', 'Lun', 'Mar', 'Mer', 'Gio', 'Ven', 'Sab'],
+    months: ['Gennaio', 'Febbraio', 'Marzo', 'Aprile', 'Maggio', 'Giugno', 'Luglio', 'Agosto', 'Settembre', 'Ottobre', 'Novembre', 'Dicembre'],
+    shortMonths: ['Gen', 'Feb', 'Mar', 'Apr', 'Mag', 'Giu', 'Lug', 'Ago', 'Set', 'Ott', 'Nov', 'Dic']
+  });
+
+  $translateProvider.translations('it', {
+    PHRASE_EXPORT_DESC: 'Un export dettagliato in formato JSON della tua configurazione per essere usato in altri siti o tools',
+    'A-Rated': 'Classe A',
+    about: 'Info su Coriolis',
+    action: 'azione',
+    added: 'aggiunto',
+    Advanced: 'Avanzato',
+    agility: 'agilità',
+    ammo: 'munizioni',
+    PHRASE_CONFIRMATION: 'Sei sicuro ?',
+    armour: 'armatura',
+    available: 'disponibile',
+    bins: 'contenitore',
+    build: 'configurazione',
+    'build name': 'Nome Configurazione',
+    builds: 'configurazioni',
+    buy: 'compra',
+    cancel: 'cancella',
+    cells: 'celle',
+    close: 'chiudi',
+    compare: 'confronta',
+    'compare all': 'confronta tutti',
+    comparison: 'comparazione',
+    comparisons: 'comparazioni',
+    component: 'componente',
+    cost: 'costo',
+    costs: 'costi',
+    cm: 'Contromisure',
+    create: 'crea',
+    'create new': 'crea nuovo',
+    credits: 'crediti',
+    damage: 'danno',
+    delete: 'elimina',
+    'delete all': 'elimina tutto',
+    dep: 'dep',
+    deployed: 'deployed',
+    'detailed export': 'esportazione dettagliata',
+    disabled: 'disabilita',
+    discount: 'sconto',
+    done: 'fatto',
+    'edit data': 'modifica i dati',
+    efficiency: 'efficenza',
+    empty: 'vuoto',
+    Enforcer: 'Rinforzatore',
+    'enter name': 'Inserisci un nome',
+    export: 'esporta',
+    fixed: 'fissi',
+    fuel: 'carburante',
+    'full tank': 'Serbatoio Pieno',
+    huge: 'enorme',
+    hull: 'corazza',
+    import: 'importa',
+    'import all': 'importa tutto',
+    insurance: 'assicurazione',
+    'internal compartments': 'compartimenti interni',
+    'jump range': 'distanza di salto',
+    jumps: 'salti',
+    laden: 'carico',
+    language: 'lingua',
+    large: 'largo',
+    mass: 'massa',
+    max: 'massimo',
+    'max mass': 'massa massimale',
+    medium: 'medio',
+    'net cost': 'costo netto',
+    PHRASE_NO_BUILDS: 'nessuna configurazione è stata aggiunta per la comparazione!',
+    PHRASE_NO_RETROCH: 'Nessun cambiamento di Retrofitting',
+    none: 'nessuno',
+    'none created': 'nessuno creato',
+    optimal: 'ottimale',
+    'optimal mass': 'massa ottimale',
+    'optimize mass': 'ottimizza la massa',
+    overwrite: 'sovrasscrivi',
+    PHRASE_IMPORT: 'Incolla un JSON o importalo qua',
+    penetration: 'penetrazione',
+    power: 'potenza',
+    priority: 'priorità',
+    proceed: 'procedi',
+    range: 'distanza',
+    rate: 'rateo',
+    recharge: 'ricarica',
+    reload: 'ricarica',
+    rename: 'rinomina',
+    repair: 'ripara',
+    reset: 'resetta',
+    retracted: 'retratti',
+    'retrofit costs': 'costi di retrofit',
+    'retrofit from': 'retrofit da',
+    save: 'salva',
+    sell: 'vendi',
+    settings: 'impostazioni',
+    shields: 'scudi',
+    ship: 'nave',
+    ships: 'navi',
+    shortened: 'accorciato',
+    size: 'grandezza',
+    skip: 'salta',
+    small: 'piccolo',
+    speed: 'velocità',
+    Stock: 'appena comprata',
+    t: 'Motori',
+    time: 'tempo',
+    total: 'totale',
+    'total range': 'distanza totale',
+    turret: 'turrette',
+    type: 'tipo',
+    unladen: 'scarico',
+    PHRASE_UPDATE_RDY: 'Aggiornamenti disponibili ! Clicca per Aggiornare',
+    utility: 'supporti',
+    'utility mounts': 'supporti di utilità',
+    version: 'versione',
+    yes: 'sì',
+    PHRASE_BACKUP_DESC: 'Esportazione di tutti i dati su Coriolis per salvarli o trasferirli in un altro Browser/dispositivo'
+  });
+}]);

app/js/i18n/languages.js

@@ -3,11 +3,12 @@ angular.module('app').config(['$translateProvider', function($translateProvider)
     .useSanitizeValueStrategy('escapeParameters')
     .useStorage('Persist')
     .fallbackLanguage('en')   // Use English as default/fallback language
-    .registerAvailableLanguageKeys(['en', 'de', 'fr', 'ru'], {  // TODO: add 'es' to the array when ready
+    .registerAvailableLanguageKeys(['en', 'de', 'es', 'fr', 'it', 'ru'], {
       'en*': 'en',
       'de*': 'de',
-      //'es*': 'es',
+      'es*': 'es',
       'fr*': 'fr',
+      'it*': 'it',
       'ru*': 'ru'
     })
     .determinePreferredLanguage();
@@ -15,7 +16,8 @@ angular.module('app').config(['$translateProvider', function($translateProvider)
 .value('Languages', {
   en: 'English',
   de: 'Deutsh',
-  //es: 'Español',
+  it: 'Italiano',
+  es: 'Español',
   fr: 'Français',
   ru: 'ру́сский'
 });

app/js/shipyard/factory-ship.js

@@ -398,7 +398,9 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
   };
 
   Ship.prototype.updateTopSpeed = function() {
-    this.topSpeed = calcSpeed(this.unladenMass + this.fuelCapacity, this.speed, this.common[1].c, this.pipSpeed)['4 Pips'];
+    var speeds = calcSpeed(this.unladenMass + this.fuelCapacity, this.speed, this.boost, this.common[1].c, this.pipSpeed);
+    this.topSpeed = speeds['4 Pips'];
+    this.topBoost = speeds.boost;
   };
 
   Ship.prototype.updateShieldStrength = function() {

app/js/shipyard/module-shipyard.js

@@ -33,7 +33,7 @@ angular.module('shipyard', ['ngLodash'])
     sc: 'Scanner',
     am: 'Auto Field-Maintenance Unit',
     cr: 'Cargo Rack',
-    fi: 'FSD Interdictor',
+    fi: 'Frame Shift Drive Interdictor',
     hb: 'Hatch Breaker Limpet Controller',
     hr: 'Hull Reinforcement Package',
     rf: 'Refinery',
@@ -233,16 +233,19 @@ angular.module('shipyard', ['ngLodash'])
    *
    * @param  {number} mass        Current mass of the ship
    * @param  {number} baseSpeed   Base speed m/s for ship
+   * @param  {number} baseBoost   Base boost speed m/s for ship
    * @param  {object} thrusters   The Thrusters used
    * @param  {number} pipSpeed    Speed pip multiplier
    * @return {object}             Approximate speed by pips
    */
-  .value('calcSpeed', function(mass, baseSpeed, thrusters, pipSpeed) {
+  .value('calcSpeed', function(mass, baseSpeed, baseBoost, thrusters, pipSpeed) {
-    var speed = baseSpeed * ((1 - thrusters.M) + (thrusters.M * Math.pow(3 - (2 * Math.max(0.5, mass / thrusters.optmass)), thrusters.P)));
+    var multiplier = mass > thrusters.maxmass ? 0 : ((1 - thrusters.M) + (thrusters.M * Math.pow(3 - (2 * Math.max(0.5, mass / thrusters.optmass)), thrusters.P)));
+    var speed = baseSpeed * multiplier;
 
     return {
       '0 Pips': speed * (1 - (pipSpeed * 4)),
       '2 Pips': speed * (1 - (pipSpeed * 2)),
-      '4 Pips': speed
+      '4 Pips': speed,
+      'boost': baseBoost * multiplier
     };
   });

app/less/charts.less

@@ -39,12 +39,14 @@ svg {
       fill: @primary-disabled;
     }
 
-    &.y {
+  }
-      text tspan:first-child {
-        fill: @primary;
-      }
-    }
 
+  .label {
+    text-transform: capitalize;
+  }
+
+  .metric {
+    text-transform: none;
   }
 
   .marker {

app/views/page-outfit.html

@@ -67,7 +67,7 @@
             <span class="warning" ng-if="th.c.maxmass < ship.ladenMass">0 <svg class="icon"><use xlink:href="#warning"></use></svg></span>
             </td>
           <td>
-            <span ng-if="pd.c.enginecapacity >= ship.boostEnergy && th.c.maxmass >= ship.ladenMass">{{fRound(ship.boost)}} <u translate>m/s</u></span>
+            <span ng-if="pd.c.enginecapacity >= ship.boostEnergy && th.c.maxmass >= ship.ladenMass">{{fCrd(ship.topBoost)}} <u translate>m/s</u></span>
             <span class="warning" ng-if="pd.c.enginecapacity < ship.boostEnergy || th.c.maxmass < ship.ladenMass">0
               <svg class="icon"><use xlink:href="#warning"></use></svg>
             </span>
@@ -229,8 +229,8 @@
           <th style="width:3em;" class="sortable" ng-click="sortPwr('type')" translate="TYPE"></th>
           <th style="width:4em;" class="sortable" ng-click="sortPwr('priority')" translate="PRI"></th>
           <th colspan="2" class="sortable" ng-click="sortPwr('c.power')" translate="PWR"></th>
-          <th style="width:3em;" class="sortable" ng-click="sortPwr(statusRetracted)" translate="RET"></th>
+          <th style="width:3em;" class="sortable" ng-click="sortPwr(statusRetracted)" translate="ret"></th>
-          <th style="width:3em;" class="sortable" ng-click="sortPwr(statusDeployed)" translate="DEP"></th>
+          <th style="width:3em;" class="sortable" ng-click="sortPwr(statusDeployed)" translate="dep"></th>
         </tr>
       </thead>
       <tbody>
@@ -250,11 +250,19 @@
           <td class="le shorten cap" ng-click="togglePwr(c)" ng-bind="cName(c)"></td>
           <td ng-click="togglePwr(c)"><u ng-bind="c.type | translate"></u></td>
           <td><span ng-click="decPriority(c)" class="flip">&#9658;</span> {{c.priority + 1}} <span ng-click="incPriority(c)">&#9658;</span></td>
-          <td class="ri" style="width:3.25em;">{{fPwr(c.c.power)}}</td>
+          <td class="ri" style="width:3.25em;" ng-click="togglePwr(c)">{{fPwr(c.c.power)}}</td>
-          <td class="ri" style="width:3em;"><u>{{f1Pct(c.c.power/ship.powerAvailable)}}</u></td>
+          <td class="ri" style="width:3em;" ng-click="togglePwr(c)"><u>{{f1Pct(c.c.power/ship.powerAvailable)}}</u></td>
-          <td ng-if="!c.enabled" class="disabled upp" colspan="2" translate="disabled"></td>
+          <td ng-if="!c.enabled" class="disabled upp" colspan="2" translate="disabled" ng-click="togglePwr(c)"></td>
-          <td class="upp" ng-if="c.enabled" ng-class="STATUS_CLASS[statusRetracted(c)]">{{STATUS[statusRetracted(c)] | translate}}</td>
+          <td class="upp" ng-if="c.enabled" ng-click="togglePwr(c)">
-          <td class="upp" ng-if="c.enabled" ng-class="STATUS_CLASS[statusDeployed(c)]">{{STATUS[statusDeployed(c)] | translate}}</td>
+            <svg class="icon secondary-disabled" ng-if="statusRetracted(c) == 3"><use xlink:href="#power"><title class="cap">{{'on' | translate}}</title></use></svg>
+            <svg class="icon warning" ng-if="statusRetracted(c) == 2"><use xlink:href="#no-power"><title class="cap">{{'off' | translate}}</title></use></svg>
+            <span class="disabled" translate="disabled" ng-if="statusRetracted(c) == 1"></span>
+          </td>
+          <td class="upp" ng-if="c.enabled"  ng-click="togglePwr(c)">
+            <svg class="icon secondary-disabled" ng-if="statusDeployed(c) == 3"><use xlink:href="#power"><title class="cap">{{'on' | translate}}</title></use></svg>
+            <svg class="icon warning" ng-if="statusDeployed(c) == 2"><use xlink:href="#no-power"><title class="cap">{{'off' | translate}}</title></use></svg>
+            <span class="disabled" translate="disabled" ng-if="statusDeployed(c) == 1"></span>
+          </td>
         </tr>
       </tbody>
     </table>

data/components/internal/shield_cell_bank.json

@@ -5,36 +5,43 @@
     { "id": "63", "grp": "scb", "class": 8, "rating": "C", "cost": 4359903, "mass": 160, "power": 2.4, "cells": 5, "rechargeRating": "B", "recharge": 0 },
     { "id": "62", "grp": "scb", "class": 8, "rating": "B", "cost": 10899756, "mass": 256, "power": 2.88, "cells": 6, "rechargeRating": "A", "recharge": 0 },
     { "id": "61", "grp": "scb", "class": 8, "rating": "A", "cost": 27249391, "mass": 160, "power": 3.36, "cells": 5, "rechargeRating": "A", "recharge": 0 },
+
     { "id": "60", "grp": "scb", "class": 7, "rating": "E", "cost": 249137, "mass": 80, "power": 1.24, "cells": 6, "rechargeRating": "D", "recharge": 97 },
     { "id": "5v", "grp": "scb", "class": 7, "rating": "D", "cost": 622843, "mass": 32, "power": 1.66, "cells": 4, "rechargeRating": "C", "recharge": 130 },
     { "id": "5u", "grp": "scb", "class": 7, "rating": "C", "cost": 1557108, "mass": 80, "power": 2.07, "cells": 5, "rechargeRating": "B", "recharge": 163 },
     { "id": "5t", "grp": "scb", "class": 7, "rating": "B", "cost": 3892770, "mass": 128, "power": 2.48, "cells": 6, "rechargeRating": "B", "recharge": 197 },
     { "id": "5s", "grp": "scb", "class": 7, "rating": "A", "cost": 9731925, "mass": 80, "power": 2.9, "cells": 5, "rechargeRating": "A", "recharge": 230 },
+
     { "id": "5r", "grp": "scb", "class": 6, "rating": "E", "cost": 88978, "mass": 40, "power": 1.06, "cells": 6, "rechargeRating": "D", "recharge": 92 },
     { "id": "5q", "grp": "scb", "class": 6, "rating": "D", "cost": 222444, "mass": 16, "power": 1.42, "cells": 4, "rechargeRating": "C", "recharge": 120 },
     { "id": "5p", "grp": "scb", "class": 6, "rating": "C", "cost": 556110, "mass": 40, "power": 1.77, "cells": 5, "rechargeRating": "C", "recharge": 148 },
     { "id": "5o", "grp": "scb", "class": 6, "rating": "B", "cost": 1390275, "mass": 64, "power": 2.12, "cells": 6, "rechargeRating": "B", "recharge": 176 },
     { "id": "5n", "grp": "scb", "class": 6, "rating": "A", "cost": 3475688, "mass": 40, "power": 2.48, "cells": 5, "rechargeRating": "A", "recharge": 204 },
+
     { "id": "5m", "grp": "scb", "class": 5, "rating": "E", "cost": 31778, "mass": 20, "power": 0.9, "cells": 5, "rechargeRating": "D", "recharge": 82 },
     { "id": "5l", "grp": "scb", "class": 5, "rating": "D", "cost": 79444, "mass": 8, "power": 1.2, "cells": 3, "rechargeRating": "C", "recharge": 109 },
     { "id": "5k", "grp": "scb", "class": 5, "rating": "C", "cost": 198611, "mass": 20, "power": 1.5, "cells": 4, "rechargeRating": "C", "recharge": 135 },
     { "id": "5j", "grp": "scb", "class": 5, "rating": "B", "cost": 496527, "mass": 32, "power": 1.8, "cells": 5, "rechargeRating": "B", "recharge": 162 },
     { "id": "5i", "grp": "scb", "class": 5, "rating": "A", "cost": 1241317, "mass": 20, "power": 2.1, "cells": 4, "rechargeRating": "B", "recharge": 189 },
+
     { "id": "5h", "grp": "scb", "class": 4, "rating": "E", "cost": 11349, "mass": 10, "power": 0.74, "cells": 5, "rechargeRating": "D", "recharge": 72 },
     { "id": "5g", "grp": "scb", "class": 4, "rating": "D", "cost": 28373, "mass": 4, "power": 0.98, "cells": 3, "rechargeRating": "D", "recharge": 94 },
     { "id": "5f", "grp": "scb", "class": 4, "rating": "C", "cost": 70932, "mass": 10, "power": 1.23, "cells": 4, "rechargeRating": "C", "recharge": 117 },
     { "id": "5e", "grp": "scb", "class": 4, "rating": "B", "cost": 177331, "mass": 16, "power": 1.48, "cells": 5, "rechargeRating": "C", "recharge": 140 },
     { "id": "5d", "grp": "scb", "class": 4, "rating": "A", "cost": 443328, "mass": 10, "power": 1.72, "cells": 4, "rechargeRating": "B", "recharge": 163 },
+
     { "id": "5c", "grp": "scb", "class": 3, "rating": "E", "cost": 4053, "mass": 5, "power": 0.61, "cells": 5, "rechargeRating": "D", "recharge": 61 },
     { "id": "5b", "grp": "scb", "class": 3, "rating": "D", "cost": 10133, "mass": 2, "power": 0.82, "cells": 3, "rechargeRating": "D", "recharge": 80 },
     { "id": "5a", "grp": "scb", "class": 3, "rating": "C", "cost": 25333, "mass": 5, "power": 1.02, "cells": 4, "rechargeRating": "D", "recharge": 100 },
     { "id": "59", "grp": "scb", "class": 3, "rating": "B", "cost": 63333, "mass": 8, "power": 1.22, "cells": 5, "rechargeRating": "C", "recharge": 119 },
     { "id": "58", "grp": "scb", "class": 3, "rating": "A", "cost": 158331, "mass": 5, "power": 1.43, "cells": 4, "rechargeRating": "C", "recharge": 138 },
+
     { "id": "57", "grp": "scb", "class": 2, "rating": "E", "cost": 1448, "mass": 2.5, "power": 0.5, "cells": 5, "rechargeRating": "E", "recharge": 46 },
     { "id": "56", "grp": "scb", "class": 2, "rating": "D", "cost": 3619, "mass": 1, "power": 0.67, "cells": 3, "rechargeRating": "D", "recharge": 61 },
     { "id": "55", "grp": "scb", "class": 2, "rating": "C", "cost": 9048, "mass": 2.5, "power": 0.84, "cells": 4, "rechargeRating": "D", "recharge": 77 },
     { "id": "54", "grp": "scb", "class": 2, "rating": "B", "cost": 22619, "mass": 4, "power": 1.01, "cells": 5, "rechargeRating": "D", "recharge": 92 },
     { "id": "53", "grp": "scb", "class": 2, "rating": "A", "cost": 56547, "mass": 2.5, "power": 1.18, "cells": 4, "rechargeRating": "C", "recharge": 107 },
+
     { "id": "52", "grp": "scb", "class": 1, "rating": "E", "cost": 517, "mass": 1.3, "power": 0.41, "cells": 4, "rechargeRating": "E", "recharge": 31 },
     { "id": "51", "grp": "scb", "class": 1, "rating": "D", "cost": 1293, "mass": 0.5, "power": 0.55, "cells": 2, "rechargeRating": "E", "recharge": 41 },
     { "id": "50", "grp": "scb", "class": 1, "rating": "C", "cost": 3231, "mass": 1.3, "power": 0.69, "cells": 3, "rechargeRating": "D", "recharge": 51 },

data/ships/adder.json

@@ -6,7 +6,7 @@
       "class": 1,
       "hullCost": 39993,
       "speed": 220,
-      "boost": 321,
+      "boost": 320,
       "boostEnergy": 9,
       "agility": 8,
       "baseShieldStrength": 60,

data/ships/anaconda.json

@@ -6,7 +6,7 @@
       "class": 3,
       "hullCost": 141889932,
       "speed": 180,
-      "boost": 244,
+      "boost": 240,
       "boostEnergy": 29,
       "agility": 2,
       "baseShieldStrength": 350,

data/ships/asp.json

@@ -6,7 +6,7 @@
       "class": 2,
       "hullCost": 6135658,
       "speed": 250,
-      "boost": 345,
+      "boost": 340,
       "boostEnergy": 14,
       "agility": 6,
       "baseShieldStrength": 140,

data/ships/cobra_mk_iii.json

@@ -6,7 +6,7 @@
       "class": 1,
       "hullCost": 235787,
       "speed": 280,
-      "boost": 402,
+      "boost": 400,
       "boostEnergy": 11,
       "agility": 6,
       "baseShieldStrength": 80,

data/ships/diamondback.json

@@ -6,7 +6,7 @@
       "class": 1,
       "hullCost": 461341,
       "speed": 283,
-      "boost": 384,
+      "boost": 380,
       "boostEnergy": 11,
       "agility": 8,
       "baseShieldStrength": 118,

data/ships/diamondback_explorer.json

@@ -5,8 +5,8 @@
       "manufacturer": "Lakon",
       "class": 1,
       "hullCost": 1635691,
-      "speed": 242,
+      "speed": 260,
-      "boost": 316,
+      "boost": 340,
       "boostEnergy": 14,
       "agility": 5,
       "baseShieldStrength": 146,

data/ships/eagle.json

@@ -6,7 +6,7 @@
       "class": 1,
       "hullCost": 10446,
       "speed": 240,
-      "boost": 349,
+      "boost": 350,
       "boostEnergy": 9,
       "agility": 10,
       "baseShieldStrength": 60,

data/ships/federal_assault_ship.json

@@ -6,7 +6,7 @@
       "class": 2,
       "hullCost": 19071993,
       "speed": 210,
-      "boost": 361,
+      "boost": 350,
       "boostEnergy": 21,
       "agility": 6,
       "baseShieldStrength": 200,

data/ships/federal_dropship.json

@@ -6,7 +6,7 @@
       "class": 2,
       "hullCost": 18969990,
       "speed": 180,
-      "boost": 304,
+      "boost": 300,
       "boostEnergy": 21,
       "agility": 2,
       "baseShieldStrength": 200,

data/ships/federal_gunship.json

@@ -6,7 +6,7 @@
       "class": 2,
       "hullCost": 44774591,
       "speed": 170,
-      "boost": 284,
+      "boost": 280,
       "boostEnergy": 21,
       "agility": 2,
       "baseShieldStrength": 250,

data/ships/fer_de_lance.json

@@ -6,7 +6,7 @@
       "class": 2,
       "hullCost": 51232230,
       "speed": 260,
-      "boost": 357,
+      "boost": 350,
       "boostEnergy": 21,
       "agility": 6,
       "baseShieldStrength": 300,

data/ships/hauler.json

@@ -6,7 +6,7 @@
       "class": 1,
       "hullCost": 29807,
       "speed": 200,
-      "boost": 305,
+      "boost": 300,
       "agility": 6,
       "boostEnergy": 7,
       "baseShieldStrength": 50,

data/ships/imperial_clipper.json

@@ -6,7 +6,7 @@
       "class": 3,
       "hullCost": 21077784,
       "speed": 300,
-      "boost": 388,
+      "boost": 380,
       "boostEnergy": 21,
       "agility": 2,
       "baseShieldStrength": 180,

data/ships/imperial_courier.json

@@ -5,7 +5,7 @@
       "manufacturer": "Gutamaya",
       "class": 1,
       "hullCost": 2481552,
-      "speed": 277,
+      "speed": 280,
       "boost": 380,
       "boostEnergy": 11,
       "agility": 6,

data/ships/imperial_eagle.json

@@ -6,7 +6,7 @@
       "class": 1,
       "hullCost": 72186,
       "speed": 300,
-      "boost": 405,
+      "boost": 400,
       "boostEnergy": 9,
       "agility": 6,
       "baseShieldStrength": 80,

data/ships/orca.json

@@ -6,7 +6,7 @@
       "class": 3,
       "hullCost": 47798079,
       "speed": 300,
-      "boost": 385,
+      "boost": 380,
       "boostEnergy": 17,
       "agility": 2,
       "baseShieldStrength": 220,

data/ships/python.json

@@ -6,7 +6,7 @@
       "class": 2,
       "hullCost": 55171395,
       "speed": 230,
-      "boost": 305,
+      "boost": 300,
       "boostEnergy": 24,
       "agility": 6,
       "baseShieldStrength": 260,

data/ships/sidewinder.json

@@ -6,7 +6,7 @@
       "class": 1,
       "hullCost": 12887,
       "speed": 220,
-      "boost": 321,
+      "boost": 320,
       "boostEnergy": 7,
       "agility": 8,
       "baseShieldStrength": 40,

data/ships/type_6_transporter.json

@@ -6,7 +6,7 @@
       "class": 2,
       "hullCost": 865782,
       "speed": 220,
-      "boost": 355,
+      "boost": 350,
       "boostEnergy": 11,
       "agility": 3,
       "baseShieldStrength": 90,

data/ships/type_7_transport.json

@@ -6,7 +6,7 @@
       "class": 3,
       "hullCost": 16881511,
       "speed": 180,
-      "boost": 301,
+      "boost": 300,
       "boostEnergy": 11,
       "agility": 2,
       "baseShieldStrength": 120,

data/ships/type_9_heavy.json

@@ -6,7 +6,7 @@
       "class": 3,
       "hullCost": 73255168,
       "speed": 130,
-      "boost": 201,
+      "boost": 200,
       "boostEnergy": 21,
       "agility": 0,
       "baseShieldStrength": 240,

data/ships/viper.json

@@ -6,7 +6,7 @@
       "class": 1,
       "hullCost": 95893,
       "speed": 320,
-      "boost": 388,
+      "boost": 380,
       "boostEnergy": 11,
       "agility": 6,
       "baseShieldStrength": 105,

data/ships/vulture.json

@@ -6,7 +6,7 @@
       "class": 1,
       "hullCost": 4689629,
       "speed": 210,
-      "boost": 348,
+      "boost": 340,
       "boostEnergy": 17,
       "agility": 9,
       "baseShieldStrength": 240,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "coriolis_shipyard",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/cmmcleod/coriolis"

test/fixtures/anaconda-test-detailed-export-v1.json

@@ -179,7 +179,7 @@
       {
         "class": 2,
         "rating": "A",
-        "group": "FSD Interdictor"
+        "group": "Frame Shift Drive Interdictor"
       }
     ]
   },

test/fixtures/anaconda-test-detailed-export-v2.json

@@ -245,7 +245,7 @@
         "rating": "A",
         "enabled": true,
         "priority": 3,
-        "group": "FSD Interdictor"
+        "group": "Frame Shift Drive Interdictor"
       }
     ]
   },
@@ -254,8 +254,9 @@
     "hullCost": 141889932,
     "speed": 180,
     "topSpeed": 186.5,
-    "boost": 244,
+    "boost": 240,
     "boostEnergy": 29,
+    "topBoost": 248.66,
     "agility": 2,
     "baseShieldStrength": 350,
     "baseArmour": 945,

test/fixtures/valid-detailed-export.json

@@ -2188,7 +2188,7 @@
         {
           "class": 2,
           "rating": "A",
-          "group": "FSD Interdictor"
+          "group": "Frame Shift Drive Interdictor"
         }
       ]
     },
@@ -2885,7 +2885,7 @@
         {
           "class": 2,
           "rating": "A",
-          "group": "FSD Interdictor"
+          "group": "Frame Shift Drive Interdictor"
         }
       ]
     },
@@ -3145,7 +3145,7 @@
         {
           "class": 1,
           "rating": "A",
-          "group": "FSD Interdictor"
+          "group": "Frame Shift Drive Interdictor"
         },
         {
           "class": 1,