Removing the caligraphic presets file and making the same strings translatable in...

diff --git a/po/POTFILES.in b/po/POTFILES.in
index b3ca8fee179f3257b4df26bbd7527ea444e4676a..f076bff92a6c782c9e1d2321b1c48d01814341e7 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -164,6 +164,7 @@ src/pencil-context.cpp
 src/pen-context.cpp
 src/persp3d.cpp
 src/preferences.cpp
+src/preferences-skeleton.h
 src/rdf.cpp
 src/rect-context.cpp
 src/select-context.cpp

diff --git a/src/preferences-skeleton.h b/src/preferences-skeleton.h
index db21697cac6f0da985b9d0719d11f9967c487466..6185ff729230a68ca568c52772d951ec2d756056 100644 (file)
--- a/src/preferences-skeleton.h
+++ b/src/preferences-skeleton.h
@@ -3,6 +3,11 @@
 
 #include <inkscape-version.h>
 
+#ifdef N_
+#undef N_
+#endif
+#define N_(x) x
+
 /* The root's "version" attribute describes the preferences file format version.
  * It should only increase when a backwards-incompatible change is made, 
  * and special handling has to be added to the preferences class to update
@@ -90,12 +95,12 @@ static char const preferences_skeleton[] =
 "                       mass=\"2\" angle=\"30\" width=\"15\" thinning=\"10\" flatness=\"90\" cap_rounding=\"0.0\" usecurrent=\"1\"\n"
 "                       tracebackground=\"0\" usepressure=\"1\" usetilt=\"0\" keep_selected=\"1\">\n"
 "    <group id=\"preset\">\n"
-"    <group id=\"cp0\" name=\"Dip pen\" mass=\"2\" wiggle=\"0.0\" angle=\"30.0\" thinning=\"10\" tremor=\"0.0\" flatness=\"90\" cap_rounding=\"0.0\" tracebackground=\"0\" usepressure=\"1\" usetilt=\"1\" />\n"
-"    <group id=\"cp1\" name=\"Marker\" mass=\"2\" wiggle=\"0.0\" angle=\"90.0\" thinning=\"0.0\" tremor=\"0.0\" flatness=\"0.0\" cap_rounding=\"1.0\" tracebackground=\"0\" usepressure=\"0\" usetilt=\"0\" />\n"
-"    <group id=\"cp2\" name=\"Brush\" mass=\"2\" wiggle=\"25\" angle=\"45.0\" thinning=\"-40\" tremor=\"0.0\" flatness=\"16\" cap_rounding=\".1\" tracebackground=\"0\" usepressure=\"1\" usetilt=\"1\" />\n"
-"    <group id=\"cp3\" name=\"Wiggly\" usetilt=\"1\" tracebackground=\"0\" usepressure=\"1\" cap_rounding=\"0.1\" flatness=\"16\" tremor=\"18\" thinning=\"-30\" angle=\"30\" wiggle=\"50\" mass=\"0\" />\n"
-"    <group id=\"cp4\" name=\"Splotchy\" width=\"100\" usetilt=\"1\" tracebackground=\"0\" usepressure=\"0\" cap_rounding=\"1\" flatness=\"0\" tremor=\"10\" thinning=\"30\" angle=\"30\" wiggle=\"0\" mass=\"0\" />\n"
-"    <group id=\"cp5\" name=\"Tracing\" width=\"50\" mass=\"0\" wiggle=\"0.0\" angle=\"0.0\" thinning=\"0.0\" tremor=\"0.0\" flatness=\"0\" cap_rounding=\"0.0\" tracebackground=\"1\" usepressure=\"1\" usetilt=\"1\"/>\n"
+"    <group id=\"cp0\" name=\"" N_("Dip pen") "\" mass=\"2\" wiggle=\"0.0\" angle=\"30.0\" thinning=\"10\" tremor=\"0.0\" flatness=\"90\" cap_rounding=\"0.0\" tracebackground=\"0\" usepressure=\"1\" usetilt=\"1\" />\n"
+"    <group id=\"cp1\" name=\"" N_("Marker") "\" mass=\"2\" wiggle=\"0.0\" angle=\"90.0\" thinning=\"0.0\" tremor=\"0.0\" flatness=\"0.0\" cap_rounding=\"1.0\" tracebackground=\"0\" usepressure=\"0\" usetilt=\"0\" />\n"
+"    <group id=\"cp2\" name=\"" N_("Brush") "\" mass=\"2\" wiggle=\"25\" angle=\"45.0\" thinning=\"-40\" tremor=\"0.0\" flatness=\"16\" cap_rounding=\".1\" tracebackground=\"0\" usepressure=\"1\" usetilt=\"1\" />\n"
+"    <group id=\"cp3\" name=\"" N_("Wiggly") "\" usetilt=\"1\" tracebackground=\"0\" usepressure=\"1\" cap_rounding=\"0.1\" flatness=\"16\" tremor=\"18\" thinning=\"-30\" angle=\"30\" wiggle=\"50\" mass=\"0\" />\n"
+"    <group id=\"cp4\" name=\"" N_("Splotchy") "\" width=\"100\" usetilt=\"1\" tracebackground=\"0\" usepressure=\"0\" cap_rounding=\"1\" flatness=\"0\" tremor=\"10\" thinning=\"30\" angle=\"30\" wiggle=\"0\" mass=\"0\" />\n"
+"    <group id=\"cp5\" name=\"" N_("Tracing") "\" width=\"50\" mass=\"0\" wiggle=\"0.0\" angle=\"0.0\" thinning=\"0.0\" tremor=\"0.0\" flatness=\"0\" cap_rounding=\"0.0\" tracebackground=\"1\" usepressure=\"1\" usetilt=\"1\"/>\n"
 "    </group>\n" 
 "    </eventcontext>\n"
 "    <eventcontext id=\"eraser\" mode=\"0\" style=\"fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;\"\n"

diff --git a/src/ui/dialog/calligraphic-presets.h b/src/ui/dialog/calligraphic-presets.h
deleted file mode 100644 (file)
index 89f963e..0000000
--- a/src/ui/dialog/calligraphic-presets.h
+++ /dev/null
@@ -1,14 +0,0 @@
-char * stringlst = [
-/* TRANSLATORS: calligraphic pen type */
-N_("Dip pen"),
-/* TRANSLATORS: calligraphic pen type */
-N_("Marker"),
-/* TRANSLATORS: calligraphic pen type */
-N_("Brush"),
-/* TRANSLATORS: calligraphic pen type */
-N_("Wiggly"),
-/* TRANSLATORS: calligraphic pen type */
-N_("Splotchy"),
-/* TRANSLATORS: calligraphic pen type */
-N_("Tracing"),
-];