update localisation for serial

Author: Alberto Iannaccone

Diff for: arduino-ide-extension/src/browser/contributions/upload-sketch.ts

@@ -181,8 +181,8 @@ export class UploadSketch extends SketchContribution {
         } catch (waitError) {
           this.messageService.error(
             nls.localize(
-              'arduino/sketch/couldNotConnectToMonitor',
-              'Could not reconnect to serial monitor. {0}',
+              'arduino/sketch/couldNotConnectToSerial',
+              'Could not reconnect to serial port. {0}',
               waitError.toString()
             )
           );

Diff for: arduino-ide-extension/src/browser/serial/monitor/monitor-view-contribution.tsx

@@ -19,14 +19,14 @@ export namespace SerialMonitor {
         id: 'serial-monitor-autoscroll',
         label: 'Autoscroll',
       },
-      'arduino/monitor/autoscroll'
+      'arduino/serial/autoscroll'
     );
     export const TIMESTAMP = Command.toLocalizedCommand(
       {
         id: 'serial-monitor-timestamp',
         label: 'Timestamp',
       },
-      'arduino/monitor/timestamp'
+      'arduino/serial/timestamp'
     );
     export const CLEAR_OUTPUT = Command.toLocalizedCommand(
       {
@@ -156,7 +156,7 @@ export class MonitorViewContribution
       <React.Fragment key="line-ending-toolbar-item">
         <div
           title={nls.localize(
-            'arduino/monitor/toggleTimestamp',
+            'arduino/serial/toggleTimestamp',
             'Toggle Timestamp'
           )}
           className={`item enabled fa fa-clock-o arduino-monitor ${

Diff for: arduino-ide-extension/src/browser/serial/monitor/monitor-widget.tsx

@@ -21,7 +21,7 @@ import { BoardsServiceProvider } from '../../boards/boards-service-provider';
 @injectable()
 export class MonitorWidget extends ReactWidget {
   static readonly LABEL = nls.localize(
-    'arduino/monitor/title',
+    'arduino/common/serialMonitor',
     'Serial Monitor'
   );
   static readonly ID = 'serial-monitor';
@@ -125,23 +125,20 @@ export class MonitorWidget extends ReactWidget {
   > {
     return [
       {
-        label: nls.localize('arduino/monitor/noLineEndings', 'No Line Ending'),
+        label: nls.localize('arduino/serial/noLineEndings', 'No Line Ending'),
         value: '',
       },
       {
-        label: nls.localize('arduino/monitor/newLine', 'New Line'),
+        label: nls.localize('arduino/serial/newLine', 'New Line'),
         value: '\n',
       },
       {
-        label: nls.localize(
-          'arduino/monitor/carriageReturn',
-          'Carriage Return'
-        ),
+        label: nls.localize('arduino/serial/carriageReturn', 'Carriage Return'),
         value: '\r',
       },
       {
         label: nls.localize(
-          'arduino/monitor/newLineCarriageReturn',
+          'arduino/serial/newLineCarriageReturn',
           'Both NL & CR'
         ),
         value: '\r\n',

Diff for: arduino-ide-extension/src/browser/serial/monitor/serial-monitor-send-input.tsx

@@ -46,13 +46,13 @@ export class SerialMonitorSendInput extends React.Component<
     const { serialConfig } = this.props;
     if (!serialConfig) {
       return nls.localize(
-        'arduino/monitor/notConnected',
+        'arduino/serial/notConnected',
         'Not connected. Select a board and a port to connect automatically.'
       );
     }
     const { board, port } = serialConfig;
     return nls.localize(
-      'arduino/monitor/message',
+      'arduino/serial/message',
       "Message ({0} + Enter to send message to '{1}' on '{2}'",
       isOSX ? '⌘' : nls.localize('vscode/keybindingLabels/ctrlKey', 'Ctrl'),
       Board.toString(board, {

Diff for: arduino-ide-extension/src/browser/serial/serial-connection-manager.ts

@@ -292,7 +292,7 @@ export class SerialConnectionManager {
       case SerialError.ErrorCodes.DEVICE_BUSY: {
         this.messageService.warn(
           nls.localize(
-            'arduino/monitor/connectionBusy',
+            'arduino/serial/connectionBusy',
             'Connection failed. Serial port is busy: {0}',
             Port.toString(port)
           ),
@@ -304,7 +304,7 @@ export class SerialConnectionManager {
       case SerialError.ErrorCodes.DEVICE_NOT_CONFIGURED: {
         this.messageService.info(
           nls.localize(
-            'arduino/monitor/disconnected',
+            'arduino/serial/disconnected',
             'Disconnected {0} from {1}.',
             Board.toString(board, {
               useFqbn: false,
@@ -318,7 +318,7 @@ export class SerialConnectionManager {
       case undefined: {
         this.messageService.error(
           nls.localize(
-            'arduino/monitor/unexpectedError',
+            'arduino/serial/unexpectedError',
             'Unexpected error. Reconnecting {0} on port {1}.',
             Board.toString(board),
             Port.toString(port)
@@ -335,8 +335,8 @@ export class SerialConnectionManager {
       if (this.serialErrors.length >= 10) {
         this.messageService.warn(
           nls.localize(
-            'arduino/monitor/failedReconnect',
-            'Failed to reconnect {0} to serial after 10 consecutive attempts. The {1} serial port is busy.',
+            'arduino/serial/failedReconnect',
+            'Failed to reconnect {0} to serial port after 10 consecutive attempts. The {1} serial port is busy.',
             Board.toString(board, {
               useFqbn: false,
             }),
@@ -353,7 +353,7 @@ export class SerialConnectionManager {
         const timeout = attempts * 1000;
         this.messageService.warn(
           nls.localize(
-            'arduino/monitor/reconnect',
+            'arduino/serial/reconnect',
             'Reconnecting {0} to {1} in {2] seconds...',
             Board.toString(board, {
               useFqbn: false,

Diff for: i18n/en.json

@@ -179,7 +179,7 @@
             "upload": "Upload",
             "uploadUsingProgrammer": "Upload Using Programmer",
             "doneUploading": "Done uploading.",
-            "couldNotConnectToMonitor": "Could not reconnect to serial monitor. {0}",
+            "couldNotConnectToSerial": "Could not reconnect to serial port. {0}",
             "verifyOrCompile": "Verify/Compile",
             "exportBinary": "Export Compiled Binary",
             "verify": "Verify",
@@ -253,22 +253,21 @@
         "dialog": {
             "dontAskAgain": "Don't ask again"
         },
-        "monitor": {
-            "connectionBusy": "Connection failed. Serial port is busy: {0}",
-            "disconnected": "Disconnected {0} from {1}.",
-            "unexpectedError": "Unexpected error. Reconnecting {0} on port {1}.",
-            "failedReconnect": "Failed to reconnect {0} to serial after 10 consecutive attempts. The {1} serial port is busy.",
-            "reconnect": "Reconnecting {0} to {1} in {2] seconds...",
+        "serial": {
             "toggleTimestamp": "Toggle Timestamp",
             "autoscroll": "Autoscroll",
             "timestamp": "Timestamp",
-            "title": "Serial Monitor",
             "noLineEndings": "No Line Ending",
             "newLine": "New Line",
             "carriageReturn": "Carriage Return",
             "newLineCarriageReturn": "Both NL & CR",
             "notConnected": "Not connected. Select a board and a port to connect automatically.",
-            "message": "Message ({0} + Enter to send message to '{1}' on '{2}'"
+            "message": "Message ({0} + Enter to send message to '{1}' on '{2}'",
+            "connectionBusy": "Connection failed. Serial port is busy: {0}",
+            "disconnected": "Disconnected {0} from {1}.",
+            "unexpectedError": "Unexpected error. Reconnecting {0} on port {1}.",
+            "failedReconnect": "Failed to reconnect {0} to serial port after 10 consecutive attempts. The {1} serial port is busy.",
+            "reconnect": "Reconnecting {0} to {1} in {2] seconds..."
         },
         "component": {
             "uninstall": "Uninstall",