From c91bfc38fde0a99e3af6a3d7c22b6a49ae03fec0 Mon Sep 17 00:00:00 2001 From: Eyeballcode Date: Sat, 18 Feb 2017 14:31:43 +0100 Subject: [PATCH] Bugfix: english, grammar and typo --- .../standalone/swing/activity/Settings.java | 24 +++++++++---------- .../standalone/swing/activity/Working.java | 22 ++++++++--------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/com/sheepit/client/standalone/swing/activity/Settings.java b/src/com/sheepit/client/standalone/swing/activity/Settings.java index e63bb80..252e815 100644 --- a/src/com/sheepit/client/standalone/swing/activity/Settings.java +++ b/src/com/sheepit/client/standalone/swing/activity/Settings.java @@ -106,35 +106,35 @@ public class Settings implements Activity { ++currentRow; // authentication - JPanel authentification_panel = new JPanel(new GridLayout(2, 2)); - authentification_panel.setBorder(BorderFactory.createTitledBorder("Authentification")); + JPanel authentication_panel = new JPanel(new GridLayout(2, 2)); + authentication_panel.setBorder(BorderFactory.createTitledBorder("Authentication")); - JLabel loginLabel = new JLabel("Login :"); + JLabel loginLabel = new JLabel("Username:"); login = new JTextField(); login.setText(parent.getConfiguration().login()); login.setColumns(20); login.addKeyListener(new CheckCanStart()); - JLabel passwordLabel = new JLabel("Password :"); + JLabel passwordLabel = new JLabel("Password:"); password = new JPasswordField(); password.setText(parent.getConfiguration().password()); password.setColumns(10); password.addKeyListener(new CheckCanStart()); - authentification_panel.add(loginLabel); - authentification_panel.add(login); + authentication_panel.add(loginLabel); + authentication_panel.add(login); - authentification_panel.add(passwordLabel); - authentification_panel.add(password); + authentication_panel.add(passwordLabel); + authentication_panel.add(password); constraints.gridx = 0; constraints.gridy = currentRow; constraints.fill = GridBagConstraints.HORIZONTAL; - parent.getContentPane().add(authentification_panel, constraints); + parent.getContentPane().add(authentication_panel, constraints); // directory JPanel directory_panel = new JPanel(new GridLayout(1, 3)); directory_panel.setBorder(BorderFactory.createTitledBorder("Cache")); - JLabel cacheLabel = new JLabel("Working directory :"); + JLabel cacheLabel = new JLabel("Working directory:"); directory_panel.add(cacheLabel); String destination = DUMMY_CACHE_DIR; if (config.getUserSpecifiedACacheDir()) { @@ -248,7 +248,7 @@ public class Settings implements Activity { JPanel advanced_panel = new JPanel(new GridLayout(3, 2)); advanced_panel.setBorder(BorderFactory.createTitledBorder("Advanced options")); - JLabel proxyLabel = new JLabel("Proxy :"); + JLabel proxyLabel = new JLabel("Proxy:"); proxyLabel.setToolTipText("http://login:password@host:port"); proxy = new JTextField(); proxy.setToolTipText("http://login:password@host:port"); @@ -258,7 +258,7 @@ public class Settings implements Activity { advanced_panel.add(proxyLabel); advanced_panel.add(proxy); - JLabel customTileSizeLabel = new JLabel("Custom render tile size"); + JLabel customTileSizeLabel = new JLabel("Custom render tile size:"); customTileSize = new JCheckBox("", config.getTileSize() != -1); advanced_panel.add(customTileSizeLabel); advanced_panel.add(customTileSize); diff --git a/src/com/sheepit/client/standalone/swing/activity/Working.java b/src/com/sheepit/client/standalone/swing/activity/Working.java index a94701f..0a02d64 100644 --- a/src/com/sheepit/client/standalone/swing/activity/Working.java +++ b/src/com/sheepit/client/standalone/swing/activity/Working.java @@ -96,10 +96,10 @@ public class Working implements Activity { JPanel current_project_panel = new JPanel(new SpringLayout()); current_project_panel.setBorder(BorderFactory.createTitledBorder("Project")); - JLabel current_project_status = new JLabel("Status : ", JLabel.TRAILING); - JLabel current_project_name = new JLabel("Name : ", JLabel.TRAILING); - JLabel current_project_duration = new JLabel("Rendering for : ", JLabel.TRAILING); - JLabel current_project_progression = new JLabel("Remaining : ", JLabel.TRAILING); + JLabel current_project_status = new JLabel("Status: ", JLabel.TRAILING); + JLabel current_project_name = new JLabel("Name: ", JLabel.TRAILING); + JLabel current_project_duration = new JLabel("Rendering for: ", JLabel.TRAILING); + JLabel current_project_progression = new JLabel("Remaining: ", JLabel.TRAILING); current_project_panel.add(current_project_status); current_project_panel.add(statusContent); @@ -117,9 +117,9 @@ public class Working implements Activity { JPanel session_info_panel = new JPanel(new SpringLayout()); session_info_panel.setBorder(BorderFactory.createTitledBorder("Session infos")); - JLabel user_info_credits_this_session = new JLabel("Points earned : ", JLabel.TRAILING); - JLabel user_info_total_rendertime_this_session = new JLabel("Duration : ", JLabel.TRAILING); - JLabel user_info_rendered_frame_this_session = new JLabel("Rendered frames : ", JLabel.TRAILING); + JLabel user_info_credits_this_session = new JLabel("Points earned: ", JLabel.TRAILING); + JLabel user_info_total_rendertime_this_session = new JLabel("Duration: ", JLabel.TRAILING); + JLabel user_info_rendered_frame_this_session = new JLabel("Rendered frames: ", JLabel.TRAILING); session_info_panel.add(user_info_credits_this_session); session_info_panel.add(creditEarned); @@ -134,10 +134,10 @@ public class Working implements Activity { JPanel global_stats_panel = new JPanel(new SpringLayout()); global_stats_panel.setBorder(BorderFactory.createTitledBorder("Global stats")); - JLabel global_stats_machine_connected = new JLabel("Machine connected : ", JLabel.TRAILING); - JLabel global_stats_remaining_frame = new JLabel("Remaining frames : ", JLabel.TRAILING); - JLabel global_stats_waiting_project = new JLabel("Waiting project : ", JLabel.TRAILING); - JLabel global_stats_user_points = new JLabel("User points : ", JLabel.TRAILING); + JLabel global_stats_machine_connected = new JLabel("Machines connected: ", JLabel.TRAILING); + JLabel global_stats_remaining_frame = new JLabel("Remaining frames: ", JLabel.TRAILING); + JLabel global_stats_waiting_project = new JLabel("Remaining projects: ", JLabel.TRAILING); + JLabel global_stats_user_points = new JLabel("User's points: ", JLabel.TRAILING); global_stats_panel.add(global_stats_waiting_project); global_stats_panel.add(waiting_projects_value);