[dia] Bug 612430 - Miscellaneous string fixes
- From: Hans Breuer <hans src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dia] Bug 612430 - Miscellaneous string fixes
- Date: Sat, 31 Jul 2010 12:57:04 +0000 (UTC)
commit 26c89b3730773d9157df6b8f636a5255d42e3f27
Author: Philip Withnall <philip tecnocode co uk>
Date: Wed Mar 10 13:26:28 2010 +0000
Bug 612430 - Miscellaneous string fixes
Signed-off-by: Hans Breuer <hans breuer org>
app/app_procs.c | 14 +++++++-------
app/modify_tool.c | 2 +-
app/plugin-manager.c | 2 +-
lib/arrows.c | 2 +-
lib/dia_dirs.c | 2 +-
lib/proplist.c | 2 +-
objects/Database/compound.c | 8 ++++----
objects/Database/table.c | 2 +-
objects/Misc/grid_object.c | 4 ++--
objects/SISSI/classification.h | 2 +-
objects/SISSI/sissi_dialog.c | 6 +++---
objects/UML/class.c | 4 ++--
objects/UML/state.c | 2 +-
objects/chronogram/chronoline.c | 10 +++++-----
objects/standard/image.c | 8 ++++----
plug-ins/vdx/vdx-import.c | 2 +-
plug-ins/wmf/wmf.cpp | 2 +-
plug-ins/xfig/xfig-import.c | 6 +++---
plug-ins/xslt/xslt.c | 2 +-
sheets/Circuit.sheet.in | 4 ++--
sheets/IsometricMap.sheet.in | 2 +-
sheets/Misc.sheet.in | 6 +++---
sheets/SISSI.sheet.in | 2 +-
23 files changed, 48 insertions(+), 48 deletions(-)
---
diff --git a/app/app_procs.c b/app/app_procs.c
index 7f4851e..5a00140 100644
--- a/app/app_procs.c
+++ b/app/app_procs.c
@@ -253,7 +253,7 @@ show_layers_parse_word(DiagramData *diagdata, gboolean *visible_layers, gint n_l
}
if (found == FALSE)
- g_print(_("Warning: There is no layer named %s\n"), str);
+ g_print(_("Warning: There is no layer named %s.\n"), str);
}
static void
@@ -344,7 +344,7 @@ do_convert(const char *infname,
dia_is_interactive = FALSE;
if (0==strcmp(infname,outfname)) {
- g_critical(_("%s error: input and output file name is identical: %s"),
+ g_critical(_("%s error: input and output filenames are identical: %s"),
argv0, infname);
exit(1);
}
@@ -717,7 +717,7 @@ app_init (int argc, char **argv)
{"nosplash", 'n', 0, G_OPTION_ARG_NONE, &nosplash,
N_("Don't show the splash screen"), NULL },
{"nonew", 'n', 0, G_OPTION_ARG_NONE, &nonew,
- N_("Don't create empty diagram"), NULL },
+ N_("Don't create an empty diagram"), NULL },
{"integrated", '\0', 0, G_OPTION_ARG_NONE, &use_integrated_ui,
N_("Start integrated user interface (diagrams in tabs)"), NULL },
{"log-to-stderr", 'l', 0, G_OPTION_ARG_NONE, &log_to_stderr,
@@ -1012,7 +1012,7 @@ app_exit(void)
if (app_exit_once) {
g_error(_("This shouldn't happen. Please file a bug report at bugzilla.gnome.org\n"
- "describing how you can cause this message to appear.\n"));
+ "describing how you caused this message to appear.\n"));
return FALSE;
}
@@ -1165,17 +1165,17 @@ static void create_user_dirs(void)
*/
if (!g_get_home_dir())
{
- g_warning(_("Could not create per-user Dia config directory"));
+ g_warning(_("Could not create per-user Dia configuration directory"));
return; /* ... and return. Probably removes my one and only FAQ. --HB */
}
#endif
dir = g_strconcat(g_get_home_dir(), G_DIR_SEPARATOR_S ".dia", NULL);
if (g_mkdir(dir, 0755) && errno != EEXIST) {
#ifndef G_OS_WIN32
- g_critical(_("Could not create per-user Dia config directory"));
+ g_critical(_("Could not create per-user Dia configuration directory"));
exit(1);
#else /* HB: it this really a reason to exit the program on *nix ? */
- g_warning(_("Could not create per-user Dia config directory. Please make "
+ g_warning(_("Could not create per-user Dia configuration directory. Please make "
"sure that the environment variable HOME points to an existing directory."));
#endif
}
diff --git a/app/modify_tool.c b/app/modify_tool.c
index d9f7fdb..ed26224 100644
--- a/app/modify_tool.c
+++ b/app/modify_tool.c
@@ -389,7 +389,7 @@ modify_move_already(ModifyTool *tool, DDisplay *ddisp, Point *to)
move --Lars */
GtkSettings *settings = gtk_settings_get_default();
if (settings == NULL) {
- g_message(_("Couldn't get GTK settings"));
+ g_message(_("Couldn't get GTK+ settings"));
} else {
g_object_get(G_OBJECT(settings),
"gtk-double-click-time", &double_click_time, NULL);
diff --git a/app/plugin-manager.c b/app/plugin-manager.c
index f786e0e..02141ed 100644
--- a/app/plugin-manager.c
+++ b/app/plugin-manager.c
@@ -281,7 +281,7 @@ get_plugin_manager(void)
gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), col);
col = gtk_tree_view_column_new_with_attributes(
- _("File Name"), gtk_cell_renderer_text_new (),
+ _("Filename"), gtk_cell_renderer_text_new (),
"text", FILENAME_COLUMN, NULL);
gtk_tree_view_column_set_sort_column_id (col, FILENAME_COLUMN);
gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), col);
diff --git a/lib/arrows.c b/lib/arrows.c
index 83969fc..b3a5545 100644
--- a/lib/arrows.c
+++ b/lib/arrows.c
@@ -2042,7 +2042,7 @@ sanitize_arrow(Arrow *arrow)
if (arrow->length < MIN_ARROW_DIMENSION ||
arrow->width < MIN_ARROW_DIMENSION) {
- message_warning(_("Arrow head of type %s has too small dimensions, removing.\n"),
+ message_warning(_("Arrow head of type %s has too small dimensions; removing.\n"),
arrow_get_name_from_type(arrow->type));
arrow->type = ARROW_NONE;
arrow->width = DEFAULT_ARROW_WIDTH;
diff --git a/lib/dia_dirs.c b/lib/dia_dirs.c
index ee3c614..4111b14 100644
--- a/lib/dia_dirs.c
+++ b/lib/dia_dirs.c
@@ -256,7 +256,7 @@ dia_get_absolute_filename (const gchar *filename)
if (strchr(fullname, '.') == NULL) return fullname;
canonical = dia_get_canonical_path(fullname);
if (canonical == NULL) {
- message_warning(_("Too many ..'s in filename %s\n"),
+ message_warning(_("Too many \"..\"s in filename %s\n"),
dia_message_filename(filename));
return g_strdup(filename);
}
diff --git a/lib/proplist.c b/lib/proplist.c
index f3edd29..d048218 100644
--- a/lib/proplist.c
+++ b/lib/proplist.c
@@ -160,7 +160,7 @@ prop_list_load(GPtrArray *props, DataNode data, GError **err)
if (err && !*err)
*err = g_error_new (DIA_ERROR,
DIA_ERROR_FORMAT,
- _("No attribute '%s' (%p) or no data(%p) in this attribute"),
+ _("No attribute '%s' (%p) or no data (%p) in this attribute"),
prop->name,attr,data);
prop->experience |= PXP_NOTSET;
ret = FALSE;
diff --git a/objects/Database/compound.c b/objects/Database/compound.c
index b742d7f..acbecc3 100644
--- a/objects/Database/compound.c
+++ b/objects/Database/compound.c
@@ -218,13 +218,13 @@ static PropOffset compound_offsets[] =
#define FLIP_HORIZONTAL 2
static DiaMenuItem compound_menu_items[] = {
- { N_("Flip arms verticaly"), compound_flip_arms_cb,
+ { N_("Flip arms vertically"), compound_flip_arms_cb,
GINT_TO_POINTER(1), DIAMENU_ACTIVE },
- { N_("Flip arms horizontaly"), compound_flip_arms_cb,
+ { N_("Flip arms horizontally"), compound_flip_arms_cb,
GINT_TO_POINTER(2), DIAMENU_ACTIVE },
- { N_("Center mount point verticaly"), compound_repos_mount_point_cb,
+ { N_("Center mount point vertically"), compound_repos_mount_point_cb,
GINT_TO_POINTER (CENTER_VERTICAL), DIAMENU_ACTIVE },
- { N_("Center mount point horizontaly"), compound_repos_mount_point_cb,
+ { N_("Center mount point horizontally"), compound_repos_mount_point_cb,
GINT_TO_POINTER (CENTER_HORIZONTAL), DIAMENU_ACTIVE },
{ N_("Center mount point"), compound_repos_mount_point_cb,
GINT_TO_POINTER (CENTER_BOTH), DIAMENU_ACTIVE }
diff --git a/objects/Database/table.c b/objects/Database/table.c
index 755adf9..66641fe 100644
--- a/objects/Database/table.c
+++ b/objects/Database/table.c
@@ -199,7 +199,7 @@ static PropDescription table_props[] =
{ "normal_font", PROP_TYPE_FONT, PROP_FLAG_VISIBLE | PROP_FLAG_OPTIONAL,
N_("Normal"), NULL, NULL },
{ "name_font", PROP_TYPE_FONT, PROP_FLAG_VISIBLE | PROP_FLAG_OPTIONAL,
- N_("Tablename"), NULL, NULL },
+ N_("Table name"), NULL, NULL },
{ "comment_font", PROP_TYPE_FONT, PROP_FLAG_VISIBLE | PROP_FLAG_OPTIONAL,
N_("Comment"), NULL, NULL },
PROP_MULTICOL_COLUMN("height"),
diff --git a/objects/Misc/grid_object.c b/objects/Misc/grid_object.c
index 73f6734..b6dcf9c 100644
--- a/objects/Misc/grid_object.c
+++ b/objects/Misc/grid_object.c
@@ -141,9 +141,9 @@ static PropDescription grid_object_props[] = {
{ "grid_cols", PROP_TYPE_INT, PROP_FLAG_VISIBLE,
N_("Columns"), NULL, &rows_columns_range },
{ "gridline_colour", PROP_TYPE_COLOUR, PROP_FLAG_VISIBLE,
- N_("Gridline color"), NULL, NULL },
+ N_("Grid line color"), NULL, NULL },
{ "gridline_width", PROP_TYPE_REAL, PROP_FLAG_VISIBLE,
- N_("Gridline width"), NULL, &prop_std_line_width_data },
+ N_("Grid line width"), NULL, &prop_std_line_width_data },
{NULL}
};
diff --git a/objects/SISSI/classification.h b/objects/SISSI/classification.h
index 2551b86..7f84d7f 100644
--- a/objects/SISSI/classification.h
+++ b/objects/SISSI/classification.h
@@ -42,7 +42,7 @@ static PropEnumData propriete_confidentialite_data[] = {
{ N_("NATO Confidential") , NATO_CONFIDENTIAL },
{ N_("Personal Confidential") , PERSONAL_CONFIDENTIAL },
{ N_("Medical Confidential") , MEDICAL_CONFIDENTIAL },
- { N_("Industrie Confidential") , INDUSTRIE_CONFIDENTIAL },
+ { N_("Industry Confidential") , INDUSTRIE_CONFIDENTIAL },
{ N_("Defense Confidential") , DEFENSE_CONFIDENTIAL },
{ N_("Secret") , SECRET },
{ N_("Defense Secret") , DEFENSE_SECRET },
diff --git a/objects/SISSI/sissi_dialog.c b/objects/SISSI/sissi_dialog.c
index e24680d..4de457b 100644
--- a/objects/SISSI/sissi_dialog.c
+++ b/objects/SISSI/sissi_dialog.c
@@ -89,7 +89,7 @@ static SISSI_Property property_organisation_data[] = {
{ N_("Higher-tier organisation"), "ORG_DEP",NULL},
{ N_("Structure of the organisation"), "ORG_GEN",NULL},
{ N_("Project or system organisation"), "ORG_PRO",NULL},
- { N_("Subcontractors / Suppliers / Manufacturers"),"ORG_EXT",NULL},
+ { N_("Subcontractors/Suppliers/Manufacturers"),"ORG_EXT",NULL},
{ NULL,0,NULL}
};
@@ -102,7 +102,7 @@ static SISSI_Property property_physic_data[] = {
{ N_("Essential Services"), "PHY_SRV",NULL},
{ N_("Communication"), "PHY_SRV1",NULL},
{ N_("Power"), "PHY_SRV2",NULL},
- { N_("Cooling / Pollution"), "PHY_SRV3",NULL},
+ { N_("Cooling/Pollution"), "PHY_SRV3",NULL},
{ NULL, 0,NULL}
};
static SISSI_Property property_physic_detecTHERMIC_data[] = {
@@ -163,7 +163,7 @@ static SISSI_Property property_personnel_data[] = {
{ N_("Technical administrator"), "PER_TECH_ADMIN",NULL},
{ N_("SSI administrator"), "PER_SSI_ADMIN",NULL},
{ N_("Developer"), "PER_DEV",NULL},
- { N_("Operator / Maintenance"), "PER_EXP",NULL},
+ { N_("Operator/Maintenance"), "PER_EXP",NULL},
{ NULL, 0,NULL}
};
diff --git a/objects/UML/class.c b/objects/UML/class.c
index 78b04b8..2be337e 100644
--- a/objects/UML/class.c
+++ b/objects/UML/class.c
@@ -185,9 +185,9 @@ static PropDescription umlclass_props[] = {
{ "abstract_font", PROP_TYPE_FONT, PROP_FLAG_VISIBLE | PROP_FLAG_OPTIONAL,
N_("Abstract"), NULL, NULL },
{ "classname_font", PROP_TYPE_FONT, PROP_FLAG_VISIBLE | PROP_FLAG_OPTIONAL,
- N_("Classname"), NULL, NULL },
+ N_("Class Name"), NULL, NULL },
{ "abstract_classname_font", PROP_TYPE_FONT, PROP_FLAG_VISIBLE | PROP_FLAG_OPTIONAL,
- N_("Abstract Classname"), NULL, NULL },
+ N_("Abstract Class Name"), NULL, NULL },
{ "comment_font", PROP_TYPE_FONT, PROP_FLAG_VISIBLE | PROP_FLAG_OPTIONAL,
N_("Comment"), NULL, NULL },
diff --git a/objects/UML/state.c b/objects/UML/state.c
index f004b80..4a4eca9 100644
--- a/objects/UML/state.c
+++ b/objects/UML/state.c
@@ -476,7 +476,7 @@ state_load(ObjectNode obj_node, int version, const char *filename)
if (obj->state_type != STATE_NORMAL) {
/* Would like to create a state_term instead, but making the connections
* is a pain */
- message_warning(_("This diagram uses the State object for initial/final states.\nThat option will go away in future versions.\nPlease use the Initial/Final State object instead\n"));
+ message_warning(_("This diagram uses the State object for initial/final states.\nThis option will go away in future versions.\nPlease use the Initial/Final State object instead.\n"));
}
return (DiaObject *)obj;
}
diff --git a/objects/chronogram/chronoline.c b/objects/chronogram/chronoline.c
index c8eb69b..c032385 100644
--- a/objects/chronogram/chronoline.c
+++ b/objects/chronogram/chronoline.c
@@ -155,11 +155,11 @@ static PropDescription chronoline_props[] = {
{ "help", PROP_TYPE_STATIC,
PROP_FLAG_VISIBLE|PROP_FLAG_DONT_SAVE|PROP_FLAG_DONT_MERGE,
N_("Event specification"),N_(
- "@ time set the pointer at an absolute time.\n"
- "( duration sets the signal up, then wait 'duration'.\n"
- ") duration sets the signal down, then wait 'duration'.\n"
- "u duration sets the signal to \"unknown\" state, then wait 'duration'.\n"
- "example : @ 1.0 (2.0)1.0(2.0)\n" )},
+ "@ time set the pointer to an absolute time.\n"
+ "( duration set the signal up, then wait 'duration'.\n"
+ ") duration set the signal down, then wait 'duration'.\n"
+ "u duration set the signal to \"unknown\" state, then wait 'duration'.\n"
+ "Example: @ 1.0 (2.0)1.0(2.0)\n" )},
PROP_NOTEBOOK_PAGE("parameters",0,N_("Parameters")),
{ "start_time",PROP_TYPE_REAL,PROP_FLAG_VISIBLE,
diff --git a/objects/standard/image.c b/objects/standard/image.c
index 1a4b47d..bc9a576 100644
--- a/objects/standard/image.c
+++ b/objects/standard/image.c
@@ -694,8 +694,8 @@ image_load(ObjectNode obj_node, int version, const char *filename)
if (image->image != NULL) {
/* Found file in same dir as diagram. */
- message_warning(_("The image file '%s' was not found in that directory.\n"
- "Using the file '%s' instead\n"), image->file, temp_string);
+ message_warning(_("The image file '%s' was not found in the specified directory.\n"
+ "Using the file '%s' instead.\n"), image->file, temp_string);
g_free(image->file);
image->file = temp_string;
} else {
@@ -705,8 +705,8 @@ image_load(ObjectNode obj_node, int version, const char *filename)
if (image->image != NULL) {
char *tmp;
/* Found file in current dir. */
- message_warning(_("The image file '%s' was not found in that directory.\n"
- "Using the file '%s' instead\n"), image->file, image_file_name);
+ message_warning(_("The image file '%s' was not found in the specified directory.\n"
+ "Using the file '%s' instead.\n"), image->file, image_file_name);
tmp = image->file;
image->file = g_strdup(image_file_name);
g_free(tmp);
diff --git a/plug-ins/vdx/vdx-import.c b/plug-ins/vdx/vdx-import.c
index 161e208..d530c6e 100644
--- a/plug-ins/vdx/vdx-import.c
+++ b/plug-ins/vdx/vdx-import.c
@@ -2093,7 +2093,7 @@ plot_image(const struct vdx_Geom *Geom, const struct vdx_XForm *XForm,
if (!image_dir) return 0;
if (g_mkdir(image_dir, 0700))
{
- message_error(_("Couldn't make object dir %s"), image_dir);
+ message_error(_("Couldn't make object directory %s"), image_dir);
return 0;
}
}
diff --git a/plug-ins/wmf/wmf.cpp b/plug-ins/wmf/wmf.cpp
index df2734b..14605e7 100644
--- a/plug-ins/wmf/wmf.cpp
+++ b/plug-ins/wmf/wmf.cpp
@@ -512,7 +512,7 @@ set_font(DiaRenderer *self, DiaFont *font, real height)
else
{
gchar *desc = pango_font_description_to_string (dia_font_get_description (font));
- message_warning (_("Can not render unknown font:\n%s"), desc);
+ message_warning (_("Cannot render unknown font:\n%s"), desc);
g_free (desc);
}
#else
diff --git a/plug-ins/xfig/xfig-import.c b/plug-ins/xfig/xfig-import.c
index 6811c0f..eb16d4e 100644
--- a/plug-ins/xfig/xfig-import.c
+++ b/plug-ins/xfig/xfig-import.c
@@ -108,7 +108,7 @@ fig_color(int color_index)
else if (color_index < FIG_MAX_USER_COLORS)
return fig_colors[color_index-FIG_MAX_DEFAULT_COLORS];
else {
- message_error(_("Color index %d too high, only 512 colors allowed. Using black instead."),
+ message_error(_("Color index %d too high; only 512 colors allowed. Using black instead."),
color_index);
return color_black;
}
@@ -163,7 +163,7 @@ fig_line_style_to_dia(int line_style)
case 4:
return LINESTYLE_DASH_DOT_DOT;
case 5:
- message_warning(_("Triple-dotted lines are not supported by Dia, "
+ message_warning(_("Triple-dotted lines are not supported by Dia; "
"using double-dotted"));
return LINESTYLE_DASH_DOT_DOT;
default:
@@ -524,7 +524,7 @@ fig_read_polyline(FILE *file) {
(RealProperty *)make_new_prop("corner_radius",
PROP_TYPE_REAL,PROP_FLAG_DONT_SAVE);
if (radius < 0) {
- message_warning(_("Negative corner radius, negating"));
+ message_warning(_("Negative corner radius; negating"));
rprop->real_data = -radius/FIG_ALT_UNIT;
} else {
rprop->real_data = radius/FIG_ALT_UNIT;
diff --git a/plug-ins/xslt/xslt.c b/plug-ins/xslt/xslt.c
index 36c292c..6b86a24 100644
--- a/plug-ins/xslt/xslt.c
+++ b/plug-ins/xslt/xslt.c
@@ -360,7 +360,7 @@ dia_plugin_init(PluginInfo *info)
filter_register_export(&my_export_filter);
return DIA_PLUGIN_INIT_OK;
} else {
- message_error (_("No valid configuration files found for the XSLT plugin, not loading."));
+ message_error (_("No valid configuration files found for the XSLT plugin; not loading."));
return DIA_PLUGIN_INIT_ERROR;
}
}
diff --git a/sheets/Circuit.sheet.in b/sheets/Circuit.sheet.in
index b322b06..6aa24b7 100644
--- a/sheets/Circuit.sheet.in
+++ b/sheets/Circuit.sheet.in
@@ -73,10 +73,10 @@
<_description>Vertically aligned fuse</_description>
</object>
<object name="Circuit - Horizontal Powersource (European)">
- <_description>Horizontally aligned powersource</_description>
+ <_description>Horizontally aligned power source</_description>
</object>
<object name="Circuit - Vertical Powersource (European)">
- <_description>Vertically aligned powersource</_description>
+ <_description>Vertically aligned power source</_description>
</object>
<object name="Circuit - Lamp (European)">
<_description>Lamp</_description>
diff --git a/sheets/IsometricMap.sheet.in b/sheets/IsometricMap.sheet.in
index 7d2a643..29bc923 100644
--- a/sheets/IsometricMap.sheet.in
+++ b/sheets/IsometricMap.sheet.in
@@ -28,7 +28,7 @@
<object name="River"><_description>River</_description></object>
-<object name="Roof1"><_description>Roof1</_description></object>
+<object name="Roof1"><_description>Roof 1</_description></object>
<object name="Block1"><_description>Block 1, 2:4</_description></object>
<object name="Block2"><_description>Block 2, 2:8</_description></object>
<object name="Block3"><_description>Block 3, 4:4</_description></object>
diff --git a/sheets/Misc.sheet.in b/sheets/Misc.sheet.in
index 75e4cb9..00bd80c 100644
--- a/sheets/Misc.sheet.in
+++ b/sheets/Misc.sheet.in
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <!-- -*- xml -*- -->
<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns">
- <_name>Misc</_name>
+ <_name>Miscellaneous</_name>
<_description>Miscellaneous Shapes</_description>
<contents>
<object name="Misc - Tree">
@@ -13,10 +13,10 @@
<_description>File</_description>
</object>
<object name="Misc - expensible node">
- <_description>expensible node</_description>
+ <_description>expansible node</_description>
</object>
<object name="Misc - expended node">
- <_description>expended node</_description>
+ <_description>expanded node</_description>
</object>
<object name="Misc - Analog Clock">
<_description>Traditional clock</_description>
diff --git a/sheets/SISSI.sheet.in b/sheets/SISSI.sheet.in
index 35d555c..9879830 100644
--- a/sheets/SISSI.sheet.in
+++ b/sheets/SISSI.sheet.in
@@ -244,7 +244,7 @@
<icon>SISSI/onduleur_icon.png</icon>
</object>
<object name="SISSI - sissi_object" intdata="62">
- <_description>Airconditioner</_description>
+ <_description>Air conditioner</_description>
<icon>SISSI/aircooler_icon.png</icon>
</object>
<object name="SISSI - sissi_object" intdata="63">
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]