GNOME.org
 

[dia] Bug 612431 - Hyphenation fixes

commit 390779522f2bf89b3a7459747fb9b27c2443346a
Author: Philip Withnall <philip tecnocode co uk>
Date:   Wed Mar 10 12:56:12 2010 +0000

    Bug 612431 - Hyphenation fixes
    
    Signed-off-by: Hans Breuer <hans breuer org>

 app/app_procs.c                     |    4 ++--
 app/commands.c                      |    2 +-
 app/display.c                       |    2 +-
 app/interface.c                     |    2 +-
 app/plugin-manager.c                |    6 +++---
 app/preferences.c                   |    2 +-
 installer/win32/gennsh.c            |    2 +-
 objects/Jackson/domain.c            |    2 +-
 objects/SADT/box.c                  |    2 +-
 objects/SISSI/sissi_dialog.c        |    2 +-
 plug-ins/cairo/diacairo.c           |    2 +-
 plug-ins/libart/dialibart.c         |    2 +-
 plug-ins/libart/export_png.c        |    2 +-
 plug-ins/pgf/render_pgf.c           |    2 +-
 plug-ins/pixbuf/pixbuf.c            |    2 +-
 plug-ins/pstricks/render_pstricks.c |    2 +-
 plug-ins/shape/shape-export.c       |    2 +-
 sheets/Assorted.sheet.in            |   24 ++++++++++++------------
 sheets/Logic.sheet.in               |    2 +-
 19 files changed, 33 insertions(+), 33 deletions(-)
---
diff --git a/app/app_procs.c b/app/app_procs.c
index 5a00140..150cce7 100644
--- a/app/app_procs.c
+++ b/app/app_procs.c
@@ -621,7 +621,7 @@ _check_option_input_directory (const gchar    *option_name,
     return TRUE;
   }
   g_set_error (error, DIA_ERROR, DIA_ERROR_DIRECTORY,
-               _("Input-directory '%s' must exist!\n"), directory);
+               _("Input directory '%s' must exist!\n"), directory);
   g_free (directory);
   return FALSE;
 }
@@ -638,7 +638,7 @@ _check_option_output_directory (const gchar    *option_name,
     return TRUE;
   }
   g_set_error (error, DIA_ERROR, DIA_ERROR_DIRECTORY,
-               _("Output-directory '%s' must exist!\n"), directory);
+               _("Output directory '%s' must exist!\n"), directory);
   g_free (directory);
   return FALSE;
 }
diff --git a/app/commands.c b/app/commands.c
index b028f9c..5a8bf83 100644
--- a/app/commands.c
+++ b/app/commands.c
@@ -121,7 +121,7 @@ file_print_callback (GtkAction *_action)
     if (confirm_export_size (dia, GTK_WINDOW(ddisp->shell), CONFIRM_PRINT|CONFIRM_PAGES))
       gtk_action_activate (action);
   } else {
-    message_error (_("No print plug-in found!"));
+    message_error (_("No print plugin found!"));
   }
 }
 
diff --git a/app/display.c b/app/display.c
index 1886e89..baac6a8 100644
--- a/app/display.c
+++ b/app/display.c
@@ -1081,7 +1081,7 @@ new_aa_renderer (DDisplay *ddisp)
   }
   
   /* we really should not come here but instead disable the menu command earlier */
-  message_warning (_("No anti-aliased renderer found"));
+  message_warning (_("No antialiased renderer found"));
   /* fallback: built-in libart renderer */
   return new_gdk_renderer (ddisp); 
 }
diff --git a/app/interface.c b/app/interface.c
index 26d8c3b..68651e6 100644
--- a/app/interface.c
+++ b/app/interface.c
@@ -1493,7 +1493,7 @@ create_color_area (GtkWidget *parent)
   gtk_widget_set_tooltip_text (col_area, 
 			_("Foreground & background colors for new objects.  "
 			  "The small black and white squares reset colors.  "
-			  "The small arrows swap colors.  Double click to "
+			  "The small arrows swap colors.  Double-click to "
 			  "change colors."));
 
   gtk_widget_show (alignment);
diff --git a/app/plugin-manager.c b/app/plugin-manager.c
index 02141ed..b9d3326 100644
--- a/app/plugin-manager.c
+++ b/app/plugin-manager.c
@@ -88,7 +88,7 @@ toggle_loaded_callback (GtkCellRendererToggle *celltoggle,
       loaded = TRUE;
     }
   else
-    message_notice("Can't unload plug-in '%s'!", dia_plugin_get_name(info));
+    message_notice("Can't unload plugin '%s'!", dia_plugin_get_name(info));
   gtk_list_store_set (GTK_LIST_STORE (model), &iter, 
                       LOADED_COLUMN, loaded, -1);
 }
@@ -149,7 +149,7 @@ toggle_autoload_callback (GtkCellRendererToggle *celltoggle,
   if (   0 == strcmp(dia_plugin_get_name(info), "Standard")
       || 0 == strcmp(dia_plugin_get_name(info), "Internal"))
     message_notice("You don't want to inhibit loading\n"
-                   "of plug-in '%s'!", dia_plugin_get_name(info));
+                   "of plugin '%s'!", dia_plugin_get_name(info));
   else {
     dia_plugin_set_inhibit_load(info, load);
     gtk_list_store_set (GTK_LIST_STORE (model), &iter, 
@@ -197,7 +197,7 @@ get_plugin_manager(void)
 
   /* build up the user interface */
   dialog = gtk_dialog_new_with_buttons(
-		_("Plug-ins"),
+		_("Plugins"),
 		NULL, 0,
 		GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
 		NULL);
diff --git a/app/preferences.c b/app/preferences.c
index bce7579..9e2ce99 100644
--- a/app/preferences.c
+++ b/app/preferences.c
@@ -185,7 +185,7 @@ DiaPrefData prefs_data[] =
     &default_length_unit, UI_TAB, N_("Length unit:"), NULL, FALSE,
     _get_units_name_list, update_internal_prefs },
   { "fontsize_unit", PREF_CHOICE, PREF_OFFSET(fontsize_unit),
-    &default_fontsize_unit, UI_TAB, N_("Font-size unit:"), NULL, FALSE,
+    &default_fontsize_unit, UI_TAB, N_("Font size unit:"), NULL, FALSE,
     _get_units_name_list, update_internal_prefs },
   
   { NULL, PREF_NONE, 0, NULL, DIA_TAB, N_("New diagram:") },
diff --git a/installer/win32/gennsh.c b/installer/win32/gennsh.c
index 341f4e5..f246201 100644
--- a/installer/win32/gennsh.c
+++ b/installer/win32/gennsh.c
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
   printf("!define DIA_SECTION_DESCRIPTION \"%s\"\n", _("Core Dia files and dlls"));
 
   /* Installer message: Component name */
-  printf("!define PYTHON_SECTION_TITLE \"%s\"\n", _("Python plug-in"));
+  printf("!define PYTHON_SECTION_TITLE \"%s\"\n", _("Python plugin"));
 
   /* Installer message: Component description */
   printf("!define PYTHON_SECTION_DESCRIPTION \"%s\"\n", _("Support for the Python Scripting Language 2.3. Do not select this if Python is not installed."));
diff --git a/objects/Jackson/domain.c b/objects/Jackson/domain.c
index 6b89c4e..fe9572a 100644
--- a/objects/Jackson/domain.c
+++ b/objects/Jackson/domain.c
@@ -181,7 +181,7 @@ static PropDescription box_props[] = {
 
     { "domkind", PROP_TYPE_ENUM, PROP_FLAG_VISIBLE,
     N_("Domain Kind"),
-    N_("Optional kind which appears in the lower right corner of the Domain"),
+    N_("Optional kind which appears in the lower-right corner of the Domain"),
     prop_domain_kind_data},
 
 /* hidding style stuff
diff --git a/objects/SADT/box.c b/objects/SADT/box.c
index 082a611..ef602e0 100644
--- a/objects/SADT/box.c
+++ b/objects/SADT/box.c
@@ -147,7 +147,7 @@ static PropDescription box_props[] = {
   PROP_STD_FILL_COLOUR_OPTIONAL,
   { "id", PROP_TYPE_STRING, PROP_FLAG_VISIBLE|PROP_FLAG_DONT_MERGE,
     N_("Activity/Data identifier"),
-    N_("The identifier which appears in the lower right corner of the Box")},
+    N_("The identifier which appears in the lower-right corner of the Box")},
   { "cpl_north",PROP_TYPE_CONNPOINT_LINE, 0, NULL, NULL},
   { "cpl_west",PROP_TYPE_CONNPOINT_LINE, 0, NULL, NULL},
   { "cpl_south",PROP_TYPE_CONNPOINT_LINE, 0, NULL, NULL},
diff --git a/objects/SISSI/sissi_dialog.c b/objects/SISSI/sissi_dialog.c
index 4de457b..911cf0b 100644
--- a/objects/SISSI/sissi_dialog.c
+++ b/objects/SISSI/sissi_dialog.c
@@ -188,7 +188,7 @@ static SISSI_Property property_logiciel_data[] = {
 
 static SISSI_Property property_material_data[] = {
   { N_("HARDWARE"), "MAT",NULL},
-  { N_("Data-processing equipment (active)"), "MAT_ACT",NULL},
+  { N_("Data processing equipment (active)"), "MAT_ACT",NULL},
   { N_("Mobile equipment"), "MAT_ACT1",NULL},
   { N_("Fixed equipment"), "MAT_ACT2",NULL},
   { N_("Peripheral processing"), "MAT_ACT3",NULL},
diff --git a/plug-ins/cairo/diacairo.c b/plug-ins/cairo/diacairo.c
index 3b95f63..95cf8f3 100644
--- a/plug-ins/cairo/diacairo.c
+++ b/plug-ins/cairo/diacairo.c
@@ -493,7 +493,7 @@ PluginInitResult
 dia_plugin_init(PluginInfo *info)
 {
   if (!dia_plugin_info_init(info, "Cairo",
-                            _("Cairo based Rendering"),
+                            _("Cairo-based Rendering"),
                             _plugin_can_unload,
                             _plugin_unload))
     return DIA_PLUGIN_INIT_ERROR;
diff --git a/plug-ins/libart/dialibart.c b/plug-ins/libart/dialibart.c
index 381184d..51ab980 100644
--- a/plug-ins/libart/dialibart.c
+++ b/plug-ins/libart/dialibart.c
@@ -56,7 +56,7 @@ PluginInitResult
 dia_plugin_init(PluginInfo *info)
 {
   if (!dia_plugin_info_init(info, "Libart",
-                            _("Libart based rendering"),
+                            _("Libart-based rendering"),
                             _plugin_can_unload,
                             _plugin_unload))
     return DIA_PLUGIN_INIT_ERROR;
diff --git a/plug-ins/libart/export_png.c b/plug-ins/libart/export_png.c
index 2dc5619..385e6b1 100644
--- a/plug-ins/libart/export_png.c
+++ b/plug-ins/libart/export_png.c
@@ -379,7 +379,7 @@ export_png(DiagramData *data, const gchar *filename,
 
 static const gchar *extensions[] = { "png", NULL };
 DiaExportFilter png_export_filter = {
-  N_("PNG (anti-aliased)"),
+  N_("PNG (antialiased)"),
   extensions,
   export_png,
   NULL,
diff --git a/plug-ins/pgf/render_pgf.c b/plug-ins/pgf/render_pgf.c
index 81a8d75..bd7491b 100644
--- a/plug-ins/pgf/render_pgf.c
+++ b/plug-ins/pgf/render_pgf.c
@@ -1109,7 +1109,7 @@ tex_escape_string(const gchar *src)
     gchar *p;
 
     if (!g_utf8_validate(src, -1, NULL)) {
-	message_error(_("Not valid UTF8"));
+	message_error(_("Not valid UTF-8"));
 	return g_strdup(src);
     }
 
diff --git a/plug-ins/pixbuf/pixbuf.c b/plug-ins/pixbuf/pixbuf.c
index 2facdd3..c6052c8 100644
--- a/plug-ins/pixbuf/pixbuf.c
+++ b/plug-ins/pixbuf/pixbuf.c
@@ -196,7 +196,7 @@ dia_plugin_init(PluginInfo *info)
    */
   if (gdk_display_get_default ()) {
     if (!dia_plugin_info_init(info, "Pixbuf",
-			      _("gdk-pixbuf based bitmap export/import"),
+			      _("gdk-pixbuf-based bitmap export/import"),
 			      _plugin_can_unload,
                               _plugin_unload))
       return DIA_PLUGIN_INIT_ERROR;
diff --git a/plug-ins/pstricks/render_pstricks.c b/plug-ins/pstricks/render_pstricks.c
index cd9f2a4..dd601e8 100644
--- a/plug-ins/pstricks/render_pstricks.c
+++ b/plug-ins/pstricks/render_pstricks.c
@@ -730,7 +730,7 @@ tex_escape_string(const gchar *src)
     gchar *p;
 
     if (!g_utf8_validate(src, -1, NULL)) {
-	message_error(_("Not valid UTF8"));
+	message_error(_("Not valid UTF-8"));
 	return g_strdup(src);
     }
 
diff --git a/plug-ins/shape/shape-export.c b/plug-ins/shape/shape-export.c
index bbd507b..3105066 100644
--- a/plug-ins/shape/shape-export.c
+++ b/plug-ins/shape/shape-export.c
@@ -485,7 +485,7 @@ export_shape(DiagramData *data, const gchar *filename,
       exportfilter = filter_guess_export_filter(png_filename);
 
     if (!exportfilter) {
-      message_warning(_("Can't export png icon without export plug-in!"));
+      message_warning(_("Can't export PNG icon without export plugin!"));
     } else {
       /* get the scaling right */
       old_scaling = data->paper.scaling;
diff --git a/sheets/Assorted.sheet.in b/sheets/Assorted.sheet.in
index 9dc7842..1cb817a 100644
--- a/sheets/Assorted.sheet.in
+++ b/sheets/Assorted.sheet.in
@@ -32,10 +32,10 @@ have been included to save users the effort of flipping them
 
 <object name="Geometric - Diamond"><_description>Diamond</_description></object> 
 <!-- Other Polygons -->
-<object name="Geometric - Pentagon"><_description>Pentagon.  Five sided shape</_description></object>
-<object name="Geometric - Hexagon"><_description>Hexagon.  Six sided shape</_description></object>
-<object name="Geometric - Heptagon"><_description>Heptagon.  Seven sided shape</_description></object>
-<object name="Geometric - Octogon"><_description>Octogon.  Eight sided shape</_description></object>
+<object name="Geometric - Pentagon"><_description>Pentagon.  Five-point shape</_description></object>
+<object name="Geometric - Hexagon"><_description>Hexagon.  Six-point shape</_description></object>
+<object name="Geometric - Heptagon"><_description>Heptagon.  Seven-point shape</_description></object>
+<object name="Geometric - Octogon"><_description>Octogon.  Eight-point shape</_description></object>
 <!-- Alan Horkan was here 2002 -->
 <object name="Geometric - Horizontal Parallelogram"><_description>Horizontal parallelogram</_description></object>
 <object name="Geometric - Vertical Parallelogram"><_description>Vertical parallelogram</_description></object>
@@ -43,14 +43,14 @@ have been included to save users the effort of flipping them
 <!-- Description, like a cut off Isoceles Triangle, quadrangle with two parallel sides ... -->
 
 <!-- Stars.  Odd numbered sides were particulary hard to draw.  -->
-<object name="Geometric - Four Point Star"><_description>Four point star</_description></object>
-<object name="Geometric - Curved Four Point Star"><_description>Curved four point star</_description></object>
-<object name="Geometric - Five Point Star"><_description>Five point star</_description></object>
-<object name="Geometric - Six Point Star"><_description>Six point star</_description></object>
-<object name="Geometric - Seven Point Star"><_description>Seven point star</_description></object>
-<object name="Geometric - Eight Point Star"><_description>Eight point star</_description></object>
-<object name="Geometric - Sharp Eight Point Star"><_description>Sharp eight point star</_description></object>
-<object name="Geometric - Curved Eight Point Star"><_description>Curved eight point star</_description></object>
+<object name="Geometric - Four Point Star"><_description>Four-point star</_description></object>
+<object name="Geometric - Curved Four Point Star"><_description>Curved four-point star</_description></object>
+<object name="Geometric - Five Point Star"><_description>Five-point star</_description></object>
+<object name="Geometric - Six Point Star"><_description>Six-point star</_description></object>
+<object name="Geometric - Seven Point Star"><_description>Seven-point star</_description></object>
+<object name="Geometric - Eight Point Star"><_description>Eight-point star</_description></object>
+<object name="Geometric - Sharp Eight Point Star"><_description>Sharp eight-point star</_description></object>
+<object name="Geometric - Curved Eight Point Star"><_description>Curved eight-point star</_description></object>
 <!-- TODO: 16 Point Star? 24,32?  9,11,13?  -->
 
 <!-- Crosses -->
diff --git a/sheets/Logic.sheet.in b/sheets/Logic.sheet.in
index 7ea4b06..ead33dc 100644
--- a/sheets/Logic.sheet.in
+++ b/sheets/Logic.sheet.in
@@ -28,7 +28,7 @@
       <_description>NOT</_description>
     </object>
     <object name="Logic - Connector">
-      <_description>Crossconnector</_description>
+      <_description>Cross-connector</_description>
     </object>
   </contents>
 </sheet>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]