diff --git a/ChangeLog b/ChangeLog index 6a7c383..5d70a7d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2009-08-05 Michael Stephenson + + * src/gtk-sat-module-popup.c: + * src/sat-pref-rot-editor.c: + * src/trsp-conf.c: + * src/save-pass.c: + * src/sat-pref-qth-editor.c: + * src/gtk-rig-ctrl.c: + * src/mod-cfg.c: + * src/qth-editor.c: + * src/sat-pref-rig-editor.c: + * src/gtk-rot-ctrl.c: + Spelling corrections. + + * po/en_US.po: + * po/en_GB.po: + US and British translations. + 2009-08-04 Alexandru Csete * data/satdata/*.sat: diff --git a/src/gtk-rig-ctrl.c b/src/gtk-rig-ctrl.c index 97c3c06..d04a052 100644 --- a/src/gtk-rig-ctrl.c +++ b/src/gtk-rig-ctrl.c @@ -741,7 +741,7 @@ create_conf_widgets (GtkRigCtrl *ctrl) /* Engage button */ ctrl->LockBut = gtk_toggle_button_new_with_label (_("Engage")); - gtk_widget_set_tooltip_text (ctrl->LockBut, _("Engage the selcted radio device")); + gtk_widget_set_tooltip_text (ctrl->LockBut, _("Engage the selected radio device")); g_signal_connect (ctrl->LockBut, "toggled", G_CALLBACK (rig_engaged_cb), ctrl); gtk_table_attach_defaults (GTK_TABLE (table), ctrl->LockBut, 2, 3, 0, 1); diff --git a/src/gtk-rot-ctrl.c b/src/gtk-rot-ctrl.c index 743a9ec..61be6f9 100644 --- a/src/gtk-rot-ctrl.c +++ b/src/gtk-rot-ctrl.c @@ -524,7 +524,7 @@ create_conf_widgets (GtkRotCtrl *ctrl) /* Engage button */ ctrl->LockBut = gtk_toggle_button_new_with_label (_("Engage")); - gtk_widget_set_tooltip_text (ctrl->LockBut, _("Engage the selcted rotor device")); + gtk_widget_set_tooltip_text (ctrl->LockBut, _("Engage the selected rotor device")); g_signal_connect (ctrl->LockBut, "toggled", G_CALLBACK (rot_locked_cb), ctrl); gtk_table_attach_defaults (GTK_TABLE (table), ctrl->LockBut, 2, 3, 0, 1); diff --git a/src/gtk-sat-module-popup.c b/src/gtk-sat-module-popup.c index 3621fa5..cc578a9 100644 --- a/src/gtk-sat-module-popup.c +++ b/src/gtk-sat-module-popup.c @@ -317,10 +317,10 @@ clone_cb (GtkWidget *menuitem, gpointer data) tooltips = gtk_tooltips_new (); gtk_tooltips_set_tip (tooltips, entry, _("Enter a short name for this module.\n"\ - "Allowed charachters: 0..9, a..z, A..Z, - and _"), + "Allowed characters: 0..9, a..z, A..Z, - and _"), _("The name will be used to identify the module "\ "and it is also used a file name for saving the data."\ - "Max length is 25 charachters.")); + "Max length is 25 characters.")); /* attach changed signal so that we can enable OK button when a proper name has been entered @@ -656,7 +656,7 @@ docking_state_cb (GtkWidget *menuitem, gpointer data) default: sat_log_log (SAT_LOG_LEVEL_BUG, - _("%s:%d: Unknown module satate: %d"), + _("%s:%d: Unknown module state: %d"), __FILE__, __LINE__, GTK_SAT_MODULE (module)->state); break; @@ -799,7 +799,7 @@ screen_state_cb (GtkWidget *menuitem, gpointer data) default: sat_log_log (SAT_LOG_LEVEL_BUG, - _("%s:%d: Unknown module satate: %d"), + _("%s:%d: Unknown module state: %d"), __FILE__, __LINE__, GTK_SAT_MODULE (module)->state); break; diff --git a/src/mod-cfg.c b/src/mod-cfg.c index 1f07a70..e94216a 100644 --- a/src/mod-cfg.c +++ b/src/mod-cfg.c @@ -513,10 +513,10 @@ mod_cfg_editor_create (const gchar *modname, GKeyFile *cfgdata, GtkWidget *tople tooltips = gtk_tooltips_new (); gtk_tooltips_set_tip (tooltips, namew, _("Enter a short name for this module.\n"\ - "Allowed charachters: 0..9, a..z, A..Z, - and _"), + "Allowed characters: 0..9, a..z, A..Z, - and _"), _("The name will be used to identify the module "\ "and it is also used a file name for saving the data."\ - "Max length is 25 charachters.")); + "Max length is 25 characters.")); /* attach changed signal so that we can enable OK button when a proper name has been entered diff --git a/src/qth-editor.c b/src/qth-editor.c index d6d2ac3..93ff4db 100644 --- a/src/qth-editor.c +++ b/src/qth-editor.c @@ -205,10 +205,10 @@ create_editor_widgets (qth_t *qth) tooltips = gtk_tooltips_new (); gtk_tooltips_set_tip (tooltips, name, _("Enter a short name for this ground station, e.g. callsign.\n"\ - "Allowed charachters: 0..9, a..z, A..Z, - and _"), + "Allowed characters: 0..9, a..z, A..Z, - and _"), _("The name will be used to identify the ground station "\ "when it is presented to the user. Maximum allowed length "\ - "is 25 charachters.")); + "is 25 characters.")); gtk_table_attach_defaults (GTK_TABLE (table), name, 1, 4, 0, 1); /* attach changed signal so that we can enable OK button when diff --git a/src/sat-pref-qth-editor.c b/src/sat-pref-qth-editor.c index 92c0e0d..6ddca18 100644 --- a/src/sat-pref-qth-editor.c +++ b/src/sat-pref-qth-editor.c @@ -190,10 +190,10 @@ create_editor_widgets (GtkTreeView *treeview, gboolean new) tooltips = gtk_tooltips_new (); gtk_tooltips_set_tip (tooltips, name, _("Enter a short name for this ground station, e.g. callsign.\n"\ - "Allowed charachters: 0..9, a..z, A..Z, - and _"), + "Allowed characters: 0..9, a..z, A..Z, - and _"), _("The name will be used to identify the ground station when "\ "it is presented to the user. Maximum allowed length "\ - "is 25 charachters.")); + "is 25 characters.")); gtk_table_attach_defaults (GTK_TABLE (table), name, 1, 4, 0, 1); /* attach changed signal so that we can enable OK button when diff --git a/src/sat-pref-rig-editor.c b/src/sat-pref-rig-editor.c index 9d3eafe..e696b38 100644 --- a/src/sat-pref-rig-editor.c +++ b/src/sat-pref-rig-editor.c @@ -162,7 +162,7 @@ create_editor_widgets (radio_conf_t *conf) gtk_entry_set_max_length (GTK_ENTRY (name), 25); gtk_widget_set_tooltip_text (name, _("Enter a short name for this configuration, e.g. IC910-1.\n"\ - "Allowed charachters: 0..9, a..z, A..Z, - and _")); + "Allowed characters: 0..9, a..z, A..Z, - and _")); gtk_table_attach_defaults (GTK_TABLE (table), name, 1, 4, 0, 1); /* attach changed signal so that we can enable OK button when diff --git a/src/sat-pref-rot-editor.c b/src/sat-pref-rot-editor.c index 32f82f1..ef62e8f 100644 --- a/src/sat-pref-rot-editor.c +++ b/src/sat-pref-rot-editor.c @@ -159,7 +159,7 @@ create_editor_widgets (rotor_conf_t *conf) gtk_entry_set_max_length (GTK_ENTRY (name), 25); gtk_widget_set_tooltip_text (name, _("Enter a short name for this configuration, e.g. ROTOR-1.\n"\ - "Allowed charachters: 0..9, a..z, A..Z, - and _")); + "Allowed characters: 0..9, a..z, A..Z, - and _")); gtk_table_attach_defaults (GTK_TABLE (table), name, 1, 4, 0, 1); /* attach changed signal so that we can enable OK button when diff --git a/src/save-pass.c b/src/save-pass.c index 0eecd7f..cfe9ffd 100644 --- a/src/save-pass.c +++ b/src/save-pass.c @@ -688,7 +688,7 @@ save_to_file (GtkWidget *parent, const gchar *fname, const gchar *data) g_io_channel_write_chars (chan, data, -1, &count, &err); if (err != NULL) { sat_log_log (SAT_LOG_LEVEL_ERROR, - _("%s: An error occured while saving data to %s (%s)"), + _("%s: An error occurred while saving data to %s (%s)"), __FUNCTION__, fname, err->message); dialog = gtk_message_dialog_new (GTK_WINDOW (parent), @@ -696,7 +696,7 @@ save_to_file (GtkWidget *parent, const gchar *fname, const gchar *data) GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, - _("An error occured while saving data to %s\n\n%s"), + _("An error occurred while saving data to %s\n\n%s"), fname, err->message); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -704,7 +704,7 @@ save_to_file (GtkWidget *parent, const gchar *fname, const gchar *data) } else { sat_log_log (SAT_LOG_LEVEL_DEBUG, - _("%s: Written %d charaters to %s"), + _("%s: Written %d characters to %s"), __FUNCTION__, count, fname); } diff --git a/src/trsp-conf.c b/src/trsp-conf.c index 2c636b9..3e1b25b 100644 --- a/src/trsp-conf.c +++ b/src/trsp-conf.c @@ -98,7 +98,7 @@ GSList *read_transponders (guint catnum) trsp->uplow = g_key_file_get_double (cfg, groups[i], KEY_UP_LOW, &error); if (error != NULL) { sat_log_log (SAT_LOG_LEVEL_WARN, - _("%s: Error reading %s:%s from %s. Using defult."), + _("%s: Error reading %s:%s from %s. Using default."), __FUNCTION__, groups[i], KEY_UP_LOW, name); g_clear_error (&error); trsp->uplow = 0.0; @@ -107,7 +107,7 @@ GSList *read_transponders (guint catnum) trsp->uphigh = g_key_file_get_double (cfg, groups[i], KEY_UP_HIGH, &error); if (error != NULL) { sat_log_log (SAT_LOG_LEVEL_WARN, - _("%s: Error reading %s:%s from %s. Using defult."), + _("%s: Error reading %s:%s from %s. Using default."), __FUNCTION__, groups[i], KEY_UP_HIGH, name); g_clear_error (&error); trsp->uphigh = trsp->uplow; @@ -116,7 +116,7 @@ GSList *read_transponders (guint catnum) trsp->downlow = g_key_file_get_double (cfg, groups[i], KEY_DOWN_LOW, &error); if (error != NULL) { sat_log_log (SAT_LOG_LEVEL_WARN, - _("%s: Error reading %s:%s from %s. Using defult."), + _("%s: Error reading %s:%s from %s. Using default."), __FUNCTION__, groups[i], KEY_DOWN_LOW, name); g_clear_error (&error); trsp->downlow = 0.0; @@ -125,7 +125,7 @@ GSList *read_transponders (guint catnum) trsp->downhigh = g_key_file_get_double (cfg, groups[i], KEY_DOWN_HIGH, &error); if (error != NULL) { sat_log_log (SAT_LOG_LEVEL_WARN, - _("%s: Error reading %s:%s from %s. Using defult."), + _("%s: Error reading %s:%s from %s. Using default."), __FUNCTION__, groups[i], KEY_DOWN_HIGH, name); g_clear_error (&error); trsp->downhigh = trsp->downlow;