diff --git a/src/components/panels/MoonrakerFailedComponentsPanel.vue b/src/components/panels/MoonrakerFailedComponentsPanel.vue
index 1e7dbae7..4641b39a 100644
--- a/src/components/panels/MoonrakerFailedComponentsPanel.vue
+++ b/src/components/panels/MoonrakerFailedComponentsPanel.vue
@@ -4,15 +4,15 @@
         <v-toolbar flat dense color="orange darken-2">
             <v-toolbar-title>
                 <span class="subheading">
-                    <v-icon class="mdi mdi-alert-circle" left></v-icon>{{ $t("Panels.MoonrakerFailedPluginsPanel.MoonrakerFailedComponents") }}
+                    <v-icon class="mdi mdi-alert-circle" left></v-icon>{{ $t("Panels.MoonrakerFailedComponentsPanel.MoonrakerFailedComponents") }}
                 </span>
             </v-toolbar-title>
         </v-toolbar>
         <v-card-text class="px-0 pt-0 pb-2 content">
             <v-layout wrap class=" text-center">
                 <v-flex col class="text-left">
-                    <p class="orange--text">{{ $t("Panels.MoonrakerFailedPluginsPanel.MoonrakerErrorInfo") }}</p>
-                    <p class="mb-2 orange--text">{{ $t("Panels.MoonrakerFailedPluginsPanel.FollowingPluginHasAnError") }}</p>
+                    <p class="orange--text">{{ $t("Panels.MoonrakerFailedComponentsPanel.MoonrakerErrorInfo") }}</p>
+                    <p class="mb-2 orange--text">{{ $t("Panels.MoonrakerFailedComponentsPanel.FollowingPluginHasAnError") }}</p>
                     <ul class="mt-0 pt-0">
                         <li v-for="component in failedComponents" v-bind:key="component" class="orange--text"><code>{{ component }}</code></li>
                     </ul>
@@ -21,7 +21,7 @@
         </v-card-text>
         <v-divider class="my-2"></v-divider>
         <v-card-text class="px-4 pt-2 pb-4 content text-center text-lg-left">
-            <v-btn small :href="'//'+hostname+':'+port+'/server/files/moonraker.log'" color="primary" class=""><v-icon class="mr-2">mdi-download</v-icon>{{ $t("Panels.MoonrakerFailedPluginsPanel.DownloadLog") }}</v-btn>
+            <v-btn small :href="'//'+hostname+':'+port+'/server/files/moonraker.log'" color="primary" class=""><v-icon class="mr-2">mdi-download</v-icon>{{ $t("Panels.MoonrakerFailedComponentsPanel.DownloadLog") }}</v-btn>
         </v-card-text>
     </v-card>
 </template>
diff --git a/src/components/panels/Settings/GeneralPanel.vue b/src/components/panels/Settings/GeneralPanel.vue
index 1af8ed8f..167bd0c0 100644
--- a/src/components/panels/Settings/GeneralPanel.vue
+++ b/src/components/panels/Settings/GeneralPanel.vue
@@ -35,12 +35,12 @@
                     <v-col class="py-2">
                         <v-switch v-model="displayZOffsetStandby" hide-details class="mt-0">
                             <template v-slot:label>
-                                Display Z-Offset-Panel
+                                {{ $t('Settings.GeneralPanel.DisplayZOffset') }}
                                 <v-tooltip right>
                                     <template v-slot:activator="{ on, attrs }">
                                         <v-icon class="text--secondary ml-2" v-bind="attrs" v-on="on">mdi mdi-information</v-icon>
                                     </template>
-                                    <span>Shows the Z-Offset panel permanently.</span>
+                                    <span>{{ $t('Settings.GeneralPanel.ShowZOffset') }}</span>
                                 </v-tooltip>
                             </template>
                         </v-switch>
