Code

Merge from trunk.
[inkscape.git] / po / POTFILES.in
index 6bd2da7568b15b49dc78f5a9ee470fabc041bd69..f7a26e27a8290d4d93df93fa5c2a70d4be896235 100644 (file)
@@ -158,8 +158,9 @@ share/extensions/svg_and_media_zip_output.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
@@ -401,7 +402,6 @@ 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