Bugfix: english, grammar and typo

This commit is contained in:
Eyeballcode
2017-02-18 14:31:43 +01:00
committed by Laurent Clouet
parent 9b3baf01c7
commit c91bfc38fd
2 changed files with 23 additions and 23 deletions

View File

@@ -106,35 +106,35 @@ public class Settings implements Activity {
++currentRow; ++currentRow;
// authentication // authentication
JPanel authentification_panel = new JPanel(new GridLayout(2, 2)); JPanel authentication_panel = new JPanel(new GridLayout(2, 2));
authentification_panel.setBorder(BorderFactory.createTitledBorder("Authentification")); authentication_panel.setBorder(BorderFactory.createTitledBorder("Authentication"));
JLabel loginLabel = new JLabel("Login :"); JLabel loginLabel = new JLabel("Username:");
login = new JTextField(); login = new JTextField();
login.setText(parent.getConfiguration().login()); login.setText(parent.getConfiguration().login());
login.setColumns(20); login.setColumns(20);
login.addKeyListener(new CheckCanStart()); login.addKeyListener(new CheckCanStart());
JLabel passwordLabel = new JLabel("Password :"); JLabel passwordLabel = new JLabel("Password:");
password = new JPasswordField(); password = new JPasswordField();
password.setText(parent.getConfiguration().password()); password.setText(parent.getConfiguration().password());
password.setColumns(10); password.setColumns(10);
password.addKeyListener(new CheckCanStart()); password.addKeyListener(new CheckCanStart());
authentification_panel.add(loginLabel); authentication_panel.add(loginLabel);
authentification_panel.add(login); authentication_panel.add(login);
authentification_panel.add(passwordLabel); authentication_panel.add(passwordLabel);
authentification_panel.add(password); authentication_panel.add(password);
constraints.gridx = 0; constraints.gridx = 0;
constraints.gridy = currentRow; constraints.gridy = currentRow;
constraints.fill = GridBagConstraints.HORIZONTAL; constraints.fill = GridBagConstraints.HORIZONTAL;
parent.getContentPane().add(authentification_panel, constraints); parent.getContentPane().add(authentication_panel, constraints);
// directory // directory
JPanel directory_panel = new JPanel(new GridLayout(1, 3)); JPanel directory_panel = new JPanel(new GridLayout(1, 3));
directory_panel.setBorder(BorderFactory.createTitledBorder("Cache")); directory_panel.setBorder(BorderFactory.createTitledBorder("Cache"));
JLabel cacheLabel = new JLabel("Working directory :"); JLabel cacheLabel = new JLabel("Working directory:");
directory_panel.add(cacheLabel); directory_panel.add(cacheLabel);
String destination = DUMMY_CACHE_DIR; String destination = DUMMY_CACHE_DIR;
if (config.getUserSpecifiedACacheDir()) { if (config.getUserSpecifiedACacheDir()) {
@@ -248,7 +248,7 @@ public class Settings implements Activity {
JPanel advanced_panel = new JPanel(new GridLayout(3, 2)); JPanel advanced_panel = new JPanel(new GridLayout(3, 2));
advanced_panel.setBorder(BorderFactory.createTitledBorder("Advanced options")); advanced_panel.setBorder(BorderFactory.createTitledBorder("Advanced options"));
JLabel proxyLabel = new JLabel("Proxy :"); JLabel proxyLabel = new JLabel("Proxy:");
proxyLabel.setToolTipText("http://login:password@host:port"); proxyLabel.setToolTipText("http://login:password@host:port");
proxy = new JTextField(); proxy = new JTextField();
proxy.setToolTipText("http://login:password@host:port"); proxy.setToolTipText("http://login:password@host:port");
@@ -258,7 +258,7 @@ public class Settings implements Activity {
advanced_panel.add(proxyLabel); advanced_panel.add(proxyLabel);
advanced_panel.add(proxy); 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); customTileSize = new JCheckBox("", config.getTileSize() != -1);
advanced_panel.add(customTileSizeLabel); advanced_panel.add(customTileSizeLabel);
advanced_panel.add(customTileSize); advanced_panel.add(customTileSize);

View File

@@ -96,10 +96,10 @@ public class Working implements Activity {
JPanel current_project_panel = new JPanel(new SpringLayout()); JPanel current_project_panel = new JPanel(new SpringLayout());
current_project_panel.setBorder(BorderFactory.createTitledBorder("Project")); current_project_panel.setBorder(BorderFactory.createTitledBorder("Project"));
JLabel current_project_status = new JLabel("Status : ", JLabel.TRAILING); JLabel current_project_status = new JLabel("Status: ", JLabel.TRAILING);
JLabel current_project_name = new JLabel("Name : ", JLabel.TRAILING); JLabel current_project_name = new JLabel("Name: ", JLabel.TRAILING);
JLabel current_project_duration = new JLabel("Rendering for : ", JLabel.TRAILING); JLabel current_project_duration = new JLabel("Rendering for: ", JLabel.TRAILING);
JLabel current_project_progression = new JLabel("Remaining : ", JLabel.TRAILING); JLabel current_project_progression = new JLabel("Remaining: ", JLabel.TRAILING);
current_project_panel.add(current_project_status); current_project_panel.add(current_project_status);
current_project_panel.add(statusContent); current_project_panel.add(statusContent);
@@ -117,9 +117,9 @@ public class Working implements Activity {
JPanel session_info_panel = new JPanel(new SpringLayout()); JPanel session_info_panel = new JPanel(new SpringLayout());
session_info_panel.setBorder(BorderFactory.createTitledBorder("Session infos")); session_info_panel.setBorder(BorderFactory.createTitledBorder("Session infos"));
JLabel user_info_credits_this_session = new JLabel("Points earned : ", 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_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_rendered_frame_this_session = new JLabel("Rendered frames: ", JLabel.TRAILING);
session_info_panel.add(user_info_credits_this_session); session_info_panel.add(user_info_credits_this_session);
session_info_panel.add(creditEarned); session_info_panel.add(creditEarned);
@@ -134,10 +134,10 @@ public class Working implements Activity {
JPanel global_stats_panel = new JPanel(new SpringLayout()); JPanel global_stats_panel = new JPanel(new SpringLayout());
global_stats_panel.setBorder(BorderFactory.createTitledBorder("Global stats")); global_stats_panel.setBorder(BorderFactory.createTitledBorder("Global stats"));
JLabel global_stats_machine_connected = new JLabel("Machine connected : ", 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_remaining_frame = new JLabel("Remaining frames: ", JLabel.TRAILING);
JLabel global_stats_waiting_project = new JLabel("Waiting project : ", JLabel.TRAILING); JLabel global_stats_waiting_project = new JLabel("Remaining projects: ", JLabel.TRAILING);
JLabel global_stats_user_points = new JLabel("User points : ", 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(global_stats_waiting_project);
global_stats_panel.add(waiting_projects_value); global_stats_panel.add(waiting_projects_value);