diff --git a/src/components/panels/Settings/LanguagePanel.vue b/src/components/panels/Settings/LanguagePanel.vue
index e29074de..93acb47e 100644
--- a/src/components/panels/Settings/LanguagePanel.vue
+++ b/src/components/panels/Settings/LanguagePanel.vue
@@ -45,11 +45,11 @@
                 this.lang = val
             },
             getLanguages(){
-                const locales = require.context('@/locales', true, /[A-Za-z0-9-_,\s]+\.json$/i)
+                const locales = require.context('@/locales', true, /[A-Za-z0-9-_,\s]+\.js$/i)
                 this.Languages = []
                 locales.keys().map(key=>{
                     this.Languages.push({
-                        text: locales(key).title,
+                        text: locales(key).default.title,
                         value: key.match(/([A-Za-z0-9-_]+)\./i)[1]
                     })
                 })
diff --git a/src/locales/en.js b/src/locales/en.js
new file mode 100644
index 00000000..410d0718
--- /dev/null
+++ b/src/locales/en.js
@@ -0,0 +1,356 @@
+export default {
+  title: "English",
+  App: {
+    Connecting: "Connecting",
+    To: "to",
+    Failed: "failed",
+    TryAgain: "try again",
+    Printers: "Printers",
+    CannotNotConnectTo: "Cannot not connect to",
+    ConnectionTo: "Connection to",
+    ConnectionFailed: "Connection failed",
+    SelectPrinter: "Select Printer",
+    AddPrinter: "Add Printer",
+    EditPrinter: "Edit Printer",
+    UpdatePrinter: "Update Printer",
+    ChangePrinter: "Change Printer",
+    Hello: "Hello and welcome to the remote mode of Mainsail!",
+    PleaseRememberToAdd: "Please remember to add",
+    InMoonrakerConf: "in moonraker.conf within 'cors_domains'.",
+    YouCanFindMore: "You can find more details at",
+    Remotemode: "https://docs.mainsail.xyz/remotemode",
+    KlipperControl: "Klipper Control",
+    Restart: "Restart",
+    FirmwareRestart: "FIRMWARE Restart",
+    RestartServices: "Restart Services",
+    Klipper: "Klipper",
+    Moonraker: "Moonraker",
+    PowerDevices: "Power Devices",
+    HostControl: "Host Control",
+    Reboot: "Reboot",
+    Shutdown: "Shutdown",
+    Updating: "Updating",
+    done: " done!",
+    Empty: "Empty",
+    Close: "Close",
+    SAVECONFIG: "SAVE CONFIG",
+    UploadPrint: "Upload & Print",
+    EmergencyStop: "Emergency Stop",
+    Uploading: "Uploading"
+  },
+  Router: {
+    Dashboard: "Dashboard",
+    Printers: "Printers",
+    Settings: "Settings",
+    Webcam: "Webcam",
+    Console: "Console",
+    Heightmap: "Heightmap",
+    "G-Code Files": "G-Code Files",
+    Machine: "Machine",
+    Interface: "Interface"
+  },
+  Files: {
+    GCodeFiles: "G-Code Files",
+    UploadNewGcode: "Upload new Gcode",
+    CreateNewDirectory: "Create new Directory",
+    RefreshCurrentDirectory: "Refresh current Directory",
+    SetupCurrentList: "Setup current list",
+    HiddenFiles: "Hidden files",
+    FreeDisk: "Free disk: ",
+    Used: "Used: ",
+    Free: "Free: ",
+    Total: "Total: ",
+    Files: "Files",
+    Search: "Search",
+    Empty: "Empty",
+    blabla: "bla bla",
+    DropFilesToAddGcode: "Drop files to add gcode.",
+    PrintStart: "Print start",
+    Preheat: "Preheat",
+    Download: "Download",
+    Rename: "Rename",
+    Delete: "Delete",
+    StartJob: "Start Job",
+    DoYouWantToStart: "Do you want to start",
+    No: "No",
+    Yes: "Yes",
+    NewDirectory: "New Directory",
+    PleaseEnterANewDirectoryName: "Please enter a new directory name:",
+    RenameFile: "Rename File",
+    Name: "Name",
+    Cancel: "Cancel",
+    Create: "Create",
+    RenameDirectory: "Rename Directory",
+    Uploading: "Uploading",
+    CurrentPath: "Current path",
+    Filesize: "Filesize",
+    LastModified: "Last modified",
+    ObjectHeight: "Object Height",
+    LayerHeight: "Layer Height",
+    FilamentUsage: "Filament Usage",
+    PrintTime: "Print Time",
+    Slicer: "Slicer"
+  },
+  Console: {
+    send: "send",
+    SetupConsole: "Setup Console",
+    SendCode: "Send code...",
+    Empty: "Empty",
+    HideTemperatures: "Hide temperatures",
+    CustomFilters: "Custom filters",
+    Date: "Date",
+    Event: "Event"
+  },
+  Panels: {
+    ControlPanel: {
+      Controls: "Controls",
+      SetupControls: "Setup Controls",
+      AlternateControls: "Alternate controls",
+      InvertX: "Invert X",
+      InvertY: "Invert Y",
+      InvertZ: "Invert Z",
+      ALL: "ALL",
+      QGL: "QGL",
+      ZTilt: "Z Tilt",
+      X: "X",
+      Y: "Y",
+      Z: "Z",
+      PleaseConfigureSteps: "Please configure steps",
+      SettingsInterfaceControl: "Settings > Interface > Control",
+      Home: "Home",
+      Retract: "Retract",
+      Extrude: "Extrude",
+      Macros: "Macros"
+    },
+    ExtruderPanel: {
+      FeedAmountIn: "Feed amount in",
+      FeedrateIn: "Feedrate in",
+      Retract: "Retract",
+      Extrude: "Extrude"
+    },
+    FarmPrinterPanel: {
+
+    },
+    KlippyStatePanel: {
+      KlippyState: "Klippy-State: ",
+      KlippyInfo: "Moonraker can't connect to Klippy!\nPlease check if the Klipper service is running and an UDS (Unix Domain Socket) is configured.",
+      Restart: "Restart",
+      FirmwareRestart: "Firmware Restart"
+    },
+    MiniconsolePanel: {
+      Console: "Console",
+      SetupConsole: "Setup Console",
+      HideTemperatures: "Hide temperatures",
+      CustomFilters: "Custom filters",
+      SendCode: "Send code...",
+      Send: "Send",
+      Empty: "Empty"
+    },
+    MinSettingsPanel: {
+      MissingConfiguration: "Missing configuration",
+      IsNotDefinedInConfig: "is not defined in config.",
+      MoreInformation: "more information"
+    },
+    MiscellaneousPanel: {
+      PrintSettings: "Print Settings",
+      Miscellaneous: "Miscellaneous"
+    },
+    MoonrakerFailedComponentsPanel: {
+      MoonrakerFailedComponents: "Moonraker Failed Components",
+      MoonrakerErrorInfo: "An error was detected while loading the moonraker components. Please check the logfile and fix the issue.",
+      FollowingPluginHasAnError: "Following plugin has an error:",
+      DownloadLog: "Download Log"
+    },
+    PowerControlPanel: {
+      PowerControl: "Power Control",
+      Error: "Error",
+      On: "On",
+      Off: "Off"
+    },
+    StatusPanel: {
+      Unknown: "Unknown",
+      PausePrint: "Pause print",
+      ResumePrint: "Resume print",
+      CancelPrint: "Cancel print",
+      ClearPrintStats: "Clear print stats",
+      ReprintJob: "Reprint job",
+      X: "X",
+      Y: "Y",
+      Z: "Z",
+      Filament: "Filament",
+      Print: "Print",
+      Total: "Total",
+      Speed: "Speed",
+      Layer: "Layer",
+      ObjectHeight: "Object Height:",
+      ETA: "ETA",
+      File: "File",
+      Slicer: "Slicer"
+    },
+    ToolsPanel: {
+      Temperatures: "Temperatures",
+      Presets: "Presets",
+      Cooldown: "Cooldown",
+      SetupTemperatures: "Setup Temperatures",
+      ShowChart: "Show Chart",
+      AutoscaleChart: "Autoscale Chart",
+      Name: "Name",
+      Color: "Color",
+      State: "State",
+      Current: "Current",
+      Target: "Target",
+      Min: "min: ",
+      Max: "max: ",
+      UNKNOWN: "UNKNOWN",
+      ShowCurrentTemperatureInChart: "Show current temperature in chart",
+      ShowTargetTemperatureInChart: "Show target temperature in chart",
+      ShowPWMPowerInChart: "Show PWM-power in chart",
+      Show: "Show",
+      InList: "in list"
+    },
+    WebcamPanel: {
+      Webcam: "Webcam",
+      FPS: "FPS"
+    },
+    ZOffsetPanel: {
+      ZBabyStepping: "Z Baby Stepping",
+      CurrentOffset: "Current Offset: "
+    }
+  },
+  Settings: {
+    ConfigFilesPanel: {
+      ConfigFiles: "Config Files",
+      SetupCurrentList: "Setup current list",
+      HiddenFiles: "Hidden files",
+      CurrentPath: "Current path: ",
+      Files: "Files",
+      Empty: "Empty",
+      EditFile: "Edit file",
+      Download: "Download",
+      Rename: "Rename",
+      Delete: "Delete",
+      PleaseStandBy: "Please stand by",
+      ConfigReference: "Config Reference",
+      Save: "Save",
+      SaveRestart: "Save & restart",
+      RenameFile: "Rename File",
+      Name: "Name",
+      Cancel: "Cancel",
+      Create: "Create",
+      Edit: "Edit",
+      CreateFile: "Create File",
+      CreateFolder: "Create Folder",
+      Uploading: "Uploading",
+      Filesize: "Filesize",
+      LastModified: "Last modified"
+    },
+    ConsolePanel: {
+      Console: "Console",
+      HideTemperatures: "Hide temperatures",
+      CustomFilter: "Custom filter",
+      Rules: "Rules"
+    },
+    ControlPanel: {
+      Control: "Control",
+      SpeedXY: "Speed XY",
+      SpeedZ: "Speed Z",
+      MoveDistancesInMm: "Move distances in mm",
+      ReverseXMovement: "Reverse X movement",
+      ReverseYMovement: "Reverse Y movement",
+      ReverseZMovement: "Reverse Z movement",
+      MoveDistancesXYInMm: "Move distances XY in mm",
+      MoveDistancesZInMm: "Move distances Z in mm",
+      MoveDistancesEInMm: "Move distances E in mm",
+      Extruder: "Extruder",
+      SpeedEInMms: "Speed E in mm/s"
+    },
+    DashboardPanel: {
+      Dashboard: "Dashboard",
+      Webcam: "Webcam",
+      Tempchart: "Tempchart",
+      Console: "Console",
+      ChartUpdateInterval: "Chart update interval",
+      DatapointInterval: "Datapoint interval"
+    },
+    EndstopPanel: {
+      Endstops: "Endstops",
+      Endstop: "Endstop",
+      TRIGGERED: "TRIGGERED",
+      open: "OPEN",
+      EndstopInfo: "Press the sync-button on the right-bottom to load the current endstop status."
+    },
+    GeneralPanel: {
+      General: "General",
+      PrinterName: "Printer Name",
+      DisplayCANCEL_PRINT: "Display CANCEL_PRINT",
+      DisplayZOffset: "Display Z-Offset-Panel",
+      ShowCANCEL_PRINT: "Shows the CANCEL_PRINT button permanently - no second layer confirmation needed.",
+      ShowZOffset: "Shows the Z-Offset panel permanently.",
+      FactoryReset: "Factory reset",
+      FactoryInfo: "Do you really want to reset mainsail to factory settings?",
+      ResetMainsail: "reset mainsail"
+    },
+    LanguagePanel: {
+      Language: "Language"
+    },
+    LimitsPanel: {
+      MachineLimits: "Machine Limits",
+      Velocity: "Velocity",
+      Acceleration: "Acceleration",
+      Deceleration: "Deceleration",
+      SquareCornerVelocity: "Square corner velocity"
+    },
+    LogfilesPanel: {
+      Logfiles: "Logfiles"
+    },
+    MacrosPanel: {
+      Macros: "Macros",
+      NOMacros: "No macros found..."
+    },
+    PresetsPanel: {
+      PreheatPresets: "Preheat Presets",
+      Cooldown: "Cooldown",
+      AddPreset: "add preset",
+      Preset: "Preset",
+      Create: "Create",
+      Edit: "Edit",
+      Name: "Name",
+      CustomGCode: "Custom G-Code",
+      PresetInfo: "You have to set minimum a target temperature or a custom gcode.",
+      Store: "Store",
+      Update: "Update",
+      EditCooldown: "Edit Cooldown",
+      UpdateCooldown: "Update Cooldown"
+    },
+    RemotePrintersPanel: {
+      RemotePrinters: "Remote Printers",
+      AddPrinter: "Add Printer",
+      EditPrinter: "Edit Printer",
+      UpdatePrinter: "Update Printer"
+    },
+    RunoutPanel: {
+      Detected: "detected",
+      Empty: "Empty"
+    },
+    UpdatePanel: {
+      UpdateManager: "Update Manager",
+      CheckForUpdates: "Check for updates",
+      System: "System",
+      PackagesCanBeUpgraded: "packages can be upgraded",
+      OSPackages: "OS-Packages",
+      Commits: "Commits",
+      CommittedAt: "committed at",
+      UpToDate: "up-to-date",
+      ERROR: "ERROR"
+    },
+    WebcamPanel: {
+      Webcam: "Webcam",
+      WebcamURL: "Webcam URL",
+      Rotate: "Rotate",
+      FlipWebcamHorizontally: "Flip webcam horizontally",
+      FlipWebcamVertically: "Flip webcam vertically",
+      ShowInNavigation: "Show in navigation",
+      Service: "Service"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/locales/en.json b/src/locales/en.json
deleted file mode 100644
index 73482672..00000000
--- a/src/locales/en.json
+++ /dev/null
@@ -1,355 +0,0 @@
-{
-  "title": "English",
-  "App": {
-    "Connecting": "Connecting",
-    "To": "to",
-    "Failed": "failed",
-    "TryAgain": "try again",
-    "Printers": "Printers",
-    "CannotNotConnectTo": "Cannot not connect to",
-    "ConnectionTo": "Connection to",
-    "ConnectionFailed": "Connection failed",
-    "SelectPrinter": "Select Printer",
-    "AddPrinter": "Add Printer",
-    "EditPrinter": "Edit Printer",
-    "UpdatePrinter": "Update Printer",
-    "ChangePrinter": "Change Printer",
-    "Hello": "Hello and welcome to the remote mode of Mainsail!",
-    "PleaseRememberToAdd": "Please remember to add",
-    "InMoonrakerConf": "in moonraker.conf within 'cors_domains'.",
-    "YouCanFindMore": "You can find more details at",
-    "Remotemode": "https://docs.mainsail.xyz/remotemode",
-    "KlipperControl": "Klipper Control",
-    "Restart": "Restart",
-    "FirmwareRestart": "FIRMWARE Restart",
-    "RestartServices": "Restart Services",
-    "Klipper": "Klipper",
-    "Moonraker": "Moonraker",
-    "PowerDevices": "Power Devices",
-    "HostControl": "Host Control",
-    "Reboot": "Reboot",
-    "Shutdown": "Shutdown",
-    "Updating": "Updating",
-    "done": " done!",
-    "Empty": "Empty",
-    "Close": "Close",
-    "SAVECONFIG": "SAVE CONFIG",
-    "UploadPrint": "Upload & Print",
-    "EmergencyStop": "Emergency Stop",
-    "Uploading": "Uploading"
-  },
-  "Router" : {
-    "Dashboard": "Dashboard",
-    "Printers": "Printers",
-    "Settings": "Settings",
-    "Webcam": "Webcam",
-    "Console": "Console",
-    "Heightmap": "Heightmap",
-    "G-Code Files": "G-Code Files",
-    "Machine": "Machine",
-    "Interface": "Interface"
-  },
-  "Files": {
-    "GCodeFiles": "G-Code Files",
-    "UploadNewGcode": "Upload new Gcode",
-    "CreateNewDirectory": "Create new Directory",
-    "RefreshCurrentDirectory":"Refresh current Directory",
-    "SetupCurrentList":"Setup current list",
-    "HiddenFiles":"Hidden files",
-    "FreeDisk":"Free disk: ",
-    "Used":"Used: ",
-    "Free":"Free: ",
-    "Total":"Total: ",
-    "Files": "Files",
-    "Search":"Search",
-    "Empty": "Empty",
-    "blabla": "bla bla",
-    "DropFilesToAddGcode": "Drop files to add gcode.",
-    "PrintStart": "Print start",
-    "Preheat": "Preheat",
-    "Download": "Download",
-    "Rename": "Rename",
-    "Delete": "Delete",
-    "StartJob": "Start Job",
-    "DoYouWantToStart": "Do you want to start",
-    "No": "No",
-    "Yes": "Yes",
-    "NewDirectory": "New Directory",
-    "PleaseEnterANewDirectoryName": "Please enter a new directory name:",
-    "RenameFile": "Rename File",
-    "Name": "Name",
-    "Cancel": "Cancel",
-    "Create": "Create",
-    "RenameDirectory": "Rename Directory",
-    "Uploading": "Uploading",
-    "CurrentPath": "Current path",
-    "Filesize": "Filesize",
-    "LastModified": "Last modified",
-    "ObjectHeight": "Object Height",
-    "LayerHeight": "Layer Height",
-    "FilamentUsage": "Filament Usage",
-    "PrintTime": "Print Time",
-    "Slicer": "Slicer"
-  },
-  "Console": {
-    "send": "send",
-    "SetupConsole": "Setup Console",
-    "SendCode": "Send code...",
-    "Empty": "Empty",
-    "HideTemperatures": "Hide temperatures",
-    "CustomFilters": "Custom filters",
-    "Date": "Date",
-    "Event": "Event"
-  },
-  "Panels": {
-    "ControlPanel":{
-      "Controls": "Controls",
-      "SetupControls": "Setup Controls",
-      "AlternateControls": "Alternate controls",
-      "InvertX": "Invert X",
-      "InvertY": "Invert Y",
-      "InvertZ": "Invert Z",
-      "ALL": "ALL",
-      "QGL": "QGL",
-      "ZTilt": "Z Tilt",
-      "X": "X",
-      "Y": "Y",
-      "Z": "Z",
-      "PleaseConfigureSteps": "Please configure steps",
-      "SettingsInterfaceControl": "Settings > Interface > Control",
-      "Home":"Home",
-      "Retract": "Retract",
-      "Extrude": "Extrude",
-      "Macros": "Macros"
-    },
-    "ExtruderPanel": {
-      "FeedAmountIn": "Feed amount in",
-      "FeedrateIn": "Feedrate in",
-      "Retract": "Retract",
-      "Extrude": "Extrude"
-    },
-    "FarmPrinterPanel": {
-  
-    },
-    "KlippyStatePanel": {
-      "KlippyState": "Klippy-State: ",
-      "KlippyInfo": "Moonraker can't connect to Klippy!\nPlease check if the Klipper service is running and an UDS (Unix Domain Socket) is configured.",
-      "Restart": "Restart",
-      "FirmwareRestart": "Firmware Restart"
-    },
-    "MiniconsolePanel": {
-      "Console": "Console",
-      "SetupConsole": "Setup Console",
-      "HideTemperatures": "Hide temperatures",
-      "CustomFilters": "Custom filters",
-      "SendCode": "Send code...",
-      "Send": "Send",
-      "Empty": "Empty"
-    },
-    "MinSettingsPanel": {
-      "MissingConfiguration": "Missing configuration",
-      "IsNotDefinedInConfig": "is not defined in config.",
-      "MoreInformation": "more information"
-    },
-    "MiscellaneousPanel": {
-      "PrintSettings": "Print Settings",
-      "Miscellaneous": "Miscellaneous"
-    },
-    "MoonrakerFailedPluginsPanel": {
-      "MoonrakerFailedPlugins": "Moonraker Failed Plugins",
-      "MoonrakerFailedComponents": "Moonraker Failed Components",
-      "MoonrakerErrorInfo": "An error was detected while loading the moonraker components. Please check the logfile and fix the issue.",
-      "FollowingPluginHasAnError": "Following plugin has an error:",
-      "DownloadLog": "Download Log"
-    },
-    "PowerControlPanel": {
-      "PowerControl": "Power Control",
-      "Error": "Error",
-      "On": "On",
-      "Off": "Off"
-    },
-    "StatusPanel": {
-      "Unknown": "Unknown",
-      "PausePrint": "Pause print",
-      "ResumePrint": "Resume print",
-      "CancelPrint": "Cancel print",
-      "ClearPrintStats": "Clear print stats",
-      "ReprintJob": "Reprint job",
-      "X": "X",
-      "Y": "Y",
-      "Z": "Z",
-      "Filament": "Filament",
-      "Print": "Print",
-      "Total": "Total",
-      "Speed": "Speed",
-      "Layer": "Layer",
-      "ObjectHeight": "Object Height:",
-      "ETA": "ETA",
-      "File": "File",
-      "Slicer": "Slicer"
-    },
-    "ToolsPanel": {
-      "Temperatures": "Temperatures",
-      "Presets": "Presets",
-      "Cooldown": "Cooldown",
-      "SetupTemperatures": "Setup Temperatures",
-      "ShowChart": "Show Chart",
-      "AutoscaleChart": "Autoscale Chart",
-      "Name": "Name",
-      "Color": "Color",
-      "State": "State",
-      "Current": "Current",
-      "Target": "Target",
-      "Min": "min: ",
-      "Max": "max: ",
-      "UNKNOWN": "UNKNOWN",
-      "ShowCurrentTemperatureInChart": "Show current temperature in chart",
-      "ShowTargetTemperatureInChart": "Show target temperature in chart",
-      "ShowPWMPowerInChart": "Show PWM-power in chart",
-      "Show": "Show",
-      "InList": "in list"
-    },
-    "WebcamPanel": {
-      "Webcam": "Webcam",
-      "FPS": "FPS"
-    },
-    "ZOffsetPanel": {
-      "ZBabyStepping": "Z Baby Stepping",
-      "CurrentOffset": "Current Offset: "
-    }
-  },
-  "Settings": {
-    "ConfigFilesPanel": {
-      "ConfigFiles": "Config Files",
-      "SetupCurrentList": "Setup current list",
-      "HiddenFiles": "Hidden files",
-      "CurrentPath: ": "Current path: ",
-      "Files": "Files",
-      "Empty": "Empty",
-      "EditFile": "Edit file",
-      "Download": "Download",
-      "Rename": "Rename",
-      "Delete": "Delete",
-      "PleaseStandBy": "Please stand by",
-      "ConfigReference": "Config Reference",
-      "Save": "Save",
-      "SaveRestart": "Save & restart",
-      "RenameFile": "Rename File",
-      "Name": "Name",
-      "Cancel": "Cancel",
-      "Create": "Create",
-      "Edit": "Edit",
-      "CreateFile": "Create File",
-      "CreateFolder": "Create Folder",
-      "Uploading": "Uploading",
-      "Filesize": "Filesize",
-      "LastModified": "Last modified"
-    },
-    "ConsolePanel": {
-      "Console": "Console",
-      "HideTemperatures": "Hide temperatures",
-      "CustomFilter": "Custom filter",
-      "Rules": "Rules"
-    },
-    "ControlPanel": {
-      "Control": "Control",
-      "SpeedXY": "Speed XY",
-      "SpeedZ": "Speed Z",
-      "MoveDistancesInMm": "Move distances in mm",
-      "ReverseXMovement": "Reverse X movement",
-      "ReverseYMovement": "Reverse Y movement",
-      "ReverseZMovement": "Reverse Z movement",
-      "MoveDistancesXYInMm": "Move distances XY in mm",
-      "MoveDistancesZInMm": "Move distances Z in mm",
-      "MoveDistancesEInMm": "Move distances E in mm",
-      "Extruder": "Extruder",
-      "SpeedEInMms": "Speed E in mm/s"
-    },
-    "DashboardPanel": {
-      "Dashboard": "Dashboard",
-      "Webcam": "Webcam",
-      "Tempchart": "Tempchart",
-      "Console": "Console",
-      "ChartUpdateInterval": "Chart update interval",
-      "DatapointInterval": "Datapoint interval"
-    },
-    "EndstopPanel": {
-      "Endstops": "Endstops",
-      "Endstop": "Endstop",
-      "TRIGGERED": "TRIGGERED",
-      "open": "OPEN",
-      "EndstopInfo": "Press the sync-button on the right-bottom to load the current endstop status."
-    },
-    "GeneralPanel": {
-      "General": "General",
-      "PrinterName": "Printer Name",
-      "DisplayCANCEL_PRINT": "Display CANCEL_PRINT",
-      "ShowCANCEL_PRINT": "Shows the CANCEL_PRINT button permanently - no second layer confirmation needed.",
-      "FactoryReset": "Factory reset",
-      "FactoryInfo": "Do you really want to reset mainsail to factory settings?",
-      "ResetMainsail": "reset mainsail"
-    },
-    "LanguagePanel": {
-      "Language": "Language"
-    },
-    "LimitsPanel": {
-      "MachineLimits": "Machine Limits",
-      "Velocity": "Velocity",
-      "Acceleration": "Acceleration",
-      "Deceleration": "Deceleration",
-      "SquareCornerVelocity": "Square corner velocity"
-    },
-    "LogfilesPanel": {
-      "Logfiles": "Logfiles"
-    },
-    "MacrosPanel": {
-      "Macros": "Macros",
-      "NOMacros": "No macros found..."
-    },
-    "PresetsPanel": {
-      "PreheatPresets": "Preheat Presets",
-      "Cooldown": "Cooldown",
-      "AddPreset": "add preset",
-      "Preset": "Preset",
-      "Create": "Create",
-      "Edit": "Edit",
-      "Name": "Name",
-      "CustomGCode": "Custom G-Code",
-      "PresetInfo": "You have to set minimum a target temperature or a custom gcode.",
-      "Store": "Store",
-      "Update": "Update",
-      "EditCooldown": "Edit Cooldown",
-      "UpdateCooldown": "Update Cooldown"
-    },
-    "RemotePrintersPanel": {
-      "RemotePrinters": "Remote Printers",
-      "AddPrinter": "Add Printer",
-      "EditPrinter": "Edit Printer",
-      "UpdatePrinter": "Update Printer"
-    },
-    "RunoutPanel": {
-      "Detected": "detected",
-      "Empty": "Empty"
-    },
-    "UpdatePanel": {
-      "UpdateManager": "Update Manager",
-      "CheckForUpdates": "Check for updates",
-      "System": "System",
-      "PackagesCanBeUpgraded": "packages can be upgraded",
-      "OSPackages": "OS-Packages",
-      "Commits": "Commits",
-      "CommittedAt": "committed at",
-      "UpToDate": "up-to-date",
-      "ERROR": "ERROR"
-    },
-    "WebcamPanel": {
-      "Webcam": "Webcam",
-      "WebcamURL": "Webcam URL",
-      "Rotate": "Rotate",
-      "FlipWebcamHorizontally": "Flip webcam horizontally",
-      "FlipWebcamVertically": "Flip webcam vertically",
-      "ShowInNavigation": "Show in navigation",
-      "Service": "Service"
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/locales/zh.js b/src/locales/zh.js
new file mode 100644
index 00000000..c206a8de
--- /dev/null
+++ b/src/locales/zh.js
@@ -0,0 +1,354 @@
+export default {
+  title: "简体中文",
+  App: {
+    Connecting: "连接",
+    To: "到",
+    Failed: "失败",
+    TryAgain: "重试",
+    Printers: "Printers",
+    CannotNotConnectTo: "无法连接到",
+    ConnectionTo: "连接到",
+    ConnectionFailed: "连接失败",
+    SelectPrinter: "选择打印机",
+    AddPrinter: "添加打印机",
+    EditPrinter: "编辑打印机",
+    UpdatePrinter: "更新打印机",
+    ChangePrinter: "更换打印机",
+    Hello: "大家好，欢迎来到主帆遥控模式!",
+    PleaseRememberToAdd: "请记得添加",
+    InMoonrakerConf: "在 moonraker.conf 的 'cors_domains' 中.",
+    YouCanFindMore: "详情请浏览",
+    Remotemode: "docs.mainsail.xyz/remotemode",
+    KlipperControl: "Klipper 控制",
+    Restart: "重启",
+    FirmwareRestart: "固件重启",
+    RestartServices: "重启服务",
+    Klipper: "Klipper",
+    Moonraker: "Moonraker",
+    PowerDevices: "电力设备",
+    HostControl: "主机控制",
+    Reboot: "重启",
+    Shutdown: "关机",
+    Updating: "更新",
+    done: " 完成！",
+    Empty: "空的",
+    Close: "关闭",
+    SAVECONFIG: "保存配置",
+    UploadPrint: "上传并打印",
+    EmergencyStop: "紧急停止",
+    Uploading: "上传"
+  },
+  Router: {
+    Dashboard: "仪表盘",
+    Printers: "打印机",
+    Settings: "设置",
+    Webcam: "摄像头",
+    Console: "控制台",
+    Heightmap: "Heightmap",
+    "G-Code Files": "G-Code 文件",
+    Machine: "机器",
+    Interface: "界面"
+  },
+  Files: {
+    GCodeFiles: "G-Code 文件",
+    UploadNewGcode: "上传新 Gcode",
+    CreateNewDirectory: "创建新目录",
+    RefreshCurrentDirectory: "刷新当前目录",
+    SetupCurrentList: "设置当前列表",
+    HiddenFiles: "隐藏文件",
+    FreeDisk: "可用磁盘: ",
+    Used: "使用: ",
+    Free: "空闲: ",
+    Total: "总共: ",
+    Files: "文件",
+    Search: "搜索",
+    Empty: "空的",
+    blabla: "巴拉巴拉",
+    DropFilesToAddGcode: "删除文件以添加gcode.",
+    PrintStart: "开始打印",
+    Preheat: "预热",
+    Download: "下载",
+    Rename: "重命名",
+    Delete: "删除",
+    StartJob: "开始作业",
+    DoYouWantToStart: "你想开始吗",
+    No: "否",
+    Yes: "是",
+    NewDirectory: "新建目录",
+    PleaseEnterANewDirectoryName: "请输入新的目录名称:",
+    RenameFile: "重命名文件",
+    Name: "名称",
+    Cancel: "取消",
+    Create: "创建",
+    RenameDirectory: "重命名目录",
+    Uploading: "上传",
+    CurrentPath: "当前路径",
+    Filesize: "文件大小",
+    LastModified: "上次修改",
+    ObjectHeight: "对象高度",
+    LayerHeight: "层高",
+    FilamentUsage: "耗材使用",
+    PrintTime: "打印时间",
+    Slicer: "切片"
+  },
+  Console: {
+    send: "发送",
+    SetupConsole: "设置控制台",
+    SendCode: "发送代码...",
+    Empty: "空的",
+    HideTemperatures: "隐藏温度",
+    CustomFilters: "自定义筛选器",
+    Date: "时间",
+    Event: "事件"
+  },
+  Panels: {
+    ControlPanel: {
+      Controls: "控制台",
+      SetupControls: "设置控件",
+      AlternateControls: "备用控件",
+      InvertX: "反转 X",
+      InvertY: "反转 Y",
+      InvertZ: "反转 Z",
+      ALL: "全部",
+      QGL: "QGL",
+      ZTilt: "Z 倾斜",
+      X: "X",
+      Y: "Y",
+      Z: "Z",
+      PleaseConfigureSteps: "请配置步骤",
+      SettingsInterfaceControl: "设置 > 界面 > 控制",
+      Home: "家",
+      Retract: "回抽",
+      Extrude: "挤出",
+      Macros: "宏"
+    },
+    ExtruderPanel: {
+      FeedAmountIn: "进料量",
+      FeedrateIn: "输入速度",
+      Retract: "回抽",
+      Extrude: "挤出"
+    },
+    FarmPrinterPanel: {
+
+    },
+    KlippyStatePanel: {
+      KlippyState: "Klippy-State: ",
+      KlippyInfo: "Moonraker 无法连接到 Klippy!\n请检查Klipper服务是否正在运行，并且是否配置了UDS（Unix域套接字）.",
+      Restart: "重启",
+      FirmwareRestart: "固件重启"
+    },
+    MiniconsolePanel: {
+      Console: "控制台",
+      SetupConsole: "设置控制台",
+      HideTemperatures: "隐藏温度",
+      CustomFilters: "自定义筛选器",
+      SendCode: "发送代码...",
+      Send: "发送",
+      Empty: "空的"
+    },
+    MinSettingsPanel: {
+      MissingConfiguration: "缺少配置",
+      IsNotDefinedInConfig: "未在配置中定义.",
+      MoreInformation: "更多信息"
+    },
+    MiscellaneousPanel: {
+      PrintSettings: "打印设置",
+      Miscellaneous: "其他"
+    },
+    MoonrakerFailedComponentsPanel: {
+      MoonrakerFailedComponents: "Moonraker 失败的组件",
+      MoonrakerErrorInfo: "加载moonraker组件时检测到一个错误. 请检查日志文件并修复这个问题.",
+      FollowingPluginHasAnError: "以下插件有一个错误:",
+      DownloadLog: "下载日志"
+    },
+    PowerControlPanel: {
+      PowerControl: "功率控制",
+      Error: "错误",
+      On: "开",
+      Off: "关"
+    },
+    StatusPanel: {
+      Unknown: "未知",
+      PausePrint: "暂停打印",
+      CancelPrint: "取消打印",
+      ResumePrint: "继续打印",
+      ClearPrintStats: "清除打印统计信息",
+      ReprintJob: "重新打印工作",
+      X: "X",
+      Y: "Y",
+      Z: "Z",
+      Filament: "耗材",
+      Print: "打印",
+      Total: "总计",
+      Speed: "速度",
+      Layer: "层",
+      ObjectHeight: "对象高度:",
+      ETA: "ETA",
+      File: "文件",
+      Slicer: "切片"
+    },
+    ToolsPanel: {
+      Temperatures: "温度",
+      Presets: "预设",
+      Cooldown: "冷却",
+      SetupTemperatures: "设置温度",
+      ShowChart: "显示图表",
+      AutoscaleChart: "自动缩放图表",
+      Name: "名称",
+      Color: "颜色",
+      State: "状态",
+      Current: "当前",
+      Target: "目标",
+      Min: "最小: ",
+      Max: "最大: ",
+      UNKNOWN: "未知",
+      ShowCurrentTemperatureInChart: "在图表中显示当前温度",
+      ShowTargetTemperatureInChart: "在图表中显示目标温度",
+      ShowPWMPowerInChart: "在图表中显示PWM功率",
+      Show: "Show",
+      InList: "in list"
+    },
+    WebcamPanel: {
+      Webcam: "摄像头",
+      FPS: "FPS"
+    },
+    ZOffsetPanel: {
+      ZBabyStepping: "Z 偏移",
+      CurrentOffset: "当前偏移量: "
+    }
+  },
+  Settings: {
+    ConfigFilesPanel: {
+      ConfigFiles: "配置文件",
+      SetupCurrentList: "设置当前列表",
+      HiddenFiles: "隐藏文件",
+      CurrentPath: "当前路径",
+      Files: "文件",
+      Empty: "空的",
+      EditFile: "编辑文件",
+      Download: "下载",
+      Rename: "重命名",
+      Delete: "删除",
+      PleaseStandBy: "请等待",
+      ConfigReference: "配置参考",
+      Save: "保存",
+      SaveRestart: "保存 & 重启",
+      RenameFile: "重命名文件",
+      Name: "名称",
+      Cancel: "取消",
+      Create: "创建",
+      Edit: "编辑",
+      CreateFile: "创建文件",
+      CreateFolder: "创建文件夹",
+      Uploading: "上传",
+      Filesize: "文件大小",
+      LastModified: "上次修改"
+    },
+    ConsolePanel: {
+      Console: "控制",
+      HideTemperatures: "隐藏温度",
+      CustomFilters: "自定义筛选器",
+      Rules: "规则"
+    },
+    ControlPanel: {
+      Control: "控制",
+      SpeedXY: "XY 速度",
+      SpeedZ: "Z 速度",
+      MoveDistancesInMm: "移动距离(mm)",
+      ReverseZMovement: "反向Z运动",
+      MoveDistancesXYInMm: "XY移动距离(mm)",
+      MoveDistancesZInMm: "Z移动距离(mm)",
+      MoveDistancesEInMm: "E移动距离(mm)",
+      Extruder: "挤出机",
+      SpeedEInMms: "E速度(mm/s)"
+    },
+    DashboardPanel: {
+      Dashboard: "仪表盘",
+      Webcam: "摄像头",
+      Tempchart: "温度图",
+      Console: "控制台",
+      ChartUpdateInterval: "图表更新间隔",
+      DatapointInterval: "数据点间隔"
+    },
+    EndstopPanel: {
+      Endstops: "限位开关",
+      Endstop: "限位",
+      TRIGGERED: "触发",
+      open: "打开",
+      EndstopInfo: "按右下角的同步按钮加载当前的限位状态。"
+    },
+    GeneralPanel: {
+      General: "一般",
+      PrinterName: "打印机名称",
+      DisplayCANCEL_PRINT: "显示 CANCEL_PRINT",
+      DisplayZOffset: "显示Z偏移面板",
+      ShowCANCEL_PRINT: "永久显示CANCEL_PRINT按钮-无需第二层确认。",
+      ShowZOffset: "永久显示Z偏移面板.",
+      FactoryReset: "恢复出厂设置",
+      FactoryInfo: "您是否真的要将主帆重置为出厂设置？",
+      ResetMainsail: "重置主帆"
+    },
+    LanguagePanel: {
+      Language: "语言"
+    },
+    LimitsPanel: {
+      MachineLimits: "机器限制",
+      Velocity: "速度",
+      Acceleration: "加速",
+      Deceleration: "减速",
+      SquareCornerVelocity: "直角速度"
+    },
+    LogfilesPanel: {
+      Logfiles: "日志文件"
+    },
+    MacrosPanel: {
+      Macros: "宏",
+      NOMacros: "没有找到宏..."
+    },
+    PresetsPanel: {
+      PreheatPresets: "预热预设",
+      Cooldown: "冷却",
+      AddPreset: "添加预设",
+      Preset: "预设",
+      Create: "创建",
+      Edit: "编辑",
+      Name: "名称",
+      CustomGCode: "自定义 G-Code",
+      PresetInfo: "您必须设置最低目标温度或自定义gcode.",
+      Store: "储存",
+      Update: "更新",
+      EditCooldown: "编辑冷却",
+      UpdateCooldown: "更新冷却"
+    },
+    RemotePrintersPanel: {
+      RemotePrinters: "远程打印机",
+      AddPrinter: "添加打印机",
+      EditPrinter: "编辑打印机",
+      UpdatePrinter: "更新打印机"
+    },
+    RunoutPanel: {
+      Detected: "发现",
+      Empty: "空的"
+    },
+    UpdatePanel: {
+      UpdateManager: "更新管理器",
+      CheckForUpdates: "检查更新",
+      System: "系统",
+      PackagesCanBeUpgraded: "软件包可以升级",
+      OSPackages: "OS包",
+      Commits: "Commits",
+      CommittedAt: "committed at",
+      UpToDate: "最新的",
+      ERROR: "错误"
+    },
+    WebcamPanel: {
+      Webcam: "摄像头",
+      WebcamURL: "摄像头地址",
+      Rotate: "旋转",
+      FlipWebcamHorizontally: "水平翻转摄像头 ",
+      FlipWebcamVertically: "垂直翻转摄像头",
+      ShowInNavigation: "在导航中显示 ",
+      Service: "服务"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/locales/zh.json b/src/locales/zh.json
deleted file mode 100644
index 02f4a6b5..00000000
--- a/src/locales/zh.json
+++ /dev/null
@@ -1,353 +0,0 @@
-{
-  "title": "简体中文",
-  "App": {
-    "Connecting": "连接",
-    "To": "到",
-    "Failed": "失败",
-    "TryAgain": "重试",
-    "Printers": "Printers",
-    "CannotNotConnectTo": "无法连接到",
-    "ConnectionTo": "连接到",
-    "ConnectionFailed": "连接失败",
-    "SelectPrinter": "选择打印机",
-    "AddPrinter": "添加打印机",
-    "EditPrinter": "编辑打印机",
-    "UpdatePrinter": "更新打印机",
-    "ChangePrinter": "更换打印机",
-    "Hello": "大家好，欢迎来到主帆遥控模式!",
-    "PleaseRememberToAdd": "请记得添加",
-    "InMoonrakerConf": "在 moonraker.conf 的 'cors_domains' 中.",
-    "YouCanFindMore": "详情请浏览",
-    "Remotemode": "docs.mainsail.xyz/remotemode",
-    "KlipperControl": "Klipper 控制",
-    "Restart": "重启",
-    "FirmwareRestart": "固件重启",
-    "RestartServices": "重启服务",
-    "Klipper": "Klipper",
-    "Moonraker": "Moonraker",
-    "PowerDevices": "电力设备",
-    "HostControl": "主机控制",
-    "Reboot": "重启",
-    "Shutdown": "关机",
-    "Updating": "更新",
-    "done": " 完成！",
-    "Empty": "空的",
-    "Close": "关闭",
-    "SAVECONFIG": "保存配置",
-    "UploadPrint": "上传并打印",
-    "EmergencyStop": "紧急停止",
-    "Uploading": "上传"
-  },
-  "Router" : {
-    "Dashboard": "仪表盘",
-    "Printers": "打印机",
-    "Settings": "设置",
-    "Webcam": "摄像头",
-    "Console": "控制台",
-    "Heightmap": "Heightmap",
-    "G-Code Files": "G-Code 文件",
-    "Machine": "机器",
-    "Interface": "界面"
-  },
-  "Files": {
-    "GCodeFiles": "G-Code 文件",
-    "UploadNewGcode": "上传新 Gcode",
-    "CreateNewDirectory": "创建新目录",
-    "RefreshCurrentDirectory":"刷新当前目录",
-    "SetupCurrentList":"设置当前列表",
-    "HiddenFiles":"隐藏文件",
-    "FreeDisk":"可用磁盘: ",
-    "Used":"使用: ",
-    "Free":"空闲: ",
-    "Total":"总共: ",
-    "Files": "文件",
-    "Search":"搜索",
-    "Empty": "空的",
-    "blabla": "巴拉巴拉",
-    "DropFilesToAddGcode": "删除文件以添加gcode.",
-    "PrintStart": "开始打印",
-    "Preheat": "预热",
-    "Download": "下载",
-    "Rename": "重命名",
-    "Delete": "删除",
-    "StartJob": "开始作业",
-    "DoYouWantToStart": "你想开始吗",
-    "No": "否",
-    "Yes": "是",
-    "NewDirectory": "新建目录",
-    "PleaseEnterANewDirectoryName": "请输入新的目录名称:",
-    "RenameFile": "重命名文件",
-    "Name": "名称",
-    "Cancel": "取消",
-    "Create": "创建",
-    "RenameDirectory": "重命名目录",
-    "Uploading": "上传",
-    "CurrentPath": "当前路径",
-    "Filesize": "文件大小",
-    "LastModified": "上次修改",
-    "ObjectHeight": "对象高度",
-    "LayerHeight": "层高",
-    "FilamentUsage": "耗材使用",
-    "PrintTime": "打印时间",
-    "Slicer": "切片"
-  },
-  "Console": {
-    "send": "发送",
-    "SetupConsole": "设置控制台",
-    "SendCode": "发送代码...",
-    "Empty": "空的",
-    "HideTemperatures": "隐藏温度",
-    "CustomFilters": "自定义筛选器",
-    "Date": "时间",
-    "Event": "事件"
-  },
-  "Panels": {
-    "ControlPanel":{
-      "Controls": "控制台",
-      "SetupControls": "设置控件",
-      "AlternateControls": "备用控件",
-      "InvertX": "反转 X",
-      "InvertY": "反转 Y",
-      "InvertZ": "反转 Z",
-      "ALL": "全部",
-      "QGL": "QGL",
-      "ZTilt": "Z 倾斜",
-      "X": "X",
-      "Y": "Y",
-      "Z": "Z",
-      "PleaseConfigureSteps": "请配置步骤",
-      "SettingsInterfaceControl": "设置 > 界面 > 控制",
-      "Home":"家",
-      "Retract": "回抽",
-      "Extrude": "挤出",
-      "Macros": "宏"
-    },
-    "ExtruderPanel": {
-      "FeedAmountIn": "进料量",
-      "FeedrateIn": "输入速度",
-      "Retract": "回抽",
-      "Extrude": "挤出"
-    },
-    "FarmPrinterPanel": {
-  
-    },
-    "KlippyStatePanel": {
-      "KlippyState": "Klippy-State: ",
-      "KlippyInfo": "Moonraker 无法连接到 Klippy!\n请检查Klipper服务是否正在运行，并且是否配置了UDS（Unix域套接字）.",
-      "Restart": "重启",
-      "FirmwareRestart": "固件重启"
-    },
-    "MiniconsolePanel": {
-      "Console": "控制台",
-      "SetupConsole": "设置控制台",
-      "HideTemperatures": "隐藏温度",
-      "CustomFilters": "自定义筛选器",
-      "SendCode": "发送代码...",
-      "Send": "发送",
-      "Empty": "空的"
-    },
-    "MinSettingsPanel": {
-      "MissingConfiguration": "缺少配置",
-      "IsNotDefinedInConfig": "未在配置中定义.",
-      "MoreInformation": "更多信息"
-    },
-    "MiscellaneousPanel": {
-      "PrintSettings": "打印设置",
-      "Miscellaneous": "其他"
-    },
-    "MoonrakerFailedPluginsPanel": {
-      "MoonrakerFailedPlugins": "Moonraker 失败的插件",
-      "MoonrakerFailedComponents": "Moonraker 失败的组件",
-      "MoonrakerErrorInfo": "加载moonraker组件时检测到一个错误. 请检查日志文件并修复这个问题.",
-      "FollowingPluginHasAnError": "以下插件有一个错误:",
-      "DownloadLog": "下载日志"
-    },
-    "PowerControlPanel": {
-      "PowerControl": "功率控制",
-      "Error": "错误",
-      "On": "开",
-      "Off": "关"
-    },
-    "StatusPanel": {
-      "Unknown": "未知",
-      "PausePrint": "暂停打印",
-      "CancelPrint": "取消打印",
-      "ResumePrint": "继续打印",
-      "ClearPrintStats": "清除打印统计信息",
-      "ReprintJob": "重新打印工作",
-      "X": "X",
-      "Y": "Y",
-      "Z": "Z",
-      "Filament": "耗材",
-      "Print": "打印",
-      "Total": "总计",
-      "Speed": "速度",
-      "Layer": "层",
-      "ObjectHeight": "对象高度:",
-      "ETA": "ETA",
-      "File": "文件",
-      "Slicer": "切片"
-    },
-    "ToolsPanel": {
-      "Temperatures": "温度",
-      "Presets": "预设",
-      "Cooldown": "冷却",
-      "SetupTemperatures": "设置温度",
-      "ShowChart": "显示图表",
-      "AutoscaleChart": "自动缩放图表",
-      "Name": "名称",
-      "Color": "颜色",
-      "State": "状态",
-      "Current": "当前",
-      "Target": "目标",
-      "Min": "最小: ",
-      "Max": "最大: ",
-      "UNKNOWN": "未知",
-      "ShowCurrentTemperatureInChart": "在图表中显示当前温度",
-      "ShowTargetTemperatureInChart": "在图表中显示目标温度",
-      "ShowPWMPowerInChart": "在图表中显示PWM功率",
-      "Show": "Show",
-      "InList": "in list"
-    },
-    "WebcamPanel": {
-      "Webcam": "摄像头",
-      "FPS": "FPS"
-    },
-    "ZOffsetPanel": {
-      "ZBabyStepping": "Z 偏移",
-      "CurrentOffset": "当前偏移量: "
-    }
-  },
-  "Settings": {
-    "ConfigFilesPanel": {
-      "ConfigFiles": "配置文件",
-      "SetupCurrentList":"设置当前列表",
-      "HiddenFiles":"隐藏文件",
-      "CurrentPath": "当前路径",
-      "Files": "文件",
-      "Empty": "空的",
-      "EditFile": "编辑文件",
-      "Download": "下载",
-      "Rename": "重命名",
-      "Delete": "删除",
-      "PleaseStandBy": "请等待",
-      "ConfigReference": "配置参考",
-      "Save": "保存",
-      "SaveRestart": "保存 & 重启",
-      "RenameFile": "重命名文件",
-      "Name": "名称",
-      "Cancel": "取消",
-      "Create": "创建",
-      "Edit": "编辑",
-      "CreateFile": "创建文件",
-      "CreateFolder": "创建文件夹",
-      "Uploading": "上传",
-      "Filesize": "文件大小",
-      "LastModified": "上次修改"
-    },
-    "ConsolePanel": {
-      "Console": "控制",
-      "HideTemperatures": "隐藏温度",
-      "CustomFilters": "自定义筛选器",
-      "Rules": "规则"
-    },
-    "ControlPanel": {
-      "Control": "控制",
-      "SpeedXY": "XY 速度",
-      "SpeedZ": "Z 速度",
-      "MoveDistancesInMm": "移动距离(mm)",
-      "ReverseZMovement": "反向Z运动",
-      "MoveDistancesXYInMm": "XY移动距离(mm)",
-      "MoveDistancesZInMm": "Z移动距离(mm)",
-      "MoveDistancesEInMm": "E移动距离(mm)",
-      "Extruder": "挤出机",
-      "SpeedEInMms": "E速度(mm/s)"
-    },
-    "DashboardPanel": {
-      "Dashboard": "仪表盘",
-      "Webcam": "摄像头",
-      "Tempchart": "温度图",
-      "Console": "控制台",
-      "ChartUpdateInterval": "图表更新间隔",
-      "DatapointInterval": "数据点间隔"
-    },
-    "EndstopPanel": {
-      "Endstops": "限位开关",
-      "Endstop": "限位",
-      "TRIGGERED": "触发",
-      "open": "打开",
-      "EndstopInfo": "按右下角的同步按钮加载当前的限位状态。"
-    },
-    "GeneralPanel": {
-      "General": "一般",
-      "PrinterName": "打印机名称",
-      "DisplayCANCEL_PRINT": "显示 CANCEL_PRINT",
-      "ShowCANCEL_PRINT": "永久显示CANCEL_PRINT按钮-无需第二层确认。",
-      "FactoryReset": "恢复出厂设置",
-      "FactoryInfo": "您是否真的要将主帆重置为出厂设置？",
-      "ResetMainsail": "重置主帆"
-    },
-    "LanguagePanel": {
-      "Language": "语言"
-    },
-    "LimitsPanel": {
-      "MachineLimits": "机器限制",
-      "Velocity": "速度",
-      "Acceleration": "加速",
-      "Deceleration": "减速",
-      "SquareCornerVelocity": "直角速度"
-    },
-    "LogfilesPanel": {
-      "Logfiles": "日志文件"
-    },
-    "MacrosPanel": {
-      "Macros": "宏",
-      "NOMacros": "没有找到宏..."
-    },
-    "PresetsPanel": {
-      "PreheatPresets": "预热预设",
-      "Cooldown": "冷却",
-      "AddPreset": "添加预设",
-      "Preset": "预设",
-      "Create": "创建",
-      "Edit": "编辑",
-      "Name": "名称",
-      "CustomGCode": "自定义 G-Code",
-      "PresetInfo": "您必须设置最低目标温度或自定义gcode.",
-      "Store": "储存",
-      "Update": "更新",
-      "EditCooldown": "编辑冷却",
-      "UpdateCooldown": "更新冷却"
-    },
-    "RemotePrintersPanel": {
-      "RemotePrinters": "远程打印机",
-      "AddPrinter": "添加打印机",
-      "EditPrinter": "编辑打印机",
-      "UpdatePrinter": "更新打印机"
-    },
-    "RunoutPanel": {
-      "Detected": "发现",
-      "Empty": "空的"
-    },
-    "UpdatePanel": {
-      "UpdateManager": "更新管理器",
-      "CheckForUpdates": "检查更新",
-      "System": "系统",
-      "PackagesCanBeUpgraded": "软件包可以升级",
-      "OSPackages": "OS包",
-      "Commits": "Commits",
-      "CommittedAt": "committed at",
-      "UpToDate": "最新的",
-      "ERROR": "错误"
-    },
-    "WebcamPanel": {
-      "Webcam": "摄像头",
-      "WebcamURL": "摄像头地址",
-      "Rotate": "旋转",
-      "FlipWebcamHorizontally": "水平翻转摄像头 ",
-      "FlipWebcamVertically": "垂直翻转摄像头",
-      "ShowInNavigation": "在导航中显示 ",
-      "Service": "服务"
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/plugins/i18n.js b/src/plugins/i18n.js
index b9d8aac5..d0a48ca8 100644
--- a/src/plugins/i18n.js
+++ b/src/plugins/i18n.js
@@ -3,15 +3,16 @@ import VueI18n from 'vue-i18n'
 Vue.use(VueI18n)
 
 function loadLocaleMessages () {
-    const locales = require.context('../locales', true, /[A-Za-z0-9-_,\s]+\.json$/i)
+    const locales = require.context('../locales', true, /[A-Za-z0-9-_,\s]+\.js$/i)
     const messages = {}
     locales.keys().forEach(key => {
       const matched = key.match(/([A-Za-z0-9-_]+)\./i)
       if (matched && matched.length > 1) {
         const locale = matched[1]
-        messages[locale] = locales(key)
+        messages[locale] = locales(key).default
       }
     })
+    console.log(messages,666)
     return messages
   }