Fix for Bug #327533 (Calligraphy presets are not translatable).

diff --git a/po/POTFILES.in b/po/POTFILES.in
index b49333ea45efab03cda7a19395e7ed3aa5d862cc..7b767419dafc3c3494fb74acd6125b2ca39c9720 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,6 +2,7 @@
 # Please keep this file sorted alphabetically.
 # Generated by ./generate_POTFILES.sh at Wed Jun  3 14:29:48 CDT 2009
 [encoding: UTF-8]
+
 inkscape.desktop.in
 share/filters/filters.svg.h
 share/patterns/patterns.svg.h
@@ -207,6 +208,7 @@ src/ui/clipboard.cpp
 src/ui/context-menu.cpp
 src/ui/dialog/aboutbox.cpp
 src/ui/dialog/align-and-distribute.cpp
+src/ui/dialog/calligraphic-presets.h
 src/ui/dialog/calligraphic-profile-rename.cpp
 src/ui/dialog/debug.cpp
 src/ui/dialog/document-metadata.cpp

diff --git a/po/fr.po b/po/fr.po
index 9a7157ca9131db0d241aa01bd0351d60e63ff5b7..aad118c3b55cad4e38da0df8d86c2426c16e8b95 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inkscape\n"
 "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-07-06 19:00+0200\n"
-"PO-Revision-Date: 2009-07-06 19:05+0100\n"
+"POT-Creation-Date: 2009-07-06 19:50+0200\n"
+"PO-Revision-Date: 2009-07-06 21:05+0100\n"
 "Last-Translator: Nicolas Dufour <nicoduf@yahoo.fr>\n"
 "Language-Team:  <fr@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -10677,6 +10677,30 @@ msgstr "Objet le plus petit"
 msgid "Selection"
 msgstr "Sélection"
 
+#: ../src/ui/dialog/calligraphic-presets.h:2
+msgid "Dip pen"
+msgstr "Calame"
+
+#: ../src/ui/dialog/calligraphic-presets.h:3
+msgid "Marker"
+msgstr "Marqueur"
+
+#: ../src/ui/dialog/calligraphic-presets.h:4
+msgid "Brush"
+msgstr "Brosse"
+
+#: ../src/ui/dialog/calligraphic-presets.h:5
+msgid "Wiggly"
+msgstr "Pinceau fou"
+
+#: ../src/ui/dialog/calligraphic-presets.h:6
+msgid "Splotchy"
+msgstr "Plume"
+
+#: ../src/ui/dialog/calligraphic-presets.h:7
+msgid "Tracing"
+msgstr "Gravure"
+
 #: ../src/ui/dialog/calligraphic-profile-rename.cpp:38
 msgid "Profile name:"
 msgstr "Nom du profil :"

diff --git a/po/inkscape.pot b/po/inkscape.pot
index adc56a21d45da8a0b6d805c861cefec99fa50885..4fcb2d4184aae65adb793acc74196cca77b3dcd4 100644 (file)
--- a/po/inkscape.pot
+++ b/po/inkscape.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-07-04 09:03+0200\n"
+"POT-Creation-Date: 2009-07-06 19:50+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -510,7 +510,7 @@ msgstr ""
 #: ../share/filters/filters.svg.h:125 ../share/filters/filters.svg.h:171
 #: ../share/filters/filters.svg.h:173 ../share/filters/filters.svg.h:191
 #: ../share/filters/filters.svg.h:192 ../share/filters/filters.svg.h:195
-#: ../share/filters/filters.svg.h:197
+#: ../share/filters/filters.svg.h:197 ../share/filters/filters.svg.h:198
 msgid "Bumps"
 msgstr ""
 
@@ -1732,6 +1732,15 @@ msgid ""
 "Combine a HSL edges detection bump with a wavy reflective surface effect"
 msgstr ""
 
+#: ../share/filters/filters.svg.h:198
+msgid "Plaster"
+msgstr ""
+
+#: ../share/filters/filters.svg.h:198
+msgid ""
+"Combine a HSL edges detection bump with a matte and crumpled surface effect"
+msgstr ""
+
 #: ../share/patterns/patterns.svg.h:2
 msgid "Stripes 1:1"
 msgstr ""
@@ -10607,6 +10616,30 @@ msgstr ""
 msgid "Selection"
 msgstr ""
 
+#: ../src/ui/dialog/calligraphic-presets.h:2
+msgid "Dip pen"
+msgstr ""
+
+#: ../src/ui/dialog/calligraphic-presets.h:3
+msgid "Marker"
+msgstr ""
+
+#: ../src/ui/dialog/calligraphic-presets.h:4
+msgid "Brush"
+msgstr ""
+
+#: ../src/ui/dialog/calligraphic-presets.h:5
+msgid "Wiggly"
+msgstr ""
+
+#: ../src/ui/dialog/calligraphic-presets.h:6
+msgid "Splotchy"
+msgstr ""
+
+#: ../src/ui/dialog/calligraphic-presets.h:7
+msgid "Tracing"
+msgstr ""
+
 #: ../src/ui/dialog/calligraphic-profile-rename.cpp:38
 msgid "Profile name:"
 msgstr ""

diff --git a/src/ui/dialog/calligraphic-presets.h b/src/ui/dialog/calligraphic-presets.h
new file mode 100644 (file)
index 0000000..171ca52
--- /dev/null
+++ b/src/ui/dialog/calligraphic-presets.h
@@ -0,0 +1,8 @@
+char * stringlst = [
+N_("Dip pen"),
+N_("Marker"),
+N_("Brush"),
+N_("Wiggly"),
+N_("Splotchy"),
+N_("Tracing"),
+];

diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 7547b2d7e1931893820b8926b00b897213dfe18d..291bb9dbb644d5e0a44c74def16c3f23607f2ea1 100644 (file)
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -4550,7 +4550,7 @@ static void sp_dcc_build_presets_list(GObject *tbl)
        GtkTreeIter iter;
         Glib::ustring preset_name = prefs->getString(*i + "/name");
         gtk_list_store_append( model, &iter );
-        gtk_list_store_set( model, &iter, 0, preset_name.data(), 1, ii++, -1 );
+        gtk_list_store_set( model, &iter, 0, _(preset_name.data()), 1, ii++, -1 );
     }
 
     {