Fix for "[1490928] Error message after an internal error is not

translated".  The strings were marked as translatable but not getting
passed to the translation engine.

diff --git a/ChangeLog b/ChangeLog
index 614f51bddf44ac7d4d60d8ba37df10767d713dc3..47555915cafa57c583fe33b5cfd72d63b2cb708c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2006-05-25  Bryce Harrington <bryce@bryceharrington.org>
+       * src/inkscape.cpp:  i18n on error messages (fix for bug 1490928) 
+
 2006-05-23  Jon A. Cruz  <jon@joncruz.org>
 
        * src/dialogs/layers-panel.cpp, src/dialogs/swatches.cpp,

diff --git a/src/inkscape.cpp b/src/inkscape.cpp
index b1fbdb28dbd66335634da4e624005c1b7c300c98..582f7118fae80f6b63823216bbd2d7949f11b759 100644 (file)
--- a/src/inkscape.cpp
+++ b/src/inkscape.cpp
@@ -477,7 +477,7 @@ inkscape_segv_handler (int signum)
     char const *sstr = N_("Automatic backups of unsaved documents were done to the following locations:\n");
     char const *fstr = N_("Automatic backup of the following documents failed:\n");
     gint nllen = strlen ("\n");
-    gint len = strlen (istr) + strlen (sstr) + strlen (fstr);
+    gint len = strlen (_(istr)) + strlen (_(sstr)) + strlen (_(fstr));
     for (GSList *l = savednames; l != NULL; l = l->next) {
         len = len + SP_INDENT + strlen ((gchar *) l->data) + nllen;
     }
@@ -487,12 +487,12 @@ inkscape_segv_handler (int signum)
     len += 1;
     gchar *b = g_new (gchar, len);
     gint pos = 0;
-    len = strlen (istr);
-    memcpy (b + pos, istr, len);
+    len = strlen (_(istr));
+    memcpy (b + pos, _(istr), len);
     pos += len;
     if (savednames) {
-        len = strlen (sstr);
-        memcpy (b + pos, sstr, len);
+        len = strlen (_(sstr));
+        memcpy (b + pos, _(sstr), len);
         pos += len;
         for (GSList *l = savednames; l != NULL; l = l->next) {
             memset (b + pos, ' ', SP_INDENT);
@@ -505,8 +505,8 @@ inkscape_segv_handler (int signum)
         }
     }
     if (failednames) {
-        len = strlen (fstr);
-        memcpy (b + pos, fstr, len);
+        len = strlen (_(fstr));
+        memcpy (b + pos, _(fstr), len);
         pos += len;
         for (GSList *l = failednames; l != NULL; l = l->next) {
             memset (b + pos, ' ', SP_INDENT);