![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f5e172a632f2cad869ee0ae40439adb2a2b0fe98..2e12527d5c0aff97097da227d4a9be27d30f26ba 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
[type: gettext/xml] share/extensions/cdt_input.inx
[type: gettext/xml] share/extensions/cgm_input.inx
[type: gettext/xml] share/extensions/cmx_input.inx
+[type: gettext/xml] share/extensions/color_blackandwhite.inx
[type: gettext/xml] share/extensions/color_brighter.inx
[type: gettext/xml] share/extensions/color_custom.inx
[type: gettext/xml] share/extensions/color_darker.inx
[type: gettext/xml] share/extensions/fractalize.inx
[type: gettext/xml] share/extensions/funcplot.inx
[type: gettext/xml] share/extensions/gears.inx
+[type: gettext/xml] share/extensions/generate_voronoi.inx
[type: gettext/xml] share/extensions/gimp_xcf.inx
[type: gettext/xml] share/extensions/grid_cartesian.inx
[type: gettext/xml] share/extensions/grid_polar.inx
[type: gettext/xml] share/extensions/guides_creator.inx
+[type: gettext/xml] share/extensions/guillotine.inx
[type: gettext/xml] share/extensions/handles.inx
[type: gettext/xml] share/extensions/hpgl_output.inx
[type: gettext/xml] share/extensions/inkscape_help_askaquestion.inx
[type: gettext/xml] share/extensions/inkscape_help_svgspec.inx
[type: gettext/xml] share/extensions/interp.inx
[type: gettext/xml] share/extensions/interp_att_g.inx
+[type: gettext/xml] share/extensions/jessyInk_autoTexts.inx
+[type: gettext/xml] share/extensions/jessyInk_effects.inx
+[type: gettext/xml] share/extensions/jessyInk_export.inx
+[type: gettext/xml] share/extensions/jessyInk_install.inx
+[type: gettext/xml] share/extensions/jessyInk_keyBindings.inx
+[type: gettext/xml] share/extensions/jessyInk_masterSlide.inx
+[type: gettext/xml] share/extensions/jessyInk_mouseHandler.inx
+[type: gettext/xml] share/extensions/jessyInk_summary.inx
+[type: gettext/xml] share/extensions/jessyInk_transitions.inx
+[type: gettext/xml] share/extensions/jessyInk_uninstall.inx
+[type: gettext/xml] share/extensions/jessyInk_video.inx
+[type: gettext/xml] share/extensions/jessyInk_view.inx
[type: gettext/xml] share/extensions/lindenmayer.inx
[type: gettext/xml] share/extensions/lorem_ipsum.inx
[type: gettext/xml] share/extensions/markers_strokepaint.inx
[type: gettext/xml] share/extensions/pathscatter.inx
[type: gettext/xml] share/extensions/perfectboundcover.inx
[type: gettext/xml] share/extensions/perspective.inx
+[type: gettext/xml] share/extensions/pixelsnap.inx
[type: gettext/xml] share/extensions/plt_input.inx
[type: gettext/xml] share/extensions/plt_output.inx
[type: gettext/xml] share/extensions/polyhedron_3d.inx
[type: gettext/xml] share/extensions/radiusrand.inx
[type: gettext/xml] share/extensions/render_alphabetsoup.inx
[type: gettext/xml] share/extensions/render_barcode.inx
+[type: gettext/xml] share/extensions/replace_font.inx
[type: gettext/xml] share/extensions/restack.inx
[type: gettext/xml] share/extensions/rtree.inx
[type: gettext/xml] share/extensions/rubberstretch.inx
[type: gettext/xml] share/extensions/sk1_output.inx
[type: gettext/xml] share/extensions/sk_input.inx
[type: gettext/xml] share/extensions/spirograph.inx
+[type: gettext/xml] share/extensions/split.inx
[type: gettext/xml] share/extensions/straightseg.inx
[type: gettext/xml] share/extensions/summersnight.inx
+[type: gettext/xml] share/extensions/svg2fxg.inx
[type: gettext/xml] share/extensions/svg2xaml.inx
[type: gettext/xml] share/extensions/svg_and_media_zip_output.inx
[type: gettext/xml] share/extensions/svgcalendar.inx
[type: gettext/xml] share/extensions/text_lowercase.inx
[type: gettext/xml] share/extensions/text_randomcase.inx
[type: gettext/xml] share/extensions/text_replace.inx
-[type: gettext/xml] share/extensions/text_sentencecase.inx
[type: gettext/xml] share/extensions/text_titlecase.inx
[type: gettext/xml] share/extensions/text_uppercase.inx
[type: gettext/xml] share/extensions/triangle.inx
[type: gettext/xml] share/extensions/txt2svg.inx
+[type: gettext/xml] share/extensions/webslicer_create_group.inx
+[type: gettext/xml] share/extensions/webslicer_create_rect.inx
+[type: gettext/xml] share/extensions/webslicer_export.inx
[type: gettext/xml] share/extensions/web-set-att.inx
[type: gettext/xml] share/extensions/web-transmit-att.inx
[type: gettext/xml] share/extensions/whirl.inx
[type: gettext/xml] share/extensions/wmf_input.inx
[type: gettext/xml] share/extensions/wmf_output.inx
[type: gettext/xml] share/extensions/xaml2svg.inx
-[type: gettext/xml] src/extension/dxf2svg/dxf_input.inx
-[type: gettext/xml] src/extension/dxf2svg/dxf_input_windows.inx
cxxtest/cxxtestgen.py
inkscape.desktop.in
share/extensions/dimension.py
share/extensions/embedimage.py
share/extensions/export_gimp_palette.py
share/extensions/extractimage.py
+share/extensions/gcodetools.py
share/extensions/guides_creator.py
share/extensions/inkex.py
share/extensions/markers_strokepaint.py
share/extensions/uniconv_output.py
share/extensions/web-set-att.py
share/extensions/web-transmit-att.py
-share/filters/filters.svg.h
share/filters/i18n.py
+share/filters/filters.svg.h
+share/palettes/palettes.h
share/patterns/i18n.py
share/patterns/patterns.svg.h
+src/conn-avoid-ref.cpp
+src/connector-context.h
+src/live_effects/lpe-extrude.cpp
+src/sp-flowtext.cpp
src/arc-context.cpp
src/box3d-context.cpp
src/box3d.cpp
src/inkscape.cpp
src/interface.cpp
src/io/sys.cpp
-src/jabber_whiteboard/invitation-confirm-dialog.cpp
-src/jabber_whiteboard/message-queue.cpp
-src/jabber_whiteboard/message-utilities.cpp
-src/jabber_whiteboard/pedrogui.cpp
-src/jabber_whiteboard/session-file-selector.cpp
-src/jabber_whiteboard/session-manager.cpp
src/knot.cpp
src/knotholder.cpp
src/libgdl/gdl-dock-bar.c
src/libgdl/gdl-switcher.c
src/libnrtype/FontFactory.cpp
src/live_effects/effect.cpp
-src/live_effects/lpe-angle_bisector.cpp
src/live_effects/lpe-bendpath.cpp
-src/live_effects/lpe-boolops.cpp
-src/live_effects/lpe-circle_with_radius.cpp
src/live_effects/lpe-constructgrid.cpp
-src/live_effects/lpe-copy_rotate.cpp
src/live_effects/lpe-curvestitch.cpp
-src/live_effects/lpe-dynastroke.cpp
src/live_effects/lpe-envelope.cpp
src/live_effects/lpe-gears.cpp
src/live_effects/lpe-interpolate.cpp
src/live_effects/lpe-knot.cpp
-src/live_effects/lpe-lattice.cpp
-src/live_effects/lpe-line_segment.cpp
-src/live_effects/lpe-mirror_symmetry.cpp
-src/live_effects/lpe-offset.cpp
-src/live_effects/lpe-parallel.cpp
-src/live_effects/lpe-path_length.cpp
src/live_effects/lpe-patternalongpath.cpp
-src/live_effects/lpe-perp_bisector.cpp
-src/live_effects/lpe-perspective_path.cpp
-src/live_effects/lpe-recursiveskeleton.cpp
src/live_effects/lpe-rough-hatches.cpp
src/live_effects/lpe-ruler.cpp
-src/live_effects/lpe-skeleton.cpp
src/live_effects/lpe-sketch.cpp
-src/live_effects/lpe-tangent_to_curve.cpp
-src/live_effects/lpe-test-doEffect-stack.cpp
-src/live_effects/lpe-text_label.cpp
src/live_effects/lpe-vonkoch.cpp
src/live_effects/parameter/bool.cpp
src/live_effects/parameter/enum.h
src/live_effects/parameter/text.cpp
src/live_effects/parameter/unit.cpp
src/live_effects/parameter/vector.cpp
-src/lpe-tool-context.cpp
src/main-cmdlineact.cpp
src/main.cpp
src/menus-skeleton.h
-src/node-context.cpp
-src/nodepath.cpp
src/object-edit.cpp
src/path-chemistry.cpp
src/pen-context.cpp
src/sp-lpe-item.cpp
src/sp-namedview.cpp
src/sp-offset.cpp
+src/sp-path.cpp
src/sp-polygon.cpp
src/sp-polyline.cpp
src/sp-rect.cpp
src/sp-spiral.cpp
+src/sp-star.cpp
src/sp-text.cpp
src/sp-tref.cpp
src/sp-tspan.cpp
src/sp-use.cpp
-<<<<<<< TREE
src/spiral-context.cpp
src/splivarot.cpp
-=======
src/spray-context.cpp
->>>>>>> MERGE-SOURCE
src/star-context.cpp
src/text-chemistry.cpp
src/text-context.cpp
src/ui/dialog/aboutbox.cpp
src/ui/dialog/align-and-distribute.cpp
src/ui/dialog/calligraphic-profile-rename.cpp
+src/ui/dialog/color-item.cpp
src/ui/dialog/debug.cpp
src/ui/dialog/document-metadata.cpp
src/ui/dialog/document-properties.cpp
src/ui/dialog/fill-and-stroke.cpp
src/ui/dialog/filter-effects-dialog.cpp
src/ui/dialog/find.cpp
+src/ui/dialog/glyphs.cpp
src/ui/dialog/guides.cpp
src/ui/dialog/icon-preview.cpp
src/ui/dialog/inkscape-preferences.cpp
+src/ui/dialog/input.cpp
src/ui/dialog/layer-properties.cpp
src/ui/dialog/layers.cpp
src/ui/dialog/livepatheffect-editor.cpp
src/ui/dialog/print.cpp
src/ui/dialog/print-colors-preview-dialog.cpp
src/ui/dialog/scriptdialog.cpp
-src/ui/dialog/session-player.cpp
src/ui/dialog/svg-fonts-dialog.cpp
src/ui/dialog/swatches.cpp
src/ui/dialog/tile.cpp
src/ui/dialog/tracedialog.cpp
src/ui/dialog/transformation.cpp
-src/ui/dialog/whiteboard-connect.cpp
-src/ui/dialog/whiteboard-sharewithchat.cpp
-src/ui/dialog/whiteboard-sharewithuser.cpp
src/ui/tool/curve-drag-point.cpp
src/ui/tool/multi-path-manipulator.cpp
src/ui/tool/node-tool.cpp
src/ui/tool/node.cpp
src/ui/tool/path-manipulator.cpp
src/ui/tool/transform-handle-set.cpp
-src/ui/view/edit-widget.cpp
src/ui/widget/combo-enums.h
src/ui/widget/entity-entry.cpp
src/ui/widget/filter-effect-chooser.cpp
src/widgets/sp-xmlview-attr-list.cpp
src/widgets/sp-xmlview-content.cpp
src/widgets/stroke-style.cpp
+src/widgets/swatch-selector.cpp
src/widgets/toolbox.cpp
share/extensions/dimension.py
share/extensions/draw_from_triangle.py
[type: gettext/xml] share/extensions/cdt_input.inx
[type: gettext/xml] share/extensions/cgm_input.inx
[type: gettext/xml] share/extensions/cmx_input.inx
+[type: gettext/xml] share/extensions/color_blackandwhite.inx
[type: gettext/xml] share/extensions/color_brighter.inx
[type: gettext/xml] share/extensions/color_custom.inx
[type: gettext/xml] share/extensions/color_darker.inx
[type: gettext/xml] share/extensions/fractalize.inx
[type: gettext/xml] share/extensions/funcplot.inx
[type: gettext/xml] share/extensions/gears.inx
+[type: gettext/xml] share/extensions/gcodetools_all_in_one.inx
+[type: gettext/xml] share/extensions/gcodetools_area.inx
+[type: gettext/xml] share/extensions/gcodetools_check_for_updates.inx
+[type: gettext/xml] share/extensions/gcodetools_dxf_points.inx
+[type: gettext/xml] share/extensions/gcodetools_engraving.inx
+[type: gettext/xml] share/extensions/gcodetools_lathe.inx
+[type: gettext/xml] share/extensions/gcodetools_orientation_points.inx
+[type: gettext/xml] share/extensions/gcodetools_path_to_gcode.inx
+[type: gettext/xml] share/extensions/gcodetools_tools_library.inx
[type: gettext/xml] share/extensions/gimp_xcf.inx
[type: gettext/xml] share/extensions/grid_cartesian.inx
[type: gettext/xml] share/extensions/grid_polar.inx
[type: gettext/xml] share/extensions/guides_creator.inx
+[type: gettext/xml] share/extensions/guillotine.inx
[type: gettext/xml] share/extensions/handles.inx
[type: gettext/xml] share/extensions/hpgl_output.inx
[type: gettext/xml] share/extensions/inkscape_help_askaquestion.inx
[type: gettext/xml] share/extensions/render_alphabetsoup.inx
[type: gettext/xml] share/extensions/render_barcode.inx
[type: gettext/xml] share/extensions/render_barcode_datamatrix.inx
+[type: gettext/xml] share/extensions/replace_font.inx
[type: gettext/xml] share/extensions/restack.inx
[type: gettext/xml] share/extensions/rtree.inx
[type: gettext/xml] share/extensions/rubberstretch.inx
[type: gettext/xml] share/extensions/sk1_output.inx
[type: gettext/xml] share/extensions/sk_input.inx
[type: gettext/xml] share/extensions/spirograph.inx
+[type: gettext/xml] share/extensions/split.inx
[type: gettext/xml] share/extensions/straightseg.inx
[type: gettext/xml] share/extensions/summersnight.inx
[type: gettext/xml] share/extensions/svg2xaml.inx