[gnumeric] Translation: mark gobject property strings with P_(...)



commit 3da701ab3bcd0e3a372c89f44272233220bf5924
Author: Morten Welinder <terra gnome org>
Date:   Mon May 13 15:43:07 2013 -0400

    Translation: mark gobject property strings with P_(...)
    
    That way we don't ask translators to deal with them.  We aren't going to
    show them, so there is no point in confusing translators and giving them
    extra work.

 ChangeLog                                   |    4 +
 NEWS                                        |    1 +
 src/application.c                           |    7 +-
 src/gnm-data-cache-source.c                 |   18 ++-
 src/io-context-gtk.c                        |   11 +-
 src/item-bar.c                              |   20 ++--
 src/item-cursor.c                           |   34 +++--
 src/item-edit.c                             |   19 ++--
 src/item-grid.c                             |   16 ++-
 src/search.c                                |   58 ++++----
 src/sheet-object-image.c                    |   12 +-
 src/sheet.c                                 |  209 +++++++++++++++------------
 src/stf-export.c                            |   18 ++--
 src/tools/gnm-solver.c                      |   73 ++++++----
 src/wbc-gtk.c                               |   10 +-
 src/widgets/gnumeric-cell-renderer-toggle.c |    5 +-
 src/widgets/gnumeric-expr-entry.c           |   26 ++--
 src/widgets/gnumeric-text-view.c            |   21 ++--
 src/workbook-control.c                      |    6 +-
 src/workbook-view.c                         |   59 ++++----
 src/workbook.c                              |    7 +-
 21 files changed, 351 insertions(+), 283 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 52caa95..df77836 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-13  Morten Welinder  <terra gnome org>
+
+       * src/*.c: Mark gobject property strings as P_(...).
+
 2013-05-08  Andreas J. Guelzow <aguelzow pyrshep ca>
 
        * src/commands.c (cmd_merge_data_redo): unref merge_contents
diff --git a/NEWS b/NEWS
index 0103b16..17e2fa4 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,7 @@ Morten:
        * Add MPSEUDOINVERSE function.
        * Add ctrl-shift-z as extra accelerator for redo.  [#699579]
        * Fix conditional format problem.  [#699647]
+       * Remove gobject property strings from translation corpus.
 
 --------------------------------------------------------------------------
 Gnumeric 1.12.2
diff --git a/src/application.c b/src/application.c
index b11a5be..3feb684 100644
--- a/src/application.c
+++ b/src/application.c
@@ -29,7 +29,7 @@
 #include <gnumeric-conf.h>
 #include <goffice/goffice.h>
 #include <gsf/gsf-impl-utils.h>
-#include <glib/gi18n-lib.h>
+#include "gnm-i18n.h"
 #include <gtk/gtk.h>
 
 #define GNM_APP(o)             (G_TYPE_CHECK_INSTANCE_CAST((o), GNM_APP_TYPE, GnmApp))
@@ -1323,8 +1323,9 @@ gnm_app_class_init (GObjectClass *gobject_klass)
        gobject_klass->finalize = gnumeric_application_finalize;
        gobject_klass->get_property = gnumeric_application_get_property;
        g_object_class_install_property (gobject_klass, APPLICATION_PROP_FILE_HISTORY_LIST,
-               g_param_spec_pointer ("file-history-list", _("File History List"),
-                                     _("A list of filenames that have been read recently"),
+               g_param_spec_pointer ("file-history-list",
+                                     P_("File History List"),
+                                     P_("A list of filenames that have been read recently"),
                                      GSF_PARAM_STATIC | G_PARAM_READABLE));
 
        signals[WORKBOOK_ADDED] = g_signal_new ("workbook_added",
diff --git a/src/gnm-data-cache-source.c b/src/gnm-data-cache-source.c
index dd9bcb7..42c1402 100644
--- a/src/gnm-data-cache-source.c
+++ b/src/gnm-data-cache-source.c
@@ -32,7 +32,7 @@
 #include <expr-name.h>
 
 #include <gsf/gsf-impl-utils.h>
-#include <glib/gi18n-lib.h>
+#include "gnm-i18n.h"
 #include <string.h>
 
 struct _GnmDataCacheSource {
@@ -157,16 +157,20 @@ gnm_data_cache_source_class_init (GnmDataCacheSourceClass *klass)
        gobject_class->finalize         = gnm_data_cache_source_finalize;
 
        g_object_class_install_property (gobject_class, PROP_SHEET,
-                g_param_spec_object ("src-sheet", "sheet",
-                       "The source sheet.",
+                g_param_spec_object ("src-sheet",
+                                     P_("Sheet"),
+                                     P_("The source sheet"),
                        GNM_SHEET_TYPE, GSF_PARAM_STATIC | G_PARAM_READWRITE));
        g_object_class_install_property (gobject_class, PROP_RANGE,
-                g_param_spec_boxed ("src-range", "range",
-                       "Optional named expression to generate a source range.",
+                g_param_spec_boxed ("src-range",
+                                    P_("Range"),
+                                    P_("Optional named expression to generate a source range"),
                        gnm_range_get_type (), GSF_PARAM_STATIC | G_PARAM_READWRITE));
        g_object_class_install_property (gobject_class, PROP_NAME,
-                g_param_spec_string ("src-name", "src-name",
-                       "Optional named expression to generate a source range.", NULL,
+                g_param_spec_string ("src-name",
+                                     P_("source-name"),
+                                     P_("Optional named expression to generate a source range"),
+                                     NULL,
                        GSF_PARAM_STATIC | G_PARAM_READWRITE));
 
        parent_klass = g_type_class_peek_parent (klass);
diff --git a/src/io-context-gtk.c b/src/io-context-gtk.c
index 51c8e25..325825a 100644
--- a/src/io-context-gtk.c
+++ b/src/io-context-gtk.c
@@ -18,6 +18,7 @@
 #include "application.h"
 #include "libgnumeric.h"
 #include "dialogs.h"
+#include "gnm-i18n.h"
 
 #include <gsf/gsf-impl-utils.h>
 #include <gtk/gtk.h>
@@ -376,13 +377,15 @@ icg_class_init (GObjectClass *gobj_klass)
        gobj_klass->set_property   = icg_set_property;
 
         g_object_class_install_property (gobj_klass, PROP_SHOW_SPLASH,
-                g_param_spec_boolean ("show-splash", "show-splash",
-                                      "Show a splash screen if loading takes more than a moment.",
+                g_param_spec_boolean ("show-splash",
+                                      P_("Show splash"),
+                                      P_("Show a splash screen if loading takes more than a moment"),
                                       TRUE,
                                       GSF_PARAM_STATIC | G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
         g_object_class_install_property (gobj_klass, PROP_SHOW_WARNINGS,
-                g_param_spec_boolean ("show-warnings", "show-warnings",
-                                      "Show warning and password dialogs.",
+                g_param_spec_boolean ("show-warnings",
+                                      P_("Show warnings"),
+                                      P_("Show warning and password dialogs"),
                                       TRUE,
                                       GSF_PARAM_STATIC | G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
 
diff --git a/src/item-bar.c b/src/item-bar.c
index 956d91e..64570c8 100644
--- a/src/item-bar.c
+++ b/src/item-bar.c
@@ -8,7 +8,7 @@
  */
 
 #include <gnumeric-config.h>
-#include <glib/gi18n-lib.h>
+#include "gnm-i18n.h"
 #include "gnumeric.h"
 #include "item-bar.h"
 #include "gnm-pane-impl.h"
@@ -1163,15 +1163,17 @@ gnm_item_bar_class_init (GObjectClass  *gobject_klass)
        gobject_klass->dispose = item_bar_dispose;
        gobject_klass->set_property = item_bar_set_property;
        g_object_class_install_property (gobject_klass, GNM_ITEM_BAR_PROP_PANE,
-               g_param_spec_object ("pane", "pane",
-                       "The pane containing the associated grid",
-                       GNM_PANE_TYPE,
-                       GSF_PARAM_STATIC | G_PARAM_WRITABLE));
+               g_param_spec_object ("pane",
+                                    P_("Pane"),
+                                    P_("The pane containing the associated grid"),
+                                    GNM_PANE_TYPE,
+                                    GSF_PARAM_STATIC | G_PARAM_WRITABLE));
        g_object_class_install_property (gobject_klass, GNM_ITEM_BAR_PROP_IS_COL_HEADER,
-               g_param_spec_boolean ("IsColHeader", "IsColHeader",
-                       "Is the item-bar a header for columns or rows",
-                       FALSE,
-                       GSF_PARAM_STATIC | G_PARAM_WRITABLE));
+               g_param_spec_boolean ("IsColHeader",
+                                     P_("IsColHeader"),
+                                     P_("Is the item-bar a header for columns or rows"),
+                                     FALSE,
+                                     GSF_PARAM_STATIC | G_PARAM_WRITABLE));
 
        item_klass->realize     = item_bar_realize;
        item_klass->unrealize   = item_bar_unrealize;
diff --git a/src/item-cursor.c b/src/item-cursor.c
index 208be1e..d8e78cb 100644
--- a/src/item-cursor.c
+++ b/src/item-cursor.c
@@ -8,7 +8,7 @@
  */
 
 #include <gnumeric-config.h>
-#include <glib/gi18n-lib.h>
+#include "gnm-i18n.h"
 #include "gnumeric.h"
 #include "item-cursor.h"
 #include "gnm-pane-impl.h"
@@ -1452,23 +1452,27 @@ gnm_item_cursor_class_init (GObjectClass *gobject_klass)
        gobject_klass->set_property = item_cursor_set_property;
        gobject_klass->dispose = item_cursor_dispose;
        g_object_class_install_property (gobject_klass, ITEM_CURSOR_PROP_SHEET_CONTROL_GUI,
-               g_param_spec_object ("SheetControlGUI", "SheetControlGUI",
-                       "the sheet control gui controlling the item",
-                       SHEET_CONTROL_GUI_TYPE,
-                       GSF_PARAM_STATIC | G_PARAM_WRITABLE));
+               g_param_spec_object ("SheetControlGUI",
+                                    P_("SheetControlGUI"),
+                                    P_("The sheet control gui controlling the item"),
+                                    SHEET_CONTROL_GUI_TYPE,
+                                    GSF_PARAM_STATIC | G_PARAM_WRITABLE));
        g_object_class_install_property (gobject_klass, ITEM_CURSOR_PROP_STYLE,
-               g_param_spec_int ("style", "Style",
-                       "What type of cursor",
-                       0, G_MAXINT, 0,
-                       GSF_PARAM_STATIC | G_PARAM_WRITABLE));
+               g_param_spec_int ("style",
+                                 P_("Style"),
+                                 P_("What type of cursor"),
+                                 0, G_MAXINT, 0,
+                                 GSF_PARAM_STATIC | G_PARAM_WRITABLE));
        g_object_class_install_property (gobject_klass, ITEM_CURSOR_PROP_BUTTON,
-               g_param_spec_int ("button", "Button",
-                       "what button initiated the drag",
-                       0, G_MAXINT, 0,
-                        GSF_PARAM_STATIC | G_PARAM_WRITABLE));
+               g_param_spec_int ("button",
+                                 P_("Button"),
+                                 P_("What button initiated the drag"),
+                                 0, G_MAXINT, 0,
+                                 GSF_PARAM_STATIC | G_PARAM_WRITABLE));
        g_object_class_install_property (gobject_klass, ITEM_CURSOR_PROP_COLOR,
-               g_param_spec_uint ("color", "Color",
-                                  "Name of the cursor's color",
+               g_param_spec_uint ("color",
+                                  P_("Color"),
+                                  P_("Name of the cursor's color"),
                                   0, 0xffffffff, 
                                   GO_COLOR_BLACK,
                                   GSF_PARAM_STATIC | G_PARAM_WRITABLE));
diff --git a/src/item-edit.c b/src/item-edit.c
index 58c6e30..fe006c2 100644
--- a/src/item-edit.c
+++ b/src/item-edit.c
@@ -12,7 +12,7 @@
  *     ranges are highlighted on the spreadsheet).
  */
 #include <gnumeric-config.h>
-#include <glib/gi18n-lib.h>
+#include "gnm-i18n.h"
 #include "gnumeric.h"
 #include "item-edit.h"
 #include "gnm-pane-impl.h"
@@ -728,14 +728,15 @@ gnm_item_edit_class_init (GObjectClass *gobject_class)
        gobject_class->set_property = item_edit_set_property;
 
        g_object_class_install_property (gobject_class, ARG_SHEET_CONTROL_GUI,
-               g_param_spec_object ("SheetControlGUI", "SheetControlGUI",
-                       "the sheet control gui controlling the item",
-                       SHEET_CONTROL_GUI_TYPE,
-                       /* resist the urge to use G_PARAM_CONSTRUCT_ONLY
-                        * We are going through goc_item_new, which
-                        * calls g_object_new assigns the parent pointer before
-                        * setting the construction parameters */
-                        GSF_PARAM_STATIC | G_PARAM_WRITABLE));
+               g_param_spec_object ("SheetControlGUI",
+                                    P_("SheetControlGUI"),
+                                    P_("The sheet control gui controlling the item"),
+                                    SHEET_CONTROL_GUI_TYPE,
+                                    /* resist the urge to use G_PARAM_CONSTRUCT_ONLY
+                                     * We are going through goc_item_new, which
+                                     * calls g_object_new assigns the parent pointer before
+                                     * setting the construction parameters */
+                                    GSF_PARAM_STATIC | G_PARAM_WRITABLE));
 
        /* GocItem method overrides */
        item_class->realize         = item_edit_realize;
diff --git a/src/item-grid.c b/src/item-grid.c
index d6c8b4e..a4e51b5 100644
--- a/src/item-grid.c
+++ b/src/item-grid.c
@@ -1244,14 +1244,16 @@ gnm_item_grid_class_init (GObjectClass *gobject_klass)
        gobject_klass->finalize     = item_grid_finalize;
        gobject_klass->set_property = item_grid_set_property;
        g_object_class_install_property (gobject_klass, GNM_ITEM_GRID_PROP_SHEET_CONTROL_GUI,
-               g_param_spec_object ("SheetControlGUI", "SheetControlGUI",
-                       "the sheet control gui controlling the item",
-                       SHEET_CONTROL_GUI_TYPE,
-                        GSF_PARAM_STATIC | G_PARAM_WRITABLE));
+               g_param_spec_object ("SheetControlGUI",
+                                    P_("SheetControlGUI"),
+                                    P_("The sheet control gui controlling the item"),
+                                    SHEET_CONTROL_GUI_TYPE,
+                                    GSF_PARAM_STATIC | G_PARAM_WRITABLE));
        g_object_class_install_property (gobject_klass, GNM_ITEM_GRID_PROP_BOUND,
-               g_param_spec_pointer ("bound", "Bound",
-                       "The display bounds",
-                       GSF_PARAM_STATIC | G_PARAM_WRITABLE));
+               g_param_spec_pointer ("bound",
+                                     P_("Bound"),
+                                     P_("The display bounds"),
+                                     GSF_PARAM_STATIC | G_PARAM_WRITABLE));
 
        item_klass->realize     = item_grid_realize;
        item_klass->unrealize     = item_grid_unrealize;
diff --git a/src/search.c b/src/search.c
index e1acf05..05dd7c7 100644
--- a/src/search.c
+++ b/src/search.c
@@ -5,7 +5,7 @@
  */
 
 #include <gnumeric-config.h>
-#include <glib/gi18n-lib.h>
+#include "gnm-i18n.h"
 #include "gnumeric.h"
 #include "search.h"
 
@@ -705,8 +705,8 @@ gnm_search_replace_class_init (GObjectClass *gobject_class)
                (gobject_class,
                 PROP_IS_NUMBER,
                 g_param_spec_boolean ("is-number",
-                                      _("Is Number"),
-                                      _("Search for Specific Number Regardless of Formatting?"),
+                                      P_("Is Number"),
+                                      P_("Search for Specific Number Regardless of Formatting?"),
                                       FALSE,
                                       GSF_PARAM_STATIC |
                                       G_PARAM_READWRITE));
@@ -714,8 +714,8 @@ gnm_search_replace_class_init (GObjectClass *gobject_class)
                (gobject_class,
                 PROP_SEARCH_STRINGS,
                 g_param_spec_boolean ("search-strings",
-                                      _("Search Strings"),
-                                      _("Should strings be searched?"),
+                                      P_("Search Strings"),
+                                      P_("Should strings be searched?"),
                                       FALSE,
                                       GSF_PARAM_STATIC |
                                       G_PARAM_READWRITE));
@@ -723,8 +723,8 @@ gnm_search_replace_class_init (GObjectClass *gobject_class)
                (gobject_class,
                 PROP_SEARCH_OTHER_VALUES,
                 g_param_spec_boolean ("search-other-values",
-                                      _("Search Other Values"),
-                                      _("Should non-strings be searched?"),
+                                      P_("Search Other Values"),
+                                      P_("Should non-strings be searched?"),
                                       FALSE,
                                       GSF_PARAM_STATIC |
                                       G_PARAM_READWRITE));
@@ -732,8 +732,8 @@ gnm_search_replace_class_init (GObjectClass *gobject_class)
                (gobject_class,
                 PROP_SEARCH_EXPRESSIONS,
                 g_param_spec_boolean ("search-expressions",
-                                      _("Search Expressions"),
-                                      _("Should expressions be searched?"),
+                                      P_("Search Expressions"),
+                                      P_("Should expressions be searched?"),
                                       FALSE,
                                       GSF_PARAM_STATIC |
                                       G_PARAM_READWRITE));
@@ -741,8 +741,8 @@ gnm_search_replace_class_init (GObjectClass *gobject_class)
                (gobject_class,
                 PROP_SEARCH_EXPRESSION_RESULTS,
                 g_param_spec_boolean ("search-expression-results",
-                                      _("Search Expression Results"),
-                                      _("Should the results of expressions be searched?"),
+                                      P_("Search Expression Results"),
+                                      P_("Should the results of expressions be searched?"),
                                       FALSE,
                                       GSF_PARAM_STATIC |
                                       G_PARAM_READWRITE));
@@ -750,8 +750,8 @@ gnm_search_replace_class_init (GObjectClass *gobject_class)
                (gobject_class,
                 PROP_SEARCH_COMMENTS,
                 g_param_spec_boolean ("search-comments",
-                                      _("Search Comments"),
-                                      _("Should cell comments be searched?"),
+                                      P_("Search Comments"),
+                                      P_("Should cell comments be searched?"),
                                       FALSE,
                                       GSF_PARAM_STATIC |
                                       G_PARAM_READWRITE));
@@ -759,8 +759,8 @@ gnm_search_replace_class_init (GObjectClass *gobject_class)
                (gobject_class,
                 PROP_SEARCH_SCRIPTS,
                 g_param_spec_boolean ("search-scripts",
-                                      _("Search Scripts"),
-                                      _("Should scrips (workbook, and worksheet) be searched?"),
+                                      P_("Search Scripts"),
+                                      P_("Should scrips (workbook, and worksheet) be searched?"),
                                       FALSE,
                                       GSF_PARAM_STATIC |
                                       G_PARAM_READWRITE));
@@ -768,8 +768,8 @@ gnm_search_replace_class_init (GObjectClass *gobject_class)
                (gobject_class,
                 PROP_INVERT,
                 g_param_spec_boolean ("invert",
-                                      _("Invert"),
-                                      _("Collect non-matching items"),
+                                      P_("Invert"),
+                                      P_("Collect non-matching items"),
                                       FALSE,
                                       GSF_PARAM_STATIC |
                                       G_PARAM_READWRITE));
@@ -777,8 +777,8 @@ gnm_search_replace_class_init (GObjectClass *gobject_class)
                (gobject_class,
                 PROP_BY_ROW,
                 g_param_spec_boolean ("by-row",
-                                      _("By Row"),
-                                      _("Is the search order by row?"),
+                                      P_("By Row"),
+                                      P_("Is the search order by row?"),
                                       FALSE,
                                       GSF_PARAM_STATIC |
                                       G_PARAM_READWRITE));
@@ -786,8 +786,8 @@ gnm_search_replace_class_init (GObjectClass *gobject_class)
                (gobject_class,
                 PROP_QUERY,
                 g_param_spec_boolean ("query",
-                                      _("Query"),
-                                      _("Should we query for each replacement?"),
+                                      P_("Query"),
+                                      P_("Should we query for each replacement?"),
                                       FALSE,
                                       GSF_PARAM_STATIC |
                                       G_PARAM_READWRITE));
@@ -795,8 +795,8 @@ gnm_search_replace_class_init (GObjectClass *gobject_class)
                (gobject_class,
                 PROP_REPLACE_KEEP_STRINGS,
                 g_param_spec_boolean ("replace-keep-strings",
-                                      _("Keep Strings"),
-                                      _("Should replacement keep strings as strings?"),
+                                      P_("Keep Strings"),
+                                      P_("Should replacement keep strings as strings?"),
                                       FALSE,
                                       GSF_PARAM_STATIC |
                                       G_PARAM_READWRITE));
@@ -804,8 +804,8 @@ gnm_search_replace_class_init (GObjectClass *gobject_class)
                (gobject_class,
                 PROP_SHEET,
                 g_param_spec_object ("sheet",
-                                     _("Sheet"),
-                                     _("The sheet in which to search."),
+                                     P_("Sheet"),
+                                     P_("The sheet in which to search."),
                                      GNM_SHEET_TYPE,
                                      GSF_PARAM_STATIC |
                                      G_PARAM_READWRITE));
@@ -813,8 +813,8 @@ gnm_search_replace_class_init (GObjectClass *gobject_class)
                (gobject_class,
                 PROP_SCOPE,
                 g_param_spec_enum ("scope",
-                                   _("Scope"),
-                                   _("Where to search."),
+                                   P_("Scope"),
+                                   P_("Where to search."),
                                    GNM_SEARCH_REPLACE_SCOPE_TYPE,
                                    GNM_SRS_SHEET,
                                    GSF_PARAM_STATIC |
@@ -823,8 +823,8 @@ gnm_search_replace_class_init (GObjectClass *gobject_class)
                (gobject_class,
                 PROP_RANGE_TEXT,
                 g_param_spec_string ("range-text",
-                                     _("Range as Text"),
-                                     _("The range in which to search."),
+                                     P_("Range as Text"),
+                                     P_("The range in which to search."),
                                      NULL,
                                      GSF_PARAM_STATIC |
                                      G_PARAM_READWRITE));
diff --git a/src/sheet-object-image.c b/src/sheet-object-image.c
index 7002420..4bb8a73 100644
--- a/src/sheet-object-image.c
+++ b/src/sheet-object-image.c
@@ -7,7 +7,7 @@
  *     Jody Goldberg (jody gnome org)
  */
 #include <gnumeric-config.h>
-#include <glib/gi18n-lib.h>
+#include "gnm-i18n.h"
 #include "gnumeric.h"
 #include "sheet-object-image.h"
 #include "sheet.h"
@@ -620,13 +620,15 @@ gnm_soi_class_init (GObjectClass *object_class)
 
        /* The property strings don't need translation */
        g_object_class_install_property (object_class, PROP_IMAGE_TYPE,
-                g_param_spec_string ("image-type", "Image type",
-                                     "Type of image",
+                g_param_spec_string ("image-type",
+                                     P_("Image type"),
+                                     P_("Type of image"),
                                      NULL,
                                      GSF_PARAM_STATIC | G_PARAM_READABLE));
        g_object_class_install_property (object_class, PROP_IMAGE_DATA,
-                g_param_spec_pointer ("image-data", "Image data",
-                                      "Image data",
+                g_param_spec_pointer ("image-data",
+                                      P_("Image data"),
+                                      P_("Image data"),
                                       GSF_PARAM_STATIC | G_PARAM_READABLE));
        g_object_class_install_property (object_class, PROP_PIXBUF,
                 g_param_spec_object ("pixbuf", "Pixbuf",
diff --git a/src/sheet.c b/src/sheet.c
index 52291d2..db24258 100644
--- a/src/sheet.c
+++ b/src/sheet.c
@@ -68,7 +68,7 @@
 #include "gutils.h"
 #include <goffice/goffice.h>
 
-#include <glib/gi18n-lib.h>
+#include "gnm-i18n.h"
 #include <gsf/gsf-impl-utils.h>
 #include <stdlib.h>
 #include <string.h>
@@ -858,8 +858,9 @@ gnm_sheet_class_init (GObjectClass *gobject_class)
        gobject_class->constructed      = gnm_sheet_constructed;
 
         g_object_class_install_property (gobject_class, PROP_SHEET_TYPE,
-                g_param_spec_enum ("sheet-type", _("Sheet Type"),
-                                   _("Which type of sheet this is."),
+                g_param_spec_enum ("sheet-type",
+                                   P_("Sheet Type"),
+                                   P_("Which type of sheet this is."),
                                    GNM_SHEET_TYPE_TYPE,
                                    GNM_SHEET_DATA,
                                    GSF_PARAM_STATIC |
@@ -867,34 +868,38 @@ gnm_sheet_class_init (GObjectClass *gobject_class)
                                    G_PARAM_CONSTRUCT_ONLY));
        g_object_class_install_property (gobject_class, PROP_WORKBOOK,
                g_param_spec_object ("workbook",
-                                    _("Parent workbook"),
-                                    _("The workbook in which this sheet lives"),
+                                    P_("Parent workbook"),
+                                    P_("The workbook in which this sheet lives"),
                                     WORKBOOK_TYPE,
                                     GSF_PARAM_STATIC |
                                     G_PARAM_READWRITE |
                                     G_PARAM_CONSTRUCT_ONLY));
         g_object_class_install_property (gobject_class, PROP_NAME,
-                g_param_spec_string ("name", _("Name"),
-                                     _("The name of the sheet."),
+                g_param_spec_string ("name",
+                                     P_("Name"),
+                                     P_("The name of the sheet."),
                                      NULL,
                                      GSF_PARAM_STATIC |
                                      G_PARAM_READWRITE));
         g_object_class_install_property (gobject_class, PROP_RTL,
-                g_param_spec_boolean ("text-is-rtl", _("text-is-rtl"),
-                                      _("Text goes from right to left."),
+                g_param_spec_boolean ("text-is-rtl",
+                                      P_("text-is-rtl"),
+                                      P_("Text goes from right to left."),
                                       FALSE,
                                       GSF_PARAM_STATIC |
                                       G_PARAM_READWRITE));
         g_object_class_install_property (gobject_class, PROP_VISIBILITY,
-                g_param_spec_enum ("visibility", _("Visibility"),
-                                   _("How visible the sheet is."),
+                g_param_spec_enum ("visibility",
+                                   P_("Visibility"),
+                                   P_("How visible the sheet is."),
                                    GNM_SHEET_VISIBILITY_TYPE,
                                    GNM_SHEET_VISIBILITY_VISIBLE,
                                    GSF_PARAM_STATIC |
                                    G_PARAM_READWRITE));
        g_object_class_install_property (gobject_class, PROP_DISPLAY_FORMULAS,
-                g_param_spec_boolean ("display-formulas", _("Display Formul\303\246"),
-                                      _("Control whether formul\303\246 are shown instead of values."),
+                g_param_spec_boolean ("display-formulas",
+                                      P_("Display Formul\303\246"),
+                                      P_("Control whether formul\303\246 are shown instead of values."),
                                       FALSE,
                                       GSF_PARAM_STATIC |
                                       G_PARAM_READWRITE));
@@ -911,149 +916,175 @@ gnm_sheet_class_init (GObjectClass *gobject_class)
                                       GSF_PARAM_STATIC |
                                       G_PARAM_READWRITE));
        g_object_class_install_property (gobject_class, PROP_DISPLAY_COLUMN_HEADER,
-                g_param_spec_boolean ("display-column-header", _("Display Column Headers"),
-                                      _("Control whether column headers are shown."),
+                g_param_spec_boolean ("display-column-header",
+                                      P_("Display Column Headers"),
+                                      P_("Control whether column headers are shown."),
                                       FALSE,
                                       GSF_PARAM_STATIC |
                                       G_PARAM_READWRITE));
        g_object_class_install_property (gobject_class, PROP_DISPLAY_ROW_HEADER,
-                g_param_spec_boolean ("display-row-header", _("Display Row Headers"),
-                                      _("Control whether row headers are shown."),
+                g_param_spec_boolean ("display-row-header",
+                                      P_("Display Row Headers"),
+                                      P_("Control whether row headers are shown."),
                                       FALSE,
                                       GSF_PARAM_STATIC |
                                       G_PARAM_READWRITE));
        g_object_class_install_property (gobject_class, PROP_DISPLAY_OUTLINES,
-                g_param_spec_boolean ("display-outlines", _("Display Outlines"),
-                                      _("Control whether outlines are shown."),
+                g_param_spec_boolean ("display-outlines",
+                                      P_("Display Outlines"),
+                                      P_("Control whether outlines are shown."),
                                       TRUE,
                                       GSF_PARAM_STATIC |
                                       G_PARAM_READWRITE));
        g_object_class_install_property (gobject_class, PROP_DISPLAY_OUTLINES_BELOW,
-                g_param_spec_boolean ("display-outlines-below", _("Display Outlines Below"),
-                                      _("Control whether outline symbols are shown below."),
+                g_param_spec_boolean ("display-outlines-below",
+                                      P_("Display Outlines Below"),
+                                      P_("Control whether outline symbols are shown below."),
                                       TRUE,
                                       GSF_PARAM_STATIC |
                                       G_PARAM_READWRITE));
        g_object_class_install_property (gobject_class, PROP_DISPLAY_OUTLINES_RIGHT,
-                g_param_spec_boolean ("display-outlines-right", _("Display Outlines Right"),
-                                      _("Control whether outline symbols are shown to the right."),
+                g_param_spec_boolean ("display-outlines-right",
+                                      P_("Display Outlines Right"),
+                                      P_("Control whether outline symbols are shown to the right."),
                                       TRUE,
                                       GSF_PARAM_STATIC |
                                       G_PARAM_READWRITE));
 
         g_object_class_install_property (gobject_class, PROP_PROTECTED,
-                g_param_spec_boolean ("protected", _("Protected"),
-                                      _("Sheet is protected."),
+                g_param_spec_boolean ("protected",
+                                      P_("Protected"),
+                                      P_("Sheet is protected."),
                                       FALSE, GSF_PARAM_STATIC | G_PARAM_READWRITE));
        g_object_class_install_property (gobject_class, PROP_PROTECTED_ALLOW_EDIT_OBJECTS,
-               g_param_spec_boolean ("protected-allow-edit-objects", _("Protected Allow Edit objects"),
-                                     _("Allow objects to be edited while a sheet is protected"),
+               g_param_spec_boolean ("protected-allow-edit-objects",
+                                     P_("Protected Allow Edit objects"),
+                                     P_("Allow objects to be edited while a sheet is protected"),
                                      FALSE, GSF_PARAM_STATIC | G_PARAM_READWRITE));
        g_object_class_install_property (gobject_class, PROP_PROTECTED_ALLOW_EDIT_SCENARIOS,
-               g_param_spec_boolean ("protected-allow-edit-scenarios", _("Protected allow edit scenarios"),
-                                     _("Allow scenarios to be edited while a sheet is protected"),
+               g_param_spec_boolean ("protected-allow-edit-scenarios",
+                                     P_("Protected allow edit scenarios"),
+                                     P_("Allow scenarios to be edited while a sheet is protected"),
                                      FALSE, GSF_PARAM_STATIC | G_PARAM_READWRITE));
        g_object_class_install_property (gobject_class, PROP_PROTECTED_ALLOW_CELL_FORMATTING,
-               g_param_spec_boolean ("protected-allow-cell-formatting", _("Protected allow cell formatting"),
-                                     _("Allow cell format changes while a sheet is protected"),
+               g_param_spec_boolean ("protected-allow-cell-formatting",
+                                     P_("Protected allow cell formatting"),
+                                     P_("Allow cell format changes while a sheet is protected"),
                                      FALSE, GSF_PARAM_STATIC | G_PARAM_READWRITE));
        g_object_class_install_property (gobject_class, PROP_PROTECTED_ALLOW_COLUMN_FORMATTING,
-               g_param_spec_boolean ("protected-allow-column-formatting", _("Protected allow column 
formatting"),
-                                     _("Allow column formatting while a sheet is protected"),
+               g_param_spec_boolean ("protected-allow-column-formatting",
+                                     P_("Protected allow column formatting"),
+                                     P_("Allow column formatting while a sheet is protected"),
                                      FALSE, GSF_PARAM_STATIC | G_PARAM_READWRITE));
        g_object_class_install_property (gobject_class, PROP_PROTECTED_ALLOW_ROW_FORMATTING,
-               g_param_spec_boolean ("protected-allow-row-formatting", _("Protected allow row formatting"),
-                                     _("Allow row formatting while a sheet is protected"),
+               g_param_spec_boolean ("protected-allow-row-formatting",
+                                     P_("Protected allow row formatting"),
+                                     P_("Allow row formatting while a sheet is protected"),
                                      FALSE, GSF_PARAM_STATIC | G_PARAM_READWRITE));
        g_object_class_install_property (gobject_class, PROP_PROTECTED_ALLOW_INSERT_COLUMNS,
-               g_param_spec_boolean ("protected-allow-insert-columns", _("Protected allow insert columns"),
-                                     _("Allow columns to be inserted while a sheet is protected"),
+               g_param_spec_boolean ("protected-allow-insert-columns",
+                                     P_("Protected allow insert columns"),
+                                     P_("Allow columns to be inserted while a sheet is protected"),
                                      FALSE, GSF_PARAM_STATIC | G_PARAM_READWRITE));
        g_object_class_install_property (gobject_class, PROP_PROTECTED_ALLOW_INSERT_ROWS,
-               g_param_spec_boolean ("protected-allow-insert-rows", _("Protected allow insert rows"),
-                                     _("Allow rows to be inserted while a sheet is protected"),
+               g_param_spec_boolean ("protected-allow-insert-rows",
+                                     P_("Protected allow insert rows"),
+                                     P_("Allow rows to be inserted while a sheet is protected"),
                                      FALSE, GSF_PARAM_STATIC | G_PARAM_READWRITE));
        g_object_class_install_property (gobject_class, PROP_PROTECTED_ALLOW_INSERT_HYPERLINKS,
-               g_param_spec_boolean ("protected-allow-insert-hyperlinks", _("Protected allow insert 
hyperlinks"),
-                                     _("Allow hyperlinks to be inserted while a sheet is protected"),
+               g_param_spec_boolean ("protected-allow-insert-hyperlinks",
+                                     P_("Protected allow insert hyperlinks"),
+                                     P_("Allow hyperlinks to be inserted while a sheet is protected"),
                                      FALSE, GSF_PARAM_STATIC | G_PARAM_READWRITE));
        g_object_class_install_property (gobject_class, PROP_PROTECTED_ALLOW_DELETE_COLUMNS,
-               g_param_spec_boolean ("protected-allow-delete-columns", _("Protected allow delete columns"),
-                                     _("Allow columns to be deleted while a sheet is protected"),
+               g_param_spec_boolean ("protected-allow-delete-columns",
+                                     P_("Protected allow delete columns"),
+                                     P_("Allow columns to be deleted while a sheet is protected"),
                                      FALSE, GSF_PARAM_STATIC | G_PARAM_READWRITE));
        g_object_class_install_property (gobject_class, PROP_PROTECTED_ALLOW_DELETE_ROWS,
-               g_param_spec_boolean ("protected-allow-delete-rows", _("Protected allow delete rows"),
-                                     _("Allow rows to be deleted while a sheet is protected"),
+               g_param_spec_boolean ("protected-allow-delete-rows",
+                                     P_("Protected allow delete rows"),
+                                     P_("Allow rows to be deleted while a sheet is protected"),
                                      FALSE, GSF_PARAM_STATIC | G_PARAM_READWRITE));
        g_object_class_install_property (gobject_class, PROP_PROTECTED_ALLOW_SELECT_LOCKED_CELLS,
-               g_param_spec_boolean ("protected-allow-select-locked-cells", _("Protected allow select locked 
cells"),
-                                     _("Allow the user to select locked cells while a sheet is protected"),
+               g_param_spec_boolean ("protected-allow-select-locked-cells",
+                                     P_("Protected allow select locked cells"),
+                                     P_("Allow the user to select locked cells while a sheet is protected"),
                                      TRUE, GSF_PARAM_STATIC | G_PARAM_READWRITE));
        g_object_class_install_property (gobject_class, PROP_PROTECTED_ALLOW_SORT_RANGES,
-               g_param_spec_boolean ("protected-allow-sort-ranges", _("Protected allow sort ranges"),
-                                     _("Allow ranges to be sorted while a sheet is protected"),
+               g_param_spec_boolean ("protected-allow-sort-ranges",
+                                     P_("Protected allow sort ranges"),
+                                     P_("Allow ranges to be sorted while a sheet is protected"),
                                      FALSE, GSF_PARAM_STATIC | G_PARAM_READWRITE));
        g_object_class_install_property (gobject_class, PROP_PROTECTED_ALLOW_EDIT_AUTO_FILTERS,
-               g_param_spec_boolean ("protected-allow-edit-auto-filters", _("Protected allow edit auto 
filters"),
-                                     _("Allow auto filters to be edited while a sheet is protected"),
+               g_param_spec_boolean ("protected-allow-edit-auto-filters",
+                                     P_("Protected allow edit auto filters"),
+                                     P_("Allow auto filters to be edited while a sheet is protected"),
                                      FALSE, GSF_PARAM_STATIC | G_PARAM_READWRITE));
        g_object_class_install_property (gobject_class, PROP_PROTECTED_ALLOW_EDIT_PIVOTTABLE,
-               g_param_spec_boolean ("protected-allow-edit-pivottable", _("Protected allow edit pivottable"),
-                                     _("Allow pivottable to be edited while a sheet is protected"),
+               g_param_spec_boolean ("protected-allow-edit-pivottable",
+                                     P_("Protected allow edit pivottable"),
+                                     P_("Allow pivottable to be edited while a sheet is protected"),
                                      FALSE, GSF_PARAM_STATIC | G_PARAM_READWRITE));
        g_object_class_install_property (gobject_class, PROP_PROTECTED_ALLOW_SELECT_UNLOCKED_CELLS,
-               g_param_spec_boolean ("protected-allow-select-unlocked-cells", _("Protected allow select 
unlocked cells"),
-                                     _("Allow the user to select unlocked cells while a sheet is protected"),
+               g_param_spec_boolean ("protected-allow-select-unlocked-cells",
+                                     P_("Protected allow select unlocked cells"),
+                                     P_("Allow the user to select unlocked cells while a sheet is 
protected"),
                                      TRUE, GSF_PARAM_STATIC | G_PARAM_READWRITE));
 
        g_object_class_install_property (gobject_class, PROP_CONVENTIONS,
-                g_param_spec_pointer ("conventions", _("Display convention for expressions (default Gnumeric 
A1)"),
-                                      _("How to format displayed expressions, (A1 vs R1C1, function names, 
...)"),
-                                      GSF_PARAM_STATIC |
-                                      G_PARAM_READWRITE));
+               g_param_spec_pointer ("conventions",
+                                     P_("Display convention for expressions (default Gnumeric A1)"),
+                                     P_("How to format displayed expressions, (A1 vs R1C1, function names, 
...)"),
+                                     GSF_PARAM_STATIC |
+                                     G_PARAM_READWRITE));
        g_object_class_install_property (gobject_class, PROP_USE_R1C1, /* convenience wrapper to CONVENTIONS 
*/
-                g_param_spec_boolean ("use-r1c1", _("Display convention for expressions as XLS_R1C1 vs 
default"),
-                                      _("How to format displayed expressions, (a convenience api)"),
-                                      FALSE,
-                                      GSF_PARAM_STATIC |
-                                      G_PARAM_READWRITE));
+               g_param_spec_boolean ("use-r1c1",
+                                     P_("Display convention for expressions as XLS_R1C1 vs default"),
+                                     P_("How to format displayed expressions, (a convenience api)"),
+                                     FALSE,
+                                     GSF_PARAM_STATIC |
+                                     G_PARAM_READWRITE));
 
        g_object_class_install_property (gobject_class, PROP_TAB_FOREGROUND,
-                g_param_spec_boxed ("tab-foreground", _("Tab Foreground"),
-                                    _("The foreground color of the tab."),
-                                    GNM_STYLE_COLOR_TYPE,
-                                    GSF_PARAM_STATIC |
-                                    G_PARAM_READWRITE));
+               g_param_spec_boxed ("tab-foreground",
+                                   P_("Tab Foreground"),
+                                   P_("The foreground color of the tab."),
+                                   GNM_STYLE_COLOR_TYPE,
+                                   GSF_PARAM_STATIC |
+                                   G_PARAM_READWRITE));
        g_object_class_install_property (gobject_class, PROP_TAB_BACKGROUND,
-                g_param_spec_boxed ("tab-background", _("Tab Background"),
-                                    _("The background color of the tab."),
-                                    GNM_STYLE_COLOR_TYPE,
-                                    GSF_PARAM_STATIC |
-                                    G_PARAM_READWRITE));
+               g_param_spec_boxed ("tab-background",
+                                   P_("Tab Background"),
+                                   P_("The background color of the tab."),
+                                   GNM_STYLE_COLOR_TYPE,
+                                   GSF_PARAM_STATIC |
+                                   G_PARAM_READWRITE));
 
        /* What is this doing in sheet?  */
        g_object_class_install_property (gobject_class, PROP_ZOOM_FACTOR,
-                g_param_spec_double ("zoom-factor", _("Zoom Factor"),
-                                     _("The level of zoom used for this sheet."),
-                                     0.1, 5.0,
-                                     1.0,
-                                     GSF_PARAM_STATIC |
-                                     G_PARAM_CONSTRUCT |
-                                     G_PARAM_READWRITE));
+               g_param_spec_double ("zoom-factor",
+                                    P_("Zoom Factor"),
+                                    P_("The level of zoom used for this sheet."),
+                                    0.1, 5.0,
+                                    1.0,
+                                    GSF_PARAM_STATIC |
+                                    G_PARAM_CONSTRUCT |
+                                    G_PARAM_READWRITE));
 
        g_object_class_install_property (gobject_class, PROP_COLUMNS,
                g_param_spec_int ("columns",
-                       C_("sheetsize", "Columns"),
-                       _("Columns number in the sheet"),
-                       0, GNM_MAX_COLS, GNM_DEFAULT_COLS,
-                       GSF_PARAM_STATIC | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+                                 P_("Columns"),
+                                 P_("Columns number in the sheet"),
+                                 0, GNM_MAX_COLS, GNM_DEFAULT_COLS,
+                                 GSF_PARAM_STATIC | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
        g_object_class_install_property (gobject_class, PROP_ROWS,
                g_param_spec_int ("rows",
-                       C_("sheetsize", "Rows"),
-                       _("Rows number in the sheet"),
-                       0, GNM_MAX_ROWS, GNM_DEFAULT_ROWS,
-                       GSF_PARAM_STATIC | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+                                 P_("Rows"),
+                                 P_("Rows number in the sheet"),
+                                 0, GNM_MAX_ROWS, GNM_DEFAULT_ROWS,
+                                 GSF_PARAM_STATIC | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
        signals[DETACHED_FROM_WORKBOOK] = g_signal_new
                ("detached_from_workbook",
diff --git a/src/stf-export.c b/src/stf-export.c
index 9649988..a3eebc1 100644
--- a/src/stf-export.c
+++ b/src/stf-export.c
@@ -27,7 +27,7 @@
 
 #include <gnumeric-config.h>
 #include "gnumeric.h"
-#include <glib/gi18n-lib.h>
+#include "gnm-i18n.h"
 #include "stf-export.h"
 
 #include "gnumeric-conf.h"
@@ -552,8 +552,8 @@ gnm_stf_export_class_init (GObjectClass *gobject_class)
                (gobject_class,
                 PROP_CHARSET,
                 g_param_spec_string ("charset",
-                                     _("Character set"),
-                                     _("The character encoding of the output."),
+                                     P_("Character set"),
+                                     P_("The character encoding of the output."),
                                      NULL,
                                      GSF_PARAM_STATIC |
                                      G_PARAM_READWRITE));
@@ -561,8 +561,8 @@ gnm_stf_export_class_init (GObjectClass *gobject_class)
                (gobject_class,
                 PROP_LOCALE,
                 g_param_spec_string ("locale",
-                                     _("Locale"),
-                                     _("The locale to use for number and date formatting."),
+                                     P_("Locale"),
+                                     P_("The locale to use for number and date formatting."),
                                      NULL,
                                      GSF_PARAM_STATIC |
                                      G_PARAM_READWRITE));
@@ -570,8 +570,8 @@ gnm_stf_export_class_init (GObjectClass *gobject_class)
                (gobject_class,
                 PROP_TRANSLITERATE_MODE,
                 g_param_spec_enum ("transliterate-mode",
-                                   _("Transliterate mode"),
-                                   _("What to do with unrepresentable characters."),
+                                   P_("Transliterate mode"),
+                                   P_("What to do with unrepresentable characters."),
                                    GNM_STF_TRANSLITERATE_MODE_TYPE,
                                    GNM_STF_TRANSLITERATE_MODE_ESCAPE,
                                    GSF_PARAM_STATIC |
@@ -580,8 +580,8 @@ gnm_stf_export_class_init (GObjectClass *gobject_class)
                (gobject_class,
                 PROP_FORMAT,
                 g_param_spec_enum ("format",
-                                   _("Format"),
-                                   _("How should cells be formatted?"),
+                                   P_("Format"),
+                                   P_("How should cells be formatted?"),
                                    GNM_STF_FORMAT_MODE_TYPE,
                                    GNM_STF_FORMAT_AUTO,
                                    GSF_PARAM_STATIC |
diff --git a/src/tools/gnm-solver.c b/src/tools/gnm-solver.c
index 1f39f84..f729bad 100644
--- a/src/tools/gnm-solver.c
+++ b/src/tools/gnm-solver.c
@@ -12,6 +12,7 @@
 #include "workbook-control.h"
 #include "gnm-marshalers.h"
 #include "dao.h"
+#include "gnm-i18n.h"
 #include <gsf/gsf-impl-utils.h>
 #include <gsf/gsf-output-stdio.h>
 #include <glib/gi18n-lib.h>
@@ -737,16 +738,18 @@ gnm_solver_param_class_init (GObjectClass *object_class)
        object_class->get_property = gnm_solver_param_get_property;
 
        g_object_class_install_property (object_class, SOLP_PROP_SHEET,
-                g_param_spec_object ("sheet", _("Sheet"),
-                                     _("Sheet"),
+               g_param_spec_object ("sheet",
+                                     P_("Sheet"),
+                                     P_("Sheet"),
                                      GNM_SHEET_TYPE,
                                      GSF_PARAM_STATIC |
                                      G_PARAM_CONSTRUCT_ONLY |
                                      G_PARAM_READWRITE));
 
        g_object_class_install_property (object_class, SOLP_PROP_PROBLEM_TYPE,
-                g_param_spec_enum ("problem-type", _("Problem Type"),
-                                   _("Problem Type"),
+               g_param_spec_enum ("problem-type",
+                                   P_("Problem Type"),
+                                   P_("Problem Type"),
                                    GNM_SOLVER_PROBLEM_TYPE_TYPE,
                                    GNM_SOLVER_MAXIMIZE,
                                    GSF_PARAM_STATIC |
@@ -1638,48 +1641,54 @@ gnm_solver_class_init (GObjectClass *object_class)
        object_class->get_property = gnm_solver_get_property;
 
         g_object_class_install_property (object_class, SOL_PROP_STATUS,
-                g_param_spec_enum ("status", _("status"),
-                                   _("The solver's current status"),
+               g_param_spec_enum ("status",
+                                   P_("status"),
+                                   P_("The solver's current status"),
                                    GNM_SOLVER_STATUS_TYPE,
                                    GNM_SOLVER_STATUS_READY,
                                    GSF_PARAM_STATIC |
                                    G_PARAM_READWRITE));
 
         g_object_class_install_property (object_class, SOL_PROP_REASON,
-                g_param_spec_string ("reason", _("reason"),
-                                     _("The reason behind the solver's status"),
-                                     NULL,
-                                     GSF_PARAM_STATIC |
-                                     G_PARAM_READWRITE));
+               g_param_spec_string ("reason",
+                                    P_("reason"),
+                                    P_("The reason behind the solver's status"),
+                                    NULL,
+                                    GSF_PARAM_STATIC |
+                                    G_PARAM_READWRITE));
 
        g_object_class_install_property (object_class, SOL_PROP_PARAMS,
-                g_param_spec_object ("params", _("Parameters"),
-                                     _("Solver parameters"),
-                                     GNM_SOLVER_PARAMETERS_TYPE,
-                                     GSF_PARAM_STATIC |
-                                     G_PARAM_CONSTRUCT_ONLY |
-                                     G_PARAM_READWRITE));
+               g_param_spec_object ("params",
+                                    P_("Parameters"),
+                                    P_("Solver parameters"),
+                                    GNM_SOLVER_PARAMETERS_TYPE,
+                                    GSF_PARAM_STATIC |
+                                    G_PARAM_CONSTRUCT_ONLY |
+                                    G_PARAM_READWRITE));
 
        g_object_class_install_property (object_class, SOL_PROP_RESULT,
-                g_param_spec_object ("result", _("Result"),
-                                     _("Current best feasible result"),
-                                     GNM_SOLVER_RESULT_TYPE,
-                                     GSF_PARAM_STATIC |
-                                     G_PARAM_READWRITE));
+               g_param_spec_object ("result",
+                                    P_("Result"),
+                                    P_("Current best feasible result"),
+                                    GNM_SOLVER_RESULT_TYPE,
+                                    GSF_PARAM_STATIC |
+                                    G_PARAM_READWRITE));
 
        g_object_class_install_property (object_class, SOL_PROP_STARTTIME,
-                g_param_spec_double ("starttime", _("Start Time"),
-                                     _("Time the solver was started"),
-                                     -1, 1e10, -1,
-                                     GSF_PARAM_STATIC |
-                                     G_PARAM_READWRITE));
+               g_param_spec_double ("starttime",
+                                    P_("Start Time"),
+                                    P_("Time the solver was started"),
+                                    -1, 1e10, -1,
+                                    GSF_PARAM_STATIC |
+                                    G_PARAM_READWRITE));
 
        g_object_class_install_property (object_class, SOL_PROP_ENDTIME,
-                g_param_spec_double ("endtime", _("End Time"),
-                                     _("Time the solver finished"),
-                                     -1, 1e10, -1,
-                                     GSF_PARAM_STATIC |
-                                     G_PARAM_READWRITE));
+               g_param_spec_double ("endtime",
+                                    P_("End Time"),
+                                    P_("Time the solver finished"),
+                                    -1, 1e10, -1,
+                                    GSF_PARAM_STATIC |
+                                    G_PARAM_READWRITE));
 
        solver_signals[SOL_SIG_PREPARE] =
                g_signal_new ("prepare",
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index e868a3b..8221a51 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -66,7 +66,7 @@
 #include <gsf/gsf-doc-meta-data.h>
 #include <gtk/gtk.h>
 #include "gdk/gdkkeysyms-compat.h"
-#include <glib/gi18n-lib.h>
+#include "gnm-i18n.h"
 #include <errno.h>
 #include <string.h>
 
@@ -5522,15 +5522,15 @@ wbc_gtk_class_init (GObjectClass *gobject_class)
         g_object_class_install_property (gobject_class,
                 WBG_GTK_PROP_AUTOSAVE_PROMPT,
                 g_param_spec_boolean ("autosave-prompt",
-                                      _("Autosave prompt"),
-                                      _("Ask about autosave?"),
+                                      P_("Autosave prompt"),
+                                      P_("Ask about autosave?"),
                                       FALSE,
                                       GSF_PARAM_STATIC | G_PARAM_READWRITE));
         g_object_class_install_property (gobject_class,
                 WBG_GTK_PROP_AUTOSAVE_TIME,
                 g_param_spec_int ("autosave-time",
-                                  _("Autosave time in seconds"),
-                                  _("Seconds before autosave"),
+                                  P_("Autosave time in seconds"),
+                                  P_("Seconds before autosave"),
                                   0, G_MAXINT, 0,
                                   GSF_PARAM_STATIC | G_PARAM_READWRITE));
 
diff --git a/src/widgets/gnumeric-cell-renderer-toggle.c b/src/widgets/gnumeric-cell-renderer-toggle.c
index b0a62f2..5225c00 100644
--- a/src/widgets/gnumeric-cell-renderer-toggle.c
+++ b/src/widgets/gnumeric-cell-renderer-toggle.c
@@ -23,6 +23,7 @@
 #include <gnumeric-config.h>
 #include "gnumeric-cell-renderer-toggle.h"
 #include <gsf/gsf-impl-utils.h>
+#include "gnm-i18n.h"
 
 static void gnumeric_cell_renderer_toggle_get_property  (GObject         *object,
                                                         guint            param_id,
@@ -103,8 +104,8 @@ gnumeric_cell_renderer_toggle_class_init (GnumericCellRendererToggleClass *class
        g_object_class_install_property
                (object_class, PROP_PIXBUF,
                 g_param_spec_object ("pixbuf",
-                                     "Pixbuf Object",
-                                     "The pixbuf to render.",
+                                     P_("Pixbuf Object"),
+                                     P_("The pixbuf to render."),
                                      GDK_TYPE_PIXBUF,
                                      GSF_PARAM_STATIC | G_PARAM_READWRITE));
 }
diff --git a/src/widgets/gnumeric-expr-entry.c b/src/widgets/gnumeric-expr-entry.c
index 845f7f4..e14885d 100644
--- a/src/widgets/gnumeric-expr-entry.c
+++ b/src/widgets/gnumeric-expr-entry.c
@@ -9,7 +9,7 @@
  */
 
 #include <gnumeric-config.h>
-#include <glib/gi18n-lib.h>
+#include "gnm-i18n.h"
 #include <gnumeric.h>
 #include "gnumeric-expr-entry.h"
 
@@ -1730,24 +1730,24 @@ gee_class_init (GObjectClass *gobject_class)
        g_object_class_install_property
                (gobject_class, PROP_UPDATE_POLICY,
                 g_param_spec_enum ("update-policy",
-                                   _("Update policy"),
-                                   _("How frequently changes to the entry should be applied"),
+                                   P_("Update policy"),
+                                   P_("How frequently changes to the entry should be applied"),
                                    GNM_TYPE_UPDATE_TYPE, GNM_UPDATE_CONTINUOUS,
                                    GSF_PARAM_STATIC | G_PARAM_READWRITE));
 
        g_object_class_install_property
                (gobject_class, PROP_WITH_ICON,
                 g_param_spec_boolean ("with-icon",
-                                      _("With icon"),
-                                      _("Should there be an icon to the right of the entry?"),
+                                      P_("With icon"),
+                                      P_("Should there be an icon to the right of the entry?"),
                                       TRUE,
                                       GSF_PARAM_STATIC | G_PARAM_READWRITE));
 
        g_object_class_install_property
                (gobject_class, PROP_TEXT,
                 g_param_spec_string ("text",
-                                     _("Text"),
-                                     _("The contents of the entry"),
+                                     P_("Text"),
+                                     P_("The contents of the entry"),
                                      "",
                                      GSF_PARAM_STATIC | G_PARAM_READWRITE));
 
@@ -1760,24 +1760,24 @@ gee_class_init (GObjectClass *gobject_class)
        g_object_class_install_property
                (gobject_class, PROP_SCG,
                 g_param_spec_object ("scg",
-                                     _("SheetControlGUI"),
-                                     _("The GUI container associated with the entry."),
+                                     P_("SheetControlGUI"),
+                                     P_("The GUI container associated with the entry."),
                                      SHEET_CONTROL_GUI_TYPE,
                                      GSF_PARAM_STATIC | G_PARAM_READWRITE));
 
        g_object_class_install_property
                (gobject_class, PROP_WBCG,
                 g_param_spec_object ("wbcg",
-                                     _("WBCGtk"),
-                                     _("The toplevel GUI container associated with the entry."),
+                                     P_("WBCGtk"),
+                                     P_("The toplevel GUI container associated with the entry."),
                                      WBC_GTK_TYPE,
                                      GSF_PARAM_STATIC | G_PARAM_READWRITE));
 
        g_object_class_install_property
                (gobject_class, PROP_CONSTANT_FORMAT,
                 g_param_spec_pointer ("constant-format",
-                                      _("Constant Format"),
-                                      _("Format for constants"),
+                                      P_("Constant Format"),
+                                      P_("Format for constants"),
                                       GSF_PARAM_STATIC | G_PARAM_READWRITE));
 
        gee_debug = gnm_debug_flag ("gee");
diff --git a/src/widgets/gnumeric-text-view.c b/src/widgets/gnumeric-text-view.c
index 63ab557..ac2a39c 100644
--- a/src/widgets/gnumeric-text-view.c
+++ b/src/widgets/gnumeric-text-view.c
@@ -20,7 +20,7 @@
  */
 
 #include <gnumeric-config.h>
-#include <glib/gi18n-lib.h>
+#include "gnm-i18n.h"
 #include <gnumeric.h>
 #include "gnumeric-text-view.h"
 
@@ -477,22 +477,25 @@ gtv_class_init (GObjectClass *gobject_class)
 
        g_object_class_install_property (gobject_class,
                PROP_TEXT,
-               g_param_spec_string ("text", "Text",
-                       "The text content",
-                       "",
-                       GSF_PARAM_STATIC | G_PARAM_READWRITE));
+               g_param_spec_string ("text",
+                                    P_("Text"),
+                                    P_("The text content"),
+                                    "",
+                                    GSF_PARAM_STATIC | G_PARAM_READWRITE));
        g_object_class_install_property (gobject_class,
                PROP_WRAP,
-               g_param_spec_enum ("wrap", "Wrap",
-                                  "The wrapping mode",
+               g_param_spec_enum ("wrap",
+                                  P_("Wrap"),
+                                  P_("The wrapping mode"),
                                   GTK_TYPE_WRAP_MODE,
                                   GTK_WRAP_WORD,
                                   GSF_PARAM_STATIC | G_PARAM_READWRITE));
        g_object_class_install_property
                (gobject_class, PROP_ATTR,
                 g_param_spec_boxed
-                ("attributes", "PangoAttrList",
-                 "A PangoAttrList derived from the buffer content.",
+                ("attributes",
+                 P_("PangoAttrList"),
+                 P_("A PangoAttrList derived from the buffer content."),
                  PANGO_TYPE_ATTR_LIST,
                  GSF_PARAM_STATIC | G_PARAM_READWRITE));
 }
diff --git a/src/workbook-control.c b/src/workbook-control.c
index 001f7cb..0403c7e 100644
--- a/src/workbook-control.c
+++ b/src/workbook-control.c
@@ -22,7 +22,7 @@
  */
 
 #include <gnumeric-config.h>
-#include <glib/gi18n-lib.h>
+#include "gnm-i18n.h"
 #include "gnumeric.h"
 #include "workbook-control-priv.h"
 
@@ -496,8 +496,8 @@ workbook_control_class_init (GObjectClass *object_class)
                (object_class,
                 PROP_VIEW,
                 g_param_spec_object ("view",
-                                     _("View"),
-                                     _("The workbook view being controlled."),
+                                     P_("View"),
+                                     P_("The workbook view being controlled."),
                                      WORKBOOK_VIEW_TYPE,
                                      GSF_PARAM_STATIC |
                                      G_PARAM_READWRITE));
diff --git a/src/workbook-view.c b/src/workbook-view.c
index 91d23ae..af5370a 100644
--- a/src/workbook-view.c
+++ b/src/workbook-view.c
@@ -56,7 +56,7 @@
 #include <gsf/gsf-impl-utils.h>
 #include <gsf/gsf-output-stdio.h>
 #include <gsf/gsf-input.h>
-#include <glib/gi18n-lib.h>
+#include "gnm-i18n.h"
 #include <glib/gstdio.h>
 #include <string.h>
 #include <unistd.h>
@@ -854,16 +854,16 @@ workbook_view_class_init (GObjectClass *gobject_class)
                (gobject_class,
                 PROP_AUTO_EXPR_FUNC,
                 g_param_spec_pointer ("auto-expr-func",
-                                      _("Auto-expression function"),
-                                      _("The automatically computed sheet function."),
+                                      P_("Auto-expression function"),
+                                      P_("The automatically computed sheet function."),
                                       GSF_PARAM_STATIC |
                                       G_PARAM_READWRITE));
         g_object_class_install_property
                (gobject_class,
                 PROP_AUTO_EXPR_DESCR,
                 g_param_spec_string ("auto-expr-descr",
-                                     _("Auto-expression description"),
-                                     _("Description of the automatically computed sheet function."),
+                                     P_("Auto-expression description"),
+                                     P_("Description of the automatically computed sheet function."),
                                      NULL,
                                      GSF_PARAM_STATIC |
                                      G_PARAM_READWRITE));
@@ -871,8 +871,8 @@ workbook_view_class_init (GObjectClass *gobject_class)
                (gobject_class,
                 PROP_AUTO_EXPR_MAX_PRECISION,
                 g_param_spec_boolean ("auto-expr-max-precision",
-                                      _("Auto-expression maximum precision"),
-                                      _("Use maximum available precision for auto-expressions"),
+                                      P_("Auto-expression maximum precision"),
+                                      P_("Use maximum available precision for auto-expressions"),
                                       FALSE,
                                       GSF_PARAM_STATIC |
                                       G_PARAM_READWRITE));
@@ -880,8 +880,8 @@ workbook_view_class_init (GObjectClass *gobject_class)
                (gobject_class,
                 PROP_AUTO_EXPR_VALUE,
                 g_param_spec_boxed ("auto-expr-value",
-                                    _("Auto-expression value"),
-                                    _("The current value of the auto-expression."),
+                                    P_("Auto-expression value"),
+                                    P_("The current value of the auto-expression."),
                                     gnm_value_get_type (),
                                     GSF_PARAM_STATIC |
                                     G_PARAM_READWRITE));
@@ -889,16 +889,16 @@ workbook_view_class_init (GObjectClass *gobject_class)
                (gobject_class,
                 PROP_AUTO_EXPR_EVAL_POS,
                 g_param_spec_pointer ("auto-expr-eval-pos",
-                                      _("Auto-expression position"),
-                                      _("The cell position to track."),
+                                      P_("Auto-expression position"),
+                                      P_("The cell position to track."),
                                       GSF_PARAM_STATIC |
                                       G_PARAM_WRITABLE));
         g_object_class_install_property
                (gobject_class,
                 PROP_SHOW_HORIZONTAL_SCROLLBAR,
                 g_param_spec_boolean ("show-horizontal-scrollbar",
-                                      _("Show horizontal scrollbar"),
-                                      _("Show the horizontal scrollbar"),
+                                      P_("Show horizontal scrollbar"),
+                                      P_("Show the horizontal scrollbar"),
                                       TRUE,
                                       GSF_PARAM_STATIC |
                                       G_PARAM_READWRITE));
@@ -906,8 +906,8 @@ workbook_view_class_init (GObjectClass *gobject_class)
                (gobject_class,
                 PROP_SHOW_VERTICAL_SCROLLBAR,
                 g_param_spec_boolean ("show-vertical-scrollbar",
-                                      _("Show vertical scrollbar"),
-                                      _("Show the vertical scrollbar"),
+                                      P_("Show vertical scrollbar"),
+                                      P_("Show the vertical scrollbar"),
                                       TRUE,
                                       GSF_PARAM_STATIC |
                                       G_PARAM_READWRITE));
@@ -915,8 +915,8 @@ workbook_view_class_init (GObjectClass *gobject_class)
                (gobject_class,
                 PROP_SHOW_NOTEBOOK_TABS,
                 g_param_spec_boolean ("show-notebook-tabs",
-                                      _("Show notebook tabs"),
-                                      _("Show the notebook tabs for sheets"),
+                                      P_("Show notebook tabs"),
+                                      P_("Show the notebook tabs for sheets"),
                                       TRUE,
                                       GSF_PARAM_STATIC |
                                       G_PARAM_READWRITE));
@@ -924,8 +924,8 @@ workbook_view_class_init (GObjectClass *gobject_class)
                (gobject_class,
                 PROP_SHOW_FUNCTION_CELL_MARKERS,
                 g_param_spec_boolean ("show-function-cell-markers",
-                                      _("Show formula cell markers"),
-                                      _("Mark each cell containing a formula"),
+                                      P_("Show formula cell markers"),
+                                      P_("Mark each cell containing a formula"),
                                       FALSE,
                                       GSF_PARAM_STATIC |
                                       G_PARAM_READWRITE));
@@ -933,9 +933,8 @@ workbook_view_class_init (GObjectClass *gobject_class)
                (gobject_class,
                 PROP_SHOW_EXTENSION_MARKERS,
                 g_param_spec_boolean ("show-extension-markers",
-                                      _("Show extension markers"),
-                                      _("Mark each cell that fails to show "
-                                        "the complete content"),
+                                      P_("Show extension markers"),
+                                      P_("Mark each cell that fails to show the complete content"),
                                       FALSE,
                                       GSF_PARAM_STATIC |
                                       G_PARAM_READWRITE));
@@ -943,8 +942,8 @@ workbook_view_class_init (GObjectClass *gobject_class)
                (gobject_class,
                 PROP_DO_AUTO_COMPLETION,
                 g_param_spec_boolean ("do-auto-completion",
-                                      _("Do auto completion"),
-                                      _("Auto-complete text"),
+                                      P_("Do auto completion"),
+                                      P_("Auto-complete text"),
                                       FALSE,
                                       GSF_PARAM_STATIC |
                                       G_PARAM_READWRITE));
@@ -952,8 +951,8 @@ workbook_view_class_init (GObjectClass *gobject_class)
                (gobject_class,
                 PROP_PROTECTED,
                 g_param_spec_boolean ("protected",
-                                      _("Protected"),
-                                      _("Is view protected?"),
+                                      P_("Protected"),
+                                      P_("Is view protected?"),
                                       FALSE,
                                       GSF_PARAM_STATIC |
                                       G_PARAM_READWRITE));
@@ -961,8 +960,8 @@ workbook_view_class_init (GObjectClass *gobject_class)
                (gobject_class,
                 PROP_PREFERRED_WIDTH,
                 g_param_spec_int ("preferred-width",
-                                  _("Preferred width"),
-                                  _("Preferred width"),
+                                  P_("Preferred width"),
+                                  P_("Preferred width"),
                                   1, G_MAXINT, 1024,
                                   GSF_PARAM_STATIC |
                                   G_PARAM_READWRITE));
@@ -970,8 +969,8 @@ workbook_view_class_init (GObjectClass *gobject_class)
                (gobject_class,
                 PROP_PREFERRED_HEIGHT,
                 g_param_spec_int ("preferred-height",
-                                  _("Preferred height"),
-                                  _("Preferred height"),
+                                  P_("Preferred height"),
+                                  P_("Preferred height"),
                                   1, G_MAXINT, 768,
                                   GSF_PARAM_STATIC |
                                   G_PARAM_READWRITE));
diff --git a/src/workbook.c b/src/workbook.c
index 840fdcc..99b30d8 100644
--- a/src/workbook.c
+++ b/src/workbook.c
@@ -44,7 +44,7 @@
 #include <gsf/gsf-doc-meta-data.h>
 #include <gsf/gsf-impl-utils.h>
 #include <gsf/gsf-meta-names.h>
-#include <glib/gi18n-lib.h>
+#include "gnm-i18n.h"
 #include <string.h>
 #include <errno.h>
 
@@ -262,8 +262,9 @@ workbook_class_init (GObjectClass *gobject_class)
        gobject_class->dispose      = workbook_dispose;
 
         g_object_class_install_property (gobject_class, RECALC_MODE,
-                g_param_spec_boolean ("recalc-mode", "recalc-mode",
-                                      _("Enable automatic recalculation."),
+                g_param_spec_boolean ("recalc-mode",
+                                      P_("Recalc mode"),
+                                      P_("Enable automatic recalculation."),
                                       TRUE,
                                       GSF_PARAM_STATIC |
                                       G_PARAM_READWRITE));


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]