[dia] Updated FSF's address



commit 8ec4b20cc1c60fc5749df443c7fe2b931c43db8c
Author: Daniel Mustieles <daniel mustieles gmail com>
Date:   Thu Jan 23 12:57:02 2014 +0100

    Updated FSF's address

 acinclude.m4                              |    4 +-
 app/app_procs.c                           |    3 +-
 app/app_procs.h                           |    3 +-
 app/authors.h                             |    3 +-
 app/autosave.c                            |    3 +-
 app/autosave.h                            |    3 +-
 app/color_area.c                          |    3 +-
 app/color_area.h                          |    3 +-
 app/commands.c                            | 1012 +----------------------------
 app/commands.h                            |    3 +-
 app/confirm.c                             |    3 +-
 app/connectionpoint_ops.c                 |    3 +-
 app/connectionpoint_ops.h                 |    3 +-
 app/create_object.c                       |    3 +-
 app/create_object.h                       |    3 +-
 app/cursor.c                              |    3 +-
 app/cursor.h                              |    3 +-
 app/cut_n_paste.c                         |    3 +-
 app/cut_n_paste.h                         |    3 +-
 app/defaults.c                            |    3 +-
 app/defaults.h                            |    3 +-
 app/dia-props.c                           |    3 +-
 app/dia-props.h                           |    3 +-
 app/diagram.c                             |    3 +-
 app/diagram.h                             |    3 +-
 app/diagram_tree_model.c                  |    3 +-
 app/diagram_tree_view.c                   |    3 +-
 app/diapagelayout.c                       |    3 +-
 app/diapagelayout.h                       |    3 +-
 app/disp_callbacks.c                      |    3 +-
 app/disp_callbacks.h                      |    3 +-
 app/display.c                             |    3 +-
 app/display.h                             |    3 +-
 app/dynamic_refresh.c                     |    3 +-
 app/dynamic_refresh.h                     |    3 +-
 app/exit_dialog.c                         |    3 +-
 app/exit_dialog.h                         |    3 +-
 app/filedlg.c                             |    3 +-
 app/filedlg.h                             |    3 +-
 app/find-and-replace.c                    |    3 +-
 app/find-and-replace.h                    |    3 +-
 app/grid.c                                |    3 +-
 app/grid.h                                |    3 +-
 app/gtkhwrapbox.c                         |    4 +-
 app/gtkhwrapbox.h                         |    4 +-
 app/gtkvwrapbox.c                         |    4 +-
 app/gtkvwrapbox.h                         |    4 +-
 app/gtkwrapbox.c                          |    4 +-
 app/gtkwrapbox.h                          |    4 +-
 app/handle_ops.c                          |    3 +-
 app/handle_ops.h                          |    3 +-
 app/highlight.c                           |    3 +-
 app/highlight.h                           |    3 +-
 app/interface.c                           |    3 +-
 app/interface.h                           |    3 +-
 app/layer_dialog.c                        |    3 +-
 app/layer_dialog.h                        |    3 +-
 app/linewidth_area.c                      |    3 +-
 app/linewidth_area.h                      |    3 +-
 app/load_save.c                           |    3 +-
 app/load_save.h                           |    3 +-
 app/magnify.c                             |    3 +-
 app/magnify.h                             |    3 +-
 app/main.c                                |    3 +-
 app/menus.c                               |    3 +-
 app/menus.h                               |    3 +-
 app/modify_tool.c                         |    3 +-
 app/modify_tool.h                         |    3 +-
 app/navigation.c                          |    3 +-
 app/navigation.h                          |    3 +-
 app/object_ops.c                          |    3 +-
 app/object_ops.h                          |    3 +-
 app/pagesetup.c                           |    3 +-
 app/pagesetup.h                           |    3 +-
 app/plugin-manager.c                      |    3 +-
 app/plugin-manager.h                      |    3 +-
 app/preferences.c                         |    3 +-
 app/preferences.h                         |    3 +-
 app/properties-dialog.c                   |    3 +-
 app/properties-dialog.h                   |    3 +-
 app/recent_files.c                        |    3 +-
 app/recent_files.h                        |    3 +-
 app/render_gdk.c                          |    3 +-
 app/render_gdk.h                          |    3 +-
 app/ruler.c                               |    3 +-
 app/scroll_tool.c                         |    3 +-
 app/scroll_tool.h                         |    3 +-
 app/select.c                              |    3 +-
 app/select.h                              |    3 +-
 app/sheets.c                              |    3 +-
 app/sheets.h                              |    3 +-
 app/sheets_dialog.c                       |    3 +-
 app/sheets_dialog_callbacks.c             |    3 +-
 app/sheets_dialog_callbacks.h             |    3 +-
 app/textedit.c                            |    3 +-
 app/textedit.h                            |    3 +-
 app/textedit_tool.c                       |    3 +-
 app/textedit_tool.h                       |    3 +-
 app/tool.c                                |    3 +-
 app/tool.h                                |    3 +-
 app/toolbox.c                             |    3 +-
 app/undo.c                                |    3 +-
 app/undo.h                                |    3 +-
 bindings/dia-connections.cpp              |    3 +-
 bindings/dia-diagramdata.cpp              |    3 +-
 bindings/dia-extra.cpp                    |    3 +-
 bindings/dia-object.cpp                   |    3 +-
 bindings/dia-properties.cpp               |    3 +-
 bindings/dia-python-extra.cpp             |    3 +-
 bindings/dia-renderer.cpp                 |    3 +-
 installer/win32/dia.nsi                   |    3 +-
 lib/arrows.c                              |    3 +-
 lib/arrows.h                              |    3 +-
 lib/attributes.c                          |    3 +-
 lib/attributes.h                          |    3 +-
 lib/autoroute.c                           |    3 +-
 lib/autoroute.h                           |    3 +-
 lib/bezier-common.c                       |    3 +-
 lib/bezier-common.h                       |    3 +-
 lib/bezier_conn.c                         |    3 +-
 lib/bezier_conn.h                         |    3 +-
 lib/beziershape.c                         |    3 +-
 lib/beziershape.h                         |    3 +-
 lib/boundingbox.c                         |    3 +-
 lib/boundingbox.h                         |    3 +-
 lib/color.c                               |    3 +-
 lib/color.h                               |    3 +-
 lib/connection.c                          |    3 +-
 lib/connection.h                          |    3 +-
 lib/connectionpoint.c                     |    3 +-
 lib/connectionpoint.h                     |    3 +-
 lib/connpoint_line.c                      |    3 +-
 lib/connpoint_line.h                      |    3 +-
 lib/create.c                              |    3 +-
 lib/create.h                              |    3 +-
 lib/debug.c                               |    3 +-
 lib/debug.h                               |    3 +-
 lib/dia_dirs.c                            |    3 +-
 lib/dia_dirs.h                            |    3 +-
 lib/dia_image.c                           |    3 +-
 lib/dia_image.h                           |    3 +-
 lib/dia_svg.c                             |    3 +-
 lib/dia_svg.h                             |    3 +-
 lib/dia_xml.c                             |    3 +-
 lib/dia_xml.h                             |    3 +-
 lib/dia_xml_libxml.h                      |    3 +-
 lib/diaarrowchooser.c                     |    3 +-
 lib/diaarrowchooser.h                     |    3 +-
 lib/diaarrowselector.c                    |    3 +-
 lib/diacellrendererproperty.c             |    3 +-
 lib/diacellrendererproperty.h             |    3 +-
 lib/diacolorselector.c                    |    3 +-
 lib/diacontext.c                          |    3 +-
 lib/diadynamicmenu.c                      |    3 +-
 lib/diaerror.c                            |    3 +-
 lib/diaerror.h                            |    3 +-
 lib/diafontselector.c                     |    3 +-
 lib/diafontselector.h                     |    3 +-
 lib/diagdkrenderer.c                      |    3 +-
 lib/diagramdata.c                         |    3 +-
 lib/diagramdata.h                         |    3 +-
 lib/diainteractiverenderer.c              |    3 +-
 lib/dialib.c                              |    3 +-
 lib/dialinechooser.c                      |    3 +-
 lib/dialinechooser.h                      |    3 +-
 lib/dialinestyleselector.c                |    3 +-
 lib/dialogs.c                             |    3 +-
 lib/dialogs.h                             |    3 +-
 lib/diamenu.h                             |    3 +-
 lib/diaoptionmenu.c                       |    3 +-
 lib/diaoptionmenu.h                       |    3 +-
 lib/diapathrenderer.c                     |    3 +-
 lib/diapathrenderer.h                     |    3 +-
 lib/diarenderer.c                         |    3 +-
 lib/diarenderer.h                         |    3 +-
 lib/diasvgrenderer.c                      |    3 +-
 lib/diatransform.c                        |    3 +-
 lib/diatransformrenderer.c                |    3 +-
 lib/diatransformrenderer.h                |    3 +-
 lib/diatypes.h                            |    3 +-
 lib/dummy_dep.h                           |    3 +-
 lib/dynamic_obj.c                         |    3 +-
 lib/dynamic_obj.h                         |    3 +-
 lib/element.c                             |    3 +-
 lib/element.h                             |    3 +-
 lib/filter.c                              |    3 +-
 lib/filter.h                              |    3 +-
 lib/focus.c                               |    3 +-
 lib/focus.h                               |    3 +-
 lib/font-height.c                         |    3 +-
 lib/font.c                                |    3 +-
 lib/font.h                                |    3 +-
 lib/geometry.c                            |    3 +-
 lib/geometry.h                            |    3 +-
 lib/group.c                               |    3 +-
 lib/group.h                               |    3 +-
 lib/handle.h                              |    3 +-
 lib/layer.c                               |    3 +-
 lib/message.c                             |    3 +-
 lib/message.h                             |    3 +-
 lib/objchange.c                           |    3 +-
 lib/objchange.h                           |    3 +-
 lib/object-alias.c                        |    3 +-
 lib/object.c                              |    3 +-
 lib/object.h                              |    3 +-
 lib/object_defaults.c                     |    3 +-
 lib/orth_conn.c                           |    3 +-
 lib/orth_conn.h                           |    3 +-
 lib/paper.c                               |    3 +-
 lib/paper.h                               |    3 +-
 lib/parent.c                              |    3 +-
 lib/parent.h                              |    3 +-
 lib/pattern.c                             |    3 +-
 lib/pattern.h                             |    3 +-
 lib/persistence.c                         |    3 +-
 lib/persistence.h                         |    3 +-
 lib/plug-ins.c                            |    3 +-
 lib/plug-ins.h                            |    3 +-
 lib/poly_conn.c                           |    3 +-
 lib/poly_conn.h                           |    3 +-
 lib/polyshape.c                           |    3 +-
 lib/polyshape.h                           |    3 +-
 lib/prefs.c                               |    3 +-
 lib/prefs.h                               |    3 +-
 lib/prop_attr.c                           |    3 +-
 lib/prop_attr.h                           |    3 +-
 lib/prop_basic.c                          |    3 +-
 lib/prop_basic.h                          |    3 +-
 lib/prop_dict.c                           |    3 +-
 lib/prop_dict.h                           |    3 +-
 lib/prop_geomtypes.c                      |    3 +-
 lib/prop_geomtypes.h                      |    3 +-
 lib/prop_inttypes.c                       |    3 +-
 lib/prop_inttypes.h                       |    3 +-
 lib/prop_matrix.c                         |    3 +-
 lib/prop_matrix.h                         |    3 +-
 lib/prop_pattern.c                        |    3 +-
 lib/prop_pattern.h                        |    3 +-
 lib/prop_pixbuf.c                         |    3 +-
 lib/prop_pixbuf.h                         |    3 +-
 lib/prop_sdarray.c                        |    3 +-
 lib/prop_sdarray.h                        |    3 +-
 lib/prop_sdarray_widget.c                 |    3 +-
 lib/prop_text.c                           |    3 +-
 lib/prop_text.h                           |    3 +-
 lib/prop_widgets.c                        |    3 +-
 lib/prop_widgets.h                        |    3 +-
 lib/propdesc.c                            |    3 +-
 lib/propdialogs.c                         |    3 +-
 lib/properties.c                          |    3 +-
 lib/properties.h                          |    3 +-
 lib/propinternals.h                       |    3 +-
 lib/proplist.c                            |    3 +-
 lib/propobject.c                          |    3 +-
 lib/propoffsets.c                         |    3 +-
 lib/propregistry.c                        |    3 +-
 lib/render_pixmap.c                       |    3 +-
 lib/render_pixmap.h                       |    3 +-
 lib/sheet.c                               |    3 +-
 lib/sheet.h                               |    3 +-
 lib/standard-path.c                       |    3 +-
 lib/standard-path.h                       |    3 +-
 lib/text.c                                |    3 +-
 lib/text.h                                |    3 +-
 lib/textattr.h                            |    3 +-
 lib/textline.c                            |    3 +-
 lib/textline.h                            |    3 +-
 lib/units.h                               |    3 +-
 lib/utils.c                               |    3 +-
 lib/utils.h                               |    3 +-
 lib/widgets.c                             |    3 +-
 lib/widgets.h                             |    3 +-
 objects/AADL/aadl.c                       |    3 +-
 objects/AADL/aadl.h                       |    3 +-
 objects/AADL/aadlbox.c                    |    3 +-
 objects/AADL/aadlbus.c                    |    3 +-
 objects/AADL/aadldata.c                   |    3 +-
 objects/AADL/aadldevice.c                 |    3 +-
 objects/AADL/aadlmemory.c                 |    3 +-
 objects/AADL/aadlpackage.c                |    3 +-
 objects/AADL/aadlport.c                   |   22 +-
 objects/AADL/aadlprocess.c                |    3 +-
 objects/AADL/aadlprocessor.c              |    3 +-
 objects/AADL/aadlsubprogram.c             |    3 +-
 objects/AADL/aadlsystem.c                 |    3 +-
 objects/AADL/aadltext.c                   |    3 +-
 objects/AADL/aadlthread.c                 |    3 +-
 objects/AADL/aadlthreadgroup.c            |    3 +-
 objects/AADL/edit_port_declaration.c      |    3 +-
 objects/AADL/edit_port_declaration.h      |    3 +-
 objects/Database/compound.c               |    3 +-
 objects/Database/database.c               |    3 +-
 objects/Database/database.h               |    3 +-
 objects/Database/reference.c              |    3 +-
 objects/Database/table.c                  |    3 +-
 objects/ER/attribute.c                    |    3 +-
 objects/ER/entity.c                       |    3 +-
 objects/ER/er.c                           |    3 +-
 objects/ER/participation.c                |    3 +-
 objects/ER/relationship.c                 |    3 +-
 objects/FS/flow-ortho.c                   |    3 +-
 objects/FS/flow.c                         |    3 +-
 objects/FS/fs.c                           |    3 +-
 objects/FS/function.c                     |    3 +-
 objects/GRAFCET/action.c                  |    3 +-
 objects/GRAFCET/action_text_draw.c        |    3 +-
 objects/GRAFCET/action_text_draw.h        |    3 +-
 objects/GRAFCET/boolequation.c            |    3 +-
 objects/GRAFCET/boolequation.h            |    3 +-
 objects/GRAFCET/condition.c               |    3 +-
 objects/GRAFCET/grafcet.c                 |    3 +-
 objects/GRAFCET/grafcet.h                 |    3 +-
 objects/GRAFCET/step.c                    |    3 +-
 objects/GRAFCET/transition.c              |    3 +-
 objects/GRAFCET/vector.c                  |    3 +-
 objects/GRAFCET/vergent.c                 |    3 +-
 objects/Istar/actor.c                     |    3 +-
 objects/Istar/goal.c                      |    3 +-
 objects/Istar/istar.c                     |    3 +-
 objects/Istar/istar.h                     |    3 +-
 objects/Istar/link.c                      |    3 +-
 objects/Istar/other.c                     |    3 +-
 objects/Jackson/domain.c                  |    3 +-
 objects/Jackson/jackson.c                 |    3 +-
 objects/Jackson/jackson.h                 |    3 +-
 objects/Jackson/phenomenon.c              |    3 +-
 objects/Jackson/requirement.c             |    3 +-
 objects/KAOS/goal.c                       |    3 +-
 objects/KAOS/kaos.c                       |    3 +-
 objects/KAOS/kaos.h                       |    3 +-
 objects/KAOS/metaandorrel.c               |    3 +-
 objects/KAOS/metabinrel.c                 |    3 +-
 objects/KAOS/other.c                      |    3 +-
 objects/Misc/analog_clock.c               |    3 +-
 objects/Misc/diagram_as_object.c          |    3 +-
 objects/Misc/grid_object.c                |    3 +-
 objects/Misc/libmisc.c                    |    3 +-
 objects/Misc/measure.c                    |    3 +-
 objects/Misc/tree.c                       |    3 +-
 objects/SADT/annotation.c                 |    3 +-
 objects/SADT/arrow.c                      |    3 +-
 objects/SADT/box.c                        |    3 +-
 objects/SADT/sadt.c                       |    3 +-
 objects/SADT/sadt.h                       |    3 +-
 objects/UML/activity.c                    |    3 +-
 objects/UML/actor.c                       |    3 +-
 objects/UML/association.c                 |    3 +-
 objects/UML/branch.c                      |    3 +-
 objects/UML/class.c                       |    3 +-
 objects/UML/class.h                       |    3 +-
 objects/UML/class_attributes_dialog.c     |    3 +-
 objects/UML/class_dialog.c                |    3 +-
 objects/UML/class_operations_dialog.c     |    3 +-
 objects/UML/class_templates_dialog.c      |    3 +-
 objects/UML/classicon.c                   |    3 +-
 objects/UML/component.c                   |    3 +-
 objects/UML/component_feature.c           |    3 +-
 objects/UML/constraint.c                  |    3 +-
 objects/UML/dependency.c                  |    3 +-
 objects/UML/fork.c                        |    3 +-
 objects/UML/generalization.c              |    3 +-
 objects/UML/implements.c                  |    3 +-
 objects/UML/large_package.c               |    3 +-
 objects/UML/lifeline.c                    |    3 +-
 objects/UML/message.c                     |    3 +-
 objects/UML/node.c                        |    3 +-
 objects/UML/note.c                        |    3 +-
 objects/UML/object.c                      |    3 +-
 objects/UML/realizes.c                    |    3 +-
 objects/UML/small_package.c               |    3 +-
 objects/UML/state.c                       |    3 +-
 objects/UML/state_term.c                  |    3 +-
 objects/UML/stereotype.c                  |    3 +-
 objects/UML/stereotype.h                  |    3 +-
 objects/UML/transition.c                  |    3 +-
 objects/UML/uml.c                         |    3 +-
 objects/UML/uml.h                         |    3 +-
 objects/UML/umlattribute.c                |    3 +-
 objects/UML/umlformalparameter.c          |    3 +-
 objects/UML/umloperation.c                |    3 +-
 objects/UML/umlparameter.c                |    3 +-
 objects/UML/usecase.c                     |    3 +-
 objects/chronogram/chronogram.c           |    3 +-
 objects/chronogram/chronogram.h           |    3 +-
 objects/chronogram/chronoline.c           |    3 +-
 objects/chronogram/chronoline_event.c     |    3 +-
 objects/chronogram/chronoline_event.h     |    3 +-
 objects/chronogram/chronoref.c            |    3 +-
 objects/custom/custom.c                   |    3 +-
 objects/custom/custom_object.c            |    3 +-
 objects/custom/custom_object.h            |    3 +-
 objects/custom/custom_util.c              |    3 +-
 objects/custom/custom_util.h              |    3 +-
 objects/custom/shape_info.c               |    3 +-
 objects/custom/shape_info.h               |    3 +-
 objects/custom/shape_typeinfo.c           |    3 +-
 objects/custom_lines/custom_lines.c       |    3 +-
 objects/custom_lines/custom_linetypes.c   |    3 +-
 objects/custom_lines/custom_linetypes.h   |    3 +-
 objects/custom_lines/line_info.c          |    3 +-
 objects/custom_lines/line_info.h          |    3 +-
 objects/custom_lines/pixmaps/default.xpm  |    3 +-
 objects/flowchart/box.c                   |    3 +-
 objects/flowchart/diamond.c               |    3 +-
 objects/flowchart/ellipse.c               |    3 +-
 objects/flowchart/flowchart.c             |    3 +-
 objects/flowchart/parallelogram.c         |    3 +-
 objects/network/basestation.c             |    3 +-
 objects/network/bus.c                     |    3 +-
 objects/network/network.c                 |    3 +-
 objects/network/network.h                 |    3 +-
 objects/network/radiocell.c               |    3 +-
 objects/network/wanlink.c                 |    3 +-
 objects/standard/arc.c                    |    3 +-
 objects/standard/bezier.c                 |    3 +-
 objects/standard/beziergon.c              |    3 +-
 objects/standard/box.c                    |    3 +-
 objects/standard/ellipse.c                |    3 +-
 objects/standard/image.c                  |    3 +-
 objects/standard/line.c                   |    3 +-
 objects/standard/outline.c                |    3 +-
 objects/standard/polygon.c                |    3 +-
 objects/standard/polyline.c               |    3 +-
 objects/standard/standard.c               |    3 +-
 objects/standard/textobj.c                |    3 +-
 objects/standard/zigzagline.c             |    3 +-
 plug-ins/cairo/diacairo-interactive.c     |    3 +-
 plug-ins/cairo/diacairo-print.c           |    3 +-
 plug-ins/cairo/diacairo-renderer.c        |    3 +-
 plug-ins/cairo/diacairo.c                 |    3 +-
 plug-ins/cairo/diacairo.h                 |    3 +-
 plug-ins/cgm/cgm.c                        |    3 +-
 plug-ins/drs/dia-render-script-import.c   |    3 +-
 plug-ins/drs/dia-render-script-renderer.c |    3 +-
 plug-ins/drs/dia-render-script-renderer.h |    3 +-
 plug-ins/drs/dia-render-script.c          |    3 +-
 plug-ins/drs/dia-render-script.h          |    3 +-
 plug-ins/dxf/autocad_pal.c                |    3 +-
 plug-ins/dxf/autocad_pal.h                |    3 +-
 plug-ins/dxf/dxf-export.c                 |    3 +-
 plug-ins/dxf/dxf-import.c                 |    3 +-
 plug-ins/dxf/dxf.c                        |    3 +-
 plug-ins/hpgl/hpgl.c                      |    3 +-
 plug-ins/layout/dia-graph.cpp             |    3 +-
 plug-ins/layout/layout.cpp                |    3 +-
 plug-ins/libart/dialibart.c               |    3 +-
 plug-ins/libart/dialibartrenderer.c       |    3 +-
 plug-ins/libart/export_png.c              |    3 +-
 plug-ins/libart/render_libart.c           |    3 +-
 plug-ins/libart/render_libart.h           |    3 +-
 plug-ins/metapost/metapost.c              |    3 +-
 plug-ins/metapost/render_metapost.c       |    3 +-
 plug-ins/metapost/render_metapost.h       |    3 +-
 plug-ins/pdf/pdf-import.cpp               |    3 +-
 plug-ins/pdf/pdf.c                        |    3 +-
 plug-ins/pgf/render_pgf.c                 |    3 +-
 plug-ins/pgf/render_pgf.h                 |    3 +-
 plug-ins/pixbuf/pixbuf.c                  |    3 +-
 plug-ins/postscript/diapsft2renderer.c    |    3 +-
 plug-ins/postscript/diapsrenderer.c       |    3 +-
 plug-ins/postscript/paginate_psprint.c    |    3 +-
 plug-ins/postscript/paginate_psprint.h    |    3 +-
 plug-ins/postscript/postscript.c          |    3 +-
 plug-ins/postscript/ps-utf8.c             |    3 +-
 plug-ins/postscript/ps-utf8.h             |    3 +-
 plug-ins/postscript/render_eps.c          |    3 +-
 plug-ins/postscript/render_eps.h          |    3 +-
 plug-ins/postscript/win32print.c          |    3 +-
 plug-ins/pstricks/render_pstricks.c       |    3 +-
 plug-ins/pstricks/render_pstricks.h       |    3 +-
 plug-ins/shape/shape-export.c             |    3 +-
 plug-ins/shape/shape.c                    |    3 +-
 plug-ins/stress/stress-memory.c           |    3 +-
 plug-ins/stress/stress.c                  |    3 +-
 plug-ins/svg/render_svg.c                 |    3 +-
 plug-ins/svg/svg-import.c                 |    3 +-
 plug-ins/svg/svg.c                        |    3 +-
 plug-ins/vdx/vdx-common.c                 |    3 +-
 plug-ins/vdx/vdx-export.c                 |    3 +-
 plug-ins/vdx/vdx-import.c                 |    3 +-
 plug-ins/vdx/vdx-xml.c                    |    3 +-
 plug-ins/vdx/vdx.c                        |    3 +-
 plug-ins/vdx/vdx.h                        |    3 +-
 plug-ins/vdx/visio-types.h                |    3 +-
 plug-ins/wmf/paginate_gdiprint.cpp        |    3 +-
 plug-ins/wmf/wmf.cpp                      |    3 +-
 plug-ins/wmf/wmf_gdi.cpp                  |    3 +-
 plug-ins/wpg/wpg.c                        |    3 +-
 plug-ins/xfig/xfig-export.c               |    3 +-
 plug-ins/xfig/xfig-import.c               |    3 +-
 plug-ins/xfig/xfig.c                      |    3 +-
 plug-ins/xslt/dia-uml.xsl                 |    3 +-
 plug-ins/xslt/dia-uml2c++.xsl             |    3 +-
 plug-ins/xslt/dia-uml2componentlist.xsl   |    3 +-
 plug-ins/xslt/dia-uml2cpp.xsl             |  477 +--------------
 plug-ins/xslt/dia-uml2idl.xsl             |    3 +-
 plug-ins/xslt/dia-uml2java.xsl            |    3 +-
 plug-ins/xslt/dia-uml2python.xsl          |    3 +-
 plug-ins/xslt/xslt.c                      |    3 +-
 plug-ins/xslt/xslt.h                      |    3 +-
 plug-ins/xslt/xsltdialog.c                |    3 +-
 po-checktrans.py                          |    3 +-
 po/am.po                                  |    3 +-
 po/ar.po                                  |    3 +-
 po/ast.po                                 |   18 +-
 po/az.po                                  |    3 +-
 po/be.po                                  |    3 +-
 po/bg.po                                  |   19 +-
 po/bs.po                                  |    3 +-
 po/ca.po                                  |   19 +-
 po/ca valencia po                         |   18 +-
 po/cs.po                                  |   16 +-
 po/da.po                                  |    3 +-
 po/de.po                                  |   18 +-
 po/dz.po                                  |    3 +-
 po/el.po                                  |   17 +-
 po/en_CA.po                               |   17 +-
 po/en_GB.po                               |   17 +-
 po/eo.po                                  |    3 +-
 po/es.po                                  |    3 +-
 po/eu.po                                  |   16 +-
 po/fi.po                                  |   17 +-
 po/fr.po                                  |    3 +-
 po/ga.po                                  |    3 +-
 po/gl.po                                  |   18 +-
 po/gu.po                                  |    3 +-
 po/hr.po                                  |    3 +-
 po/hu.po                                  |   16 +-
 po/id.po                                  |    3 +-
 po/is.po                                  |    3 +-
 po/it.po                                  |    3 +-
 po/ja.po                                  |    3 +-
 po/kn.po                                  |   17 +-
 po/ko.po                                  |   17 +-
 po/lt.po                                  |   17 +-
 po/lv.po                                  |   17 +-
 po/mk.po                                  |    3 +-
 po/ml.po                                  |    3 +-
 po/mn.po                                  |    3 +-
 po/mr.po                                  |   17 +-
 po/ms.po                                  |    3 +-
 po/nb.po                                  |    3 +-
 po/ne.po                                  |   15 +-
 po/nl.po                                  |    3 +-
 po/nn.po                                  |    3 +-
 po/oc.po                                  |    3 +-
 po/pl.po                                  |   19 +-
 po/pt.po                                  |   18 +-
 po/pt_BR.po                               |   17 +-
 po/ro.po                                  |   19 +-
 po/ru.po                                  |    3 +-
 po/rw.po                                  |    3 +-
 po/sk.po                                  |    3 +-
 po/sl.po                                  |   17 +-
 po/sq.po                                  |    3 +-
 po/sr.po                                  |    3 +-
 po/sr Latn po                             |    3 +-
 po/sr latin po                            |    3 +-
 po/sv.po                                  |    3 +-
 po/th.po                                  |    3 +-
 po/tr.po                                  |    3 +-
 po/uk.po                                  |   17 +-
 po/vi.po                                  |    3 +-
 po/zh_CN.po                               |    3 +-
 po/zh_HK.po                               |    3 +-
 po/zh_TW.po                               |    3 +-
 sheets/checktrans.py                      |    3 +-
 tests/test-boundingbox.c                  |    3 +-
 tests/test-objects.c                      |    3 +-
 569 files changed, 569 insertions(+), 3005 deletions(-)
---
diff --git a/acinclude.m4 b/acinclude.m4
index 2b3d608..c1d9dec 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -451,9 +451,7 @@ AC_SUBST(FT2_LIBS)
 #   General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-#   02111-1307, USA.
+#   along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 #   As a special exception, the respective Autoconf Macro's copyright
 #   owner gives unlimited permission to copy, distribute and modify the
diff --git a/app/app_procs.c b/app/app_procs.c
index d481b8c..e26edd7 100644
--- a/app/app_procs.c
+++ b/app/app_procs.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/app/app_procs.h b/app/app_procs.h
index 48f5609..bf6fb1c 100644
--- a/app/app_procs.h
+++ b/app/app_procs.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef APP_PROCS_H
 #define APP_PROCS_H
diff --git a/app/authors.h b/app/authors.h
index 56393de..cb2c78e 100644
--- a/app/authors.h
+++ b/app/authors.h
@@ -29,8 +29,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
  
 /* Wouldn't it be neat to display (where applicable) the names
diff --git a/app/autosave.c b/app/autosave.c
index 308c958..2662e70 100644
--- a/app/autosave.c
+++ b/app/autosave.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Autosave */
diff --git a/app/autosave.h b/app/autosave.h
index 39e7dde..048626c 100644
--- a/app/autosave.h
+++ b/app/autosave.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef AUTOSAVE_H
diff --git a/app/color_area.c b/app/color_area.c
index 4d2471a..456d6e8 100644
--- a/app/color_area.c
+++ b/app/color_area.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/app/color_area.h b/app/color_area.h
index 56f753f..cc7eef6 100644
--- a/app/color_area.h
+++ b/app/color_area.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef COLOR_AREA_H
 #define COLOR_AREA_H
diff --git a/app/commands.c b/app/commands.c
index 99f2994..56d6246 100644
--- a/app/commands.c
+++ b/app/commands.c
@@ -11,1017 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <math.h>
-#include <glib.h>
-#include <glib/gstdio.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtk.h>
-
-#ifdef G_OS_WIN32
-#include <io.h>
-#endif
-
-#include <textedit.h>
-#include <focus.h>
-#include "confirm.h"
-#include "dia-application.h"
-#include "menus.h"
-
-/** Functions called on menu selects.
- *  Note that GTK (at least up to 2.12) doesn't disable the keyboard shortcuts
- *  when the menu is made insensitive, so we have to check the constrains again
- *  in the functions.
- */
-#ifdef G_OS_WIN32
-/*
- * Instead of polluting the Dia namespace with windoze headers, declare the
- * required prototype here. This is bad style, but not as bad as namespace
- * clashes to be resolved without C++   --hb
- */
-long __stdcall
-ShellExecuteA (long        hwnd,
-               const char* lpOperation,
-               const char* lpFile,
-               const char* lpParameters,
-               const char* lpDirectory,
-               int         nShowCmd);
-#endif
-
-#include "intl.h"
-#include "commands.h"
-#include "app_procs.h"
-#include "diagram.h"
-#include "display.h"
-#include "object_ops.h"
-#include "cut_n_paste.h"
-#include "interface.h"
-#include "load_save.h"
-#include "utils.h"
-#include "message.h"
-#include "grid.h"
-#include "properties-dialog.h"
-#include "propinternals.h"
-#include "preferences.h"
-#include "layer_dialog.h"
-#include "connectionpoint_ops.h"
-#include "undo.h"
-#include "pagesetup.h"
-#include "text.h"
-#include "dia_dirs.h"
-#include "focus.h"
-#include <gdk/gdk.h>
-#include <gdk/gdkkeysyms.h>
-#include "lib/properties.h"
-#include "lib/parent.h"
-#include "dia-props.h"
-#include "authors.h"                /* master contributors data */
-#include "object.h"
-
-void 
-file_quit_callback (GtkAction *action)
-{
-  app_exit();
-}
-
-void
-file_pagesetup_callback (GtkAction *action)
-{
-  Diagram *dia;
-
-  dia = ddisplay_active_diagram();
-  if (!dia) return;
-  create_page_setup_dlg(dia);
-}
-
-void
-file_print_callback (GtkAction *_action)
-{
-  Diagram *dia;
-  DDisplay *ddisp;
-  GtkAction *action;
-
-  dia = ddisplay_active_diagram();
-  if (!dia) return;
-  ddisp = ddisplay_active();
-  if (!ddisp) return;
-  
-  action = menus_get_action ("FilePrintGTK");
-  if (!action)
-    action = menus_get_action ("FilePrintGDI");
-  if (!action)
-    action = menus_get_action ("FilePrintPS");
-
-  if (action) {
-    if (confirm_export_size (dia, GTK_WINDOW(ddisp->shell), CONFIRM_PRINT|CONFIRM_PAGES))
-      gtk_action_activate (action);
-  } else {
-    message_error (_("No print plugin found!"));
-  }
-}
-
-void
-file_close_callback (GtkAction *action)
-{
-  /* some people use tear-off menus and insist to close non existing displays */
-  if (ddisplay_active())
-    ddisplay_close(ddisplay_active());
-}
-
-void
-file_new_callback (GtkAction *action)
-{
-  Diagram *dia;
-  static int untitled_nr = 1;
-  gchar *name, *filename;
-
-  name = g_strdup_printf(_("Diagram%d.dia"), untitled_nr++);
-  filename = g_filename_from_utf8(name, -1, NULL, NULL, NULL);
-  dia = new_diagram(filename);
-  new_display(dia);
-  dia_diagram_add (dia); /* notify DiagramTree etc. */
-  g_free (name);
-  g_free (filename);
-}
-
-void
-file_preferences_callback (GtkAction *action)
-{
-  prefs_show();
-}
-
-
-
-/* Signal handler for getting the clipboard contents */
-/* Note that the clipboard is for M$-style cut/copy/paste copying, while
-   the selection is for Unix-style mark-and-copy.  We can't really do
-   mark-and-copy.
-*/
-
-static void
-insert_text(DDisplay *ddisp, Focus *focus, const gchar *text)
-{
-  ObjectChange *change = NULL;
-  int modified = FALSE, any_modified = FALSE;
-  DiaObject *obj = focus_get_object(focus);
-
-  while (text != NULL) {
-    gchar *next_line = g_utf8_strchr(text, -1, '\n');
-    if (next_line != text) {
-      gint len = g_utf8_strlen(text, (next_line-text));
-      modified = (*focus->key_event)(focus, 0, GDK_A, text, len, &change);
-    }
-    if (next_line != NULL) {
-      modified = (*focus->key_event)(focus, 0, GDK_Return, "\n", 1, &change);
-      text = g_utf8_next_char(next_line);
-    } else {
-      text = NULL;
-    }
-    { /* Make sure object updates its data: */
-      Point p = obj->position;
-      (obj->ops->move)(obj,&p);  }
-
-    /* Perhaps this can be improved */
-    object_add_updates(obj, ddisp->diagram);
-    
-    if (modified && (change != NULL)) {
-      undo_object_change(ddisp->diagram, obj, change);
-      any_modified = TRUE;
-    }
-    
-    diagram_flush(ddisp->diagram);
-  }
-
-  if (any_modified) {
-    diagram_modified(ddisp->diagram);
-    diagram_update_extents(ddisp->diagram);
-    undo_set_transactionpoint(ddisp->diagram->undo);
-  }
-}
-
-
-static void
-received_clipboard_text_handler(GtkClipboard *clipboard, 
-                               const gchar *text,
-                               gpointer data)
-{
-  DDisplay *ddisp = (DDisplay *)data;
-  Focus *focus = get_active_focus((DiagramData *) ddisp->diagram);
-  
-  if (text == NULL) return;
-
-  if ((focus == NULL) || (!focus->has_focus)) return;
-
-  if (!g_utf8_validate(text, -1, NULL)) {
-    message_error("Not valid UTF8");
-    return;
-  }
-
-  insert_text(ddisp, focus, text);
-}
-
-/*
- * Callback for gtk_clipboard_request_image
- */
-static void
-received_clipboard_image_handler(GtkClipboard *clipboard, 
-                               GdkPixbuf *pixbuf,
-                               gpointer data)
-{
-  DDisplay *ddisp = (DDisplay *)data;
-  Diagram  *dia = ddisp->diagram;
-  GList *list = dia->data->selected;
-  ObjectChange *change = NULL;
-
-  if (!pixbuf) {
-    message_error (_("No image from Clipboard to paste."));
-    return;
-  }
-
-  while (list) {
-    DiaObject *obj = (DiaObject *)list->data;
-
-    /* size before ... */
-    object_add_updates (obj, dia);
-    change = dia_object_set_pixbuf (obj, pixbuf);
-    if (change) {
-      undo_object_change(dia, obj, change);
-      /* ... and after the change */
-      object_add_updates (obj, dia);
-      diagram_modified (dia);
-      diagram_flush (dia);
-      break;
-    }
-    list = g_list_next (list);
-  }
-
-  if (!change) {
-    Point pt;
-    DiaObjectType *type;
-    Handle *handle1;
-    Handle *handle2;
-    DiaObject *obj;
-
-    pt = ddisplay_get_clicked_position(ddisp);
-    snap_to_grid(ddisp, &pt.x, &pt.y);
-
-    if (   ((type = object_get_type ("Standard - Image")) != NULL)
-        && ((obj = dia_object_default_create (type, &pt, 
-                                            type->default_user_data,
-                                            &handle1, &handle2)) != NULL)) {
-      /* as above, transfer the data */
-      change = dia_object_set_pixbuf (obj, pixbuf);
-      if (change) { /* ... but drop undo info */
-       change->free (change);
-       g_free (change);
-      }
-      /* allow undo of the whole thing */
-      undo_insert_objects(dia, g_list_prepend(NULL, obj), 1); 
-
-      diagram_add_object (dia, obj);
-      diagram_select(dia, obj);
-      object_add_updates(obj, dia);
-
-      ddisplay_do_update_menu_sensitivity(ddisp);
-      diagram_flush(dia);
-    } else {
-      message_warning (_("No selected object can take an image."));
-    }
-  }
-  /* although freed above it is still the indicator of diagram modification */
-  if (change) {
-    diagram_update_extents(dia);
-    undo_set_transactionpoint(dia->undo);
-    diagram_modified(dia);
-  }
-}
-
-static void
-received_clipboard_content_handler (GtkClipboard     *clipboard,
-                                   GtkSelectionData *selection_data,
-                                   gpointer          data)
-{
-  DDisplay *ddisp = (DDisplay *)data;
-  GdkAtom type_atom;
-  gchar *type_name;
-  gint len;
-
-  if ((len = gtk_selection_data_get_length (selection_data)) > 0) {
-    const guchar *data = gtk_selection_data_get_data (selection_data);
-    type_atom = gtk_selection_data_get_data_type (selection_data);
-    type_name = gdk_atom_name (type_atom);
-    if (type_name && strcmp (type_name, "image/svg+xml") == 0) {
-      DiaImportFilter *ifilter = filter_import_get_by_name ("dia-svg");
-      DiaContext *ctx = dia_context_new (_("Clipboard Paste"));
-
-      if (ifilter->import_mem_func) {
-        Change *change = undo_import_change_setup (ddisp->diagram);
-
-       if (!ifilter->import_mem_func (data, len, DIA_DIAGRAM_DATA (ddisp->diagram),
-                                     ctx, ifilter->user_data)) {
-         /* might become more right some day ;) */
-         message_error (_("No clipboard handler for '%s'"), type_name);
-       }
-       if (undo_import_change_done (ddisp->diagram, change)) {
-          undo_set_transactionpoint(ddisp->diagram->undo);
-          diagram_modified(ddisp->diagram);
-          diagram_flush(ddisp->diagram);
-       }
-      }
-    }
-    dia_log_message ("Content is %s (size=%d)", type_name, len);
-    g_free (type_name);
-
-  }
-}
-
-static void
-_targets_receive (GtkClipboard *clipboard,
-                 GdkAtom      *atom,
-                 gint          n_atoms,
-                 gpointer      data)
-{
-  gint i;
-  gchar *aname;
-
-  for (i = 0; i < n_atoms; ++i) {
-    aname = gdk_atom_name (atom[i]);
-    dia_log_message ("clipboard-targets %d: %s", i, aname);
-    g_free (aname);
-  }
-}
-
-void
-edit_paste_image_callback (GtkAction *action)
-{
-  GtkClipboard *clipboard = gtk_clipboard_get(GDK_NONE);
-  DDisplay *ddisp;
-  GdkAtom  svg_atom = gdk_atom_intern_static_string ("image/svg+xml");
-
-  ddisp = ddisplay_active();
-  if (!ddisp) return;
-
-  gtk_clipboard_request_targets (clipboard, _targets_receive, ddisp);
-  /* a second request call is asynchronuously to the above. I've found no reliable
-   * way to make the latter use information generted by the former
-   */
-  if (gtk_clipboard_wait_for_contents (clipboard, svg_atom))
-    gtk_clipboard_request_contents (clipboard, svg_atom,
-                                   received_clipboard_content_handler, ddisp);
-  else
-    gtk_clipboard_request_image (clipboard,
-                                received_clipboard_image_handler, ddisp);
-}
-
-static PropDescription text_prop_singleton_desc[] = {
-    { "text", PROP_TYPE_TEXT },
-    PROP_DESC_END};
-
-static void 
-make_text_prop_singleton(GPtrArray **props, TextProperty **prop) 
-{
-  *props = prop_list_from_descs(text_prop_singleton_desc,pdtpp_true);
-  g_assert((*props)->len == 1);
-
-  *prop = g_ptr_array_index((*props),0);
-  g_free((*prop)->text_data);
-  (*prop)->text_data = NULL;
-}
-
-static GtkTargetEntry target_entries[] = {
-  { "image/svg", GTK_TARGET_OTHER_APP, 1 },
-  { "image/svg+xml", GTK_TARGET_OTHER_APP, 2 },
-  { "image/png", GTK_TARGET_OTHER_APP, 3 },
-  { "image/bmp", GTK_TARGET_OTHER_APP, 4 },
-#ifdef G_OS_WIN32
-  /* this is not working on win32 either, maybe we need to register it with
-   * CF_ENHMETAFILE in Gtk+? Change order? Direct use of SetClipboardData()?
-   */
-  { "image/emf", GTK_TARGET_OTHER_APP, 5 },
-  { "image/wmf", GTK_TARGET_OTHER_APP, 6 },
-#endif
-};
-
-/** This gets called by Gtk+ if some other application is asking
- * for the clipboard content.
- */
-static void
-_clipboard_get_data_callback (GtkClipboard     *clipboard,
-                             GtkSelectionData *selection_data,
-                             guint             info,
-                             gpointer          owner_or_user_data)
-{
-  DiaContext *ctx = dia_context_new (_("Clipboard Copy"));
-  DiagramData *dia = owner_or_user_data; /* todo: check it's still valid */
-  const gchar *ext = strchr (target_entries[info-1].target, '/')+1;
-  gchar *tmplate;
-  gchar *outfname = NULL;
-  GError *error = NULL;
-  DiaExportFilter *ef = NULL;
-  int fd;
-
-  /* Although asked for bmp, use png here because of potentially better renderer
-   * Dropping 'bmp' in target would exclude many win32 programs, but gtk+ can
-   * convert from png on demand ... */
-  if (strcmp (ext, "bmp") == 0) {
-    tmplate = g_strdup ("dia-cb-XXXXXX.png"); 
-  } else if (g_str_has_suffix (ext, "+xml")) {
-    gchar *ext2 = g_strndup (ext, strlen (ext) - 4);
-    tmplate = g_strdup_printf ("dia-cb-XXXXXX.%s", ext2);
-    g_free (ext2);
-  } else {
-    tmplate = g_strdup_printf ("dia-cb-XXXXXX.%s", ext);
-  }
-
-  if ((fd = g_file_open_tmp (tmplate, &outfname, &error)) != -1) {
-    ef = filter_guess_export_filter (outfname);
-    close (fd);
-  } else {
-    g_warning ("%s", error->message);
-    g_error_free (error);
-    error = NULL;
-  }
-  g_free (tmplate);
-
-  if (ef) {
-    /* for png use alpha-rendering if available */
-    if (strcmp(ext, "png") == 0 && filter_export_get_by_name ("cairo-alpha-png") != NULL)
-      ef = filter_export_get_by_name ("cairo-alpha-png");
-    dia_context_set_filename (ctx, outfname);
-    ef->export_func(DIA_DIAGRAM_DATA(dia), ctx,
-                   outfname, "clipboard-copy", ef->user_data);
-    /* If we have a vector format, don't convert it to pixbuf. 
-     * Or even better: only use pixbuf transport when asked
-     * for 'OS native bitmaps' BMP (win32), TIFF(osx), ...?
-     */
-    if (strcmp (ext, "bmp") == 0 || strcmp (ext, "tif") == 0) {
-      GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(outfname, &error);
-      if (pixbuf) {
-       gtk_selection_data_set_pixbuf (selection_data, pixbuf);
-       g_object_unref (pixbuf);
-      }
-    } else {
-      struct stat st;
-      FILE *f;
-      
-      if (   g_stat (outfname, &st) == 0 
-         && ((f = g_fopen (outfname, "rb")) != NULL)) {
-       gchar *buf = g_try_malloc (st.st_size);
-
-       if (buf) {
-         if (fread (buf, 1, st.st_size, f) == st.st_size)
-           gtk_selection_data_set (selection_data,
-                                   gdk_atom_intern_static_string (target_entries[info-1].target), 8,
-                                   (guint8 *)buf, st.st_size);
-       }
-       g_free (buf);
-       fclose (f);
-       g_unlink (outfname);
-      }
-    }
-  }
-  if (error) {
-    dia_context_add_message (ctx, error->message);
-    g_error_free (error);
-  }
-  dia_context_release (ctx);
-}
-
-/** GtkClipboardClearFunc */
-static void
-_clipboard_clear_data_callback (GtkClipboard *clipboard,
-                                gpointer      owner_or_user_data)
-{
-  DiagramData *dia = owner_or_user_data; /* todo: check it's still valid */
-
-  if (dia)
-    g_object_unref (dia);
-}
-
-void
-edit_copy_callback (GtkAction *action)
-{
-  GList *copy_list;
-  DDisplay *ddisp;
-
-  ddisp = ddisplay_active();
-  if (!ddisp) return;
-  
-  if (textedit_mode(ddisp)) {
-    Focus *focus = get_active_focus((DiagramData *) ddisp->diagram);
-    DiaObject *obj = focus_get_object(focus);
-    GPtrArray *textprops;
-    TextProperty *prop;
-    
-    if (obj->ops->get_props == NULL) 
-      return;
-    
-    make_text_prop_singleton(&textprops,&prop);
-    /* Get the first text property */
-    obj->ops->get_props(obj, textprops);
-    
-    /* GTK docs claim the selection clipboard is ignored on Win32.
-     * The "clipboard" clipboard is (was) mostly ignored in Unix.
-     * Nowadays the notation of one system global clipboard is common
-     * for many programs on Linux, too.
-     */
-#ifdef G_OS_WIN32
-    gtk_clipboard_set_text(gtk_clipboard_get(GDK_NONE),
-                          prop->text_data, -1);
-#else
-    gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY),
-                          prop->text_data, -1);
-#endif
-    prop_list_free(textprops);
-  } else {
-    /* create a diagram of currently selected to the clipboard - it's rendered on request */
-    DiagramData *data = diagram_data_clone_selected (ddisp->diagram->data);
-
-    /* arbitrary scaling from the display, deliberately ignoring
-     * the paper scaling, like the display code does
-     */
-    data->paper.scaling = (ddisp->zoom_factor / 20.0);
-
-    gtk_clipboard_set_with_data (gtk_clipboard_get(GDK_NONE),
-                                 target_entries, G_N_ELEMENTS (target_entries),
-                                _clipboard_get_data_callback,
-                                _clipboard_clear_data_callback,
-                                data);
-
-    /* just internal copy of the selected objects */
-    copy_list = parent_list_affected(diagram_get_sorted_selected(ddisp->diagram));
-    
-    cnp_store_objects(object_copy_list(copy_list), 1);
-    g_list_free(copy_list);
-    
-    ddisplay_do_update_menu_sensitivity(ddisp);
-  }
-}
-
-void
-edit_cut_callback (GtkAction *action)
-{
-  GList *cut_list;
-  DDisplay *ddisp;
-  Change *change;
-
-  ddisp = ddisplay_active();
-  if (!ddisp) return;
-
-  if (textedit_mode(ddisp)) {
-  } else {
-    diagram_selected_break_external(ddisp->diagram);
-
-    cut_list = parent_list_affected(diagram_get_sorted_selected(ddisp->diagram));
-
-    cnp_store_objects(object_copy_list(cut_list), 0);
-
-    change = undo_delete_objects_children(ddisp->diagram, cut_list);
-    (change->apply)(change, ddisp->diagram);
-  
-    ddisplay_do_update_menu_sensitivity(ddisp);
-    diagram_flush(ddisp->diagram);
-
-    diagram_modified(ddisp->diagram);
-    diagram_update_extents(ddisp->diagram);
-    undo_set_transactionpoint(ddisp->diagram->undo);
-  }
-}
-
-void
-edit_paste_callback (GtkAction *action)
-{
-  GList *paste_list;
-  DDisplay *ddisp;
-  Point paste_corner;
-  Point delta;
-  Change *change;
-  int generation = 0;
-  
-  ddisp = ddisplay_active();
-  if (!ddisp) return;
-  if (textedit_mode(ddisp)) {
-#ifdef G_OS_WIN32
-    gtk_clipboard_request_text(gtk_clipboard_get(GDK_NONE), 
-                              received_clipboard_text_handler, ddisp);
-#else
-    gtk_clipboard_request_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), 
-                              received_clipboard_text_handler, ddisp);
-#endif
-  } else {
-    if (!cnp_exist_stored_objects()) {
-      message_warning(_("No existing object to paste.\n"));
-      return;
-    }
-  
-    paste_list = cnp_get_stored_objects(&generation); /* Gets a copy */
-
-    paste_corner = object_list_corner(paste_list);
-  
-    delta.x = ddisp->visible.left - paste_corner.x;
-    delta.y = ddisp->visible.top - paste_corner.y;
-
-    /* Move down some 10% of the visible area. */
-    delta.x += (ddisp->visible.right - ddisp->visible.left) * 0.1 * generation;
-    delta.y += (ddisp->visible.bottom - ddisp->visible.top) * 0.1 * generation;
-
-    if (generation)
-      object_list_move_delta(paste_list, &delta);
-
-    change = undo_insert_objects(ddisp->diagram, paste_list, 0);
-    (change->apply)(change, ddisp->diagram);
-
-    diagram_modified(ddisp->diagram);
-    undo_set_transactionpoint(ddisp->diagram->undo);
-  
-    diagram_remove_all_selected(ddisp->diagram, TRUE);
-    diagram_select_list(ddisp->diagram, paste_list);
-
-    diagram_update_extents(ddisp->diagram);
-    diagram_flush(ddisp->diagram);
-  }
-}
-
-/*
- * ALAN: Paste should probably paste to different position, feels
- * wrong somehow.  ALAN: The offset should increase a little each time
- * if you paste/duplicate several times in a row, because it is
- * clearer what is happening than if you were to piling them all in
- * one place.
- *
- * completely untested, basically it is copy+paste munged together
- */
-void
-edit_duplicate_callback (GtkAction *action)
-{ 
-  GList *duplicate_list;
-  DDisplay *ddisp;
-  Point delta;
-  Change *change;
-
-  ddisp = ddisplay_active();
-  if (!ddisp || textedit_mode(ddisp)) return;
-  duplicate_list = object_copy_list(diagram_get_sorted_selected(ddisp->diagram));
-  
-  /* Move down some 10% of the visible area. */
-  delta.x = (ddisp->visible.right - ddisp->visible.left)*0.05;
-  delta.y = (ddisp->visible.bottom - ddisp->visible.top)*0.05;
-
-  object_list_move_delta(duplicate_list, &delta);
-
-  change = undo_insert_objects(ddisp->diagram, duplicate_list, 0);
-  (change->apply)(change, ddisp->diagram);
-
-  diagram_modified(ddisp->diagram);
-  undo_set_transactionpoint(ddisp->diagram->undo);
-  
-  diagram_remove_all_selected(ddisp->diagram, TRUE);
-  diagram_select_list(ddisp->diagram, duplicate_list);
-
-  diagram_flush(ddisp->diagram);
-  
-  ddisplay_do_update_menu_sensitivity(ddisp);
-}
-
-void
-objects_move_up_layer(GtkAction *action)
-{
-  DDisplay *ddisp = ddisplay_active();
-  GList *selected_list;
-  Change *change;
-
-  if (!ddisp || textedit_mode(ddisp)) return;
-  selected_list = diagram_get_sorted_selected(ddisp->diagram);
-
-  change = undo_move_object_other_layer(ddisp->diagram, selected_list, TRUE);
-  
-  (change->apply)(change, ddisp->diagram);
-
-  diagram_modified(ddisp->diagram);
-  undo_set_transactionpoint(ddisp->diagram->undo);
-  
-  diagram_flush(ddisp->diagram);
-  
-  ddisplay_do_update_menu_sensitivity(ddisp);
-}
-
- void
-objects_move_down_layer(GtkAction *action)
-{
-  DDisplay *ddisp = ddisplay_active();
-  GList *selected_list;
-  Change *change;
-
-  if (!ddisp || textedit_mode(ddisp)) return;
-  selected_list = diagram_get_sorted_selected(ddisp->diagram);
-
-  /* Must check if move is legal here */
-
-  change = undo_move_object_other_layer(ddisp->diagram, selected_list, FALSE);
-  
-  (change->apply)(change, ddisp->diagram);
-
-  diagram_modified(ddisp->diagram);
-  undo_set_transactionpoint(ddisp->diagram->undo);
-  
-  diagram_flush(ddisp->diagram);
-  
-  ddisplay_do_update_menu_sensitivity(ddisp);
-}
-
-void
-edit_copy_text_callback (GtkAction *action)
-{
-  Focus *focus;
-  DDisplay *ddisp = ddisplay_active();
-  DiaObject *obj;
-  GPtrArray *textprops;
-  TextProperty *prop;
-
-  if (ddisp == NULL) return;
-
-  focus = get_active_focus((DiagramData *) ddisp->diagram);
-
-  if ((focus == NULL) || (!focus->has_focus)) return;
-
-  obj = focus_get_object(focus);
-
-  if (obj->ops->get_props == NULL) 
-    return;
-
-  make_text_prop_singleton(&textprops,&prop);
-  /* Get the first text property */
-  obj->ops->get_props(obj, textprops);
-  
-  /* GTK docs claim the selection clipboard is ignored on Win32.
-   * The "clipboard" clipboard is mostly ignored in Unix
-   */
-#ifdef G_OS_WIN32
-  gtk_clipboard_set_text(gtk_clipboard_get(GDK_NONE),
-                        prop->text_data, -1);
-#else
-  gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY),
-                        prop->text_data, -1);
-#endif
-  prop_list_free(textprops);
-}
-
-void
-edit_cut_text_callback (GtkAction *action)
-{
-  Focus *focus;
-  DDisplay *ddisp;
-  DiaObject *obj;
-  GPtrArray *textprops;
-  TextProperty *prop;
-  ObjectChange *change;
-
-  ddisp = ddisplay_active();
-  if (!ddisp) return;
-
-  focus = get_active_focus((DiagramData *) ddisp->diagram);
-  if ((focus == NULL) || (!focus->has_focus)) return;
-
-  obj = focus_get_object(focus);
-
-  if (obj->ops->get_props == NULL) 
-    return;
-
-  make_text_prop_singleton(&textprops,&prop);
-  /* Get the first text property */
-  obj->ops->get_props(obj, textprops);
-  
-  /* GTK docs claim the selection clipboard is ignored on Win32.
-   * The "clipboard" clipboard is mostly ignored in Unix
-   */
-#ifdef G_OS_WIN32
-  gtk_clipboard_set_text(gtk_clipboard_get(GDK_NONE),
-                        prop->text_data, -1);
-#else
-  gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY),
-                        prop->text_data, -1);
-#endif
-
-  prop_list_free(textprops);
-
-  if (text_delete_all(focus->text, &change, obj)) { 
-    object_add_updates(obj, ddisp->diagram);
-    undo_object_change(ddisp->diagram, obj, change);
-    undo_set_transactionpoint(ddisp->diagram->undo);
-    diagram_modified(ddisp->diagram);
-    diagram_flush(ddisp->diagram);
-  }
-}
-
-void
-edit_paste_text_callback (GtkAction *action)
-{
-  DDisplay *ddisp;
-
-  ddisp = ddisplay_active();
-  if (!ddisp) return;
-
-#ifdef G_OS_WIN32
-  gtk_clipboard_request_text(gtk_clipboard_get(GDK_NONE), 
-                            received_clipboard_text_handler, ddisp);
-#else
-  gtk_clipboard_request_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), 
-                            received_clipboard_text_handler, ddisp);
-#endif
-}
-
-void
-edit_delete_callback (GtkAction *action)
-{
-  GList *delete_list;
-  DDisplay *ddisp;
-
-  /* Avoid crashing while moving or resizing and deleting ... */
-  if (gdk_pointer_is_grabbed ()) {
-    gdk_beep ();    /* ... no matter how much sense it makes. */
-    return;
-  }
-
-  ddisp = ddisplay_active();
-  if (!ddisp) return;
-  if (textedit_mode(ddisp)) {
-    ObjectChange *change = NULL;
-    Focus *focus = get_active_focus((DiagramData *) ddisp->diagram);
-    if (!text_delete_key_handler(focus, &change)) {
-      return;
-    }
-    object_add_updates(focus->obj, ddisp->diagram);    
-  } else {
-    Change *change = NULL;
-    diagram_selected_break_external(ddisp->diagram);
-    
-    delete_list = diagram_get_sorted_selected(ddisp->diagram);
-    change = undo_delete_objects_children(ddisp->diagram, delete_list);
-    g_list_free(delete_list);
-    (change->apply)(change, ddisp->diagram);
-  }
-  diagram_modified(ddisp->diagram);
-  diagram_update_extents(ddisp->diagram);
-  
-  ddisplay_do_update_menu_sensitivity(ddisp);
-  diagram_flush(ddisp->diagram);
-  
-  undo_set_transactionpoint(ddisp->diagram->undo);
-} 
-
-void
-edit_undo_callback (GtkAction *action)
-{
-  Diagram *dia;
-  
-  dia = ddisplay_active_diagram();
-  if (!dia) return;
-
-/* Handle text undo edit here! */
-  undo_revert_to_last_tp(dia->undo);
-  diagram_modified(dia);
-  diagram_update_extents(dia);
-
-  diagram_flush(dia);
-} 
-
-void
-edit_redo_callback (GtkAction *action)
-{
-  Diagram *dia;
-  
-/* Handle text undo edit here! */
-  dia = ddisplay_active_diagram();
-  if (!dia) return;
-
-  undo_apply_to_next_tp(dia->undo);
-  diagram_modified(dia);
-  diagram_update_extents(dia);
-
-  diagram_flush(dia);
-} 
-
-void
-help_manual_callback (GtkAction *action)
-{
-  char *helpdir, *helpindex = NULL, *command;
-  guint bestscore = G_MAXINT;
-  GDir *dp;
-  const char *dentry;
-  GError *error = NULL;
-  GdkScreen *screen;
-  DDisplay *ddisp;
-  ddisp = ddisplay_active();
-  screen = ddisp ? gtk_widget_get_screen (GTK_WIDGET(ddisp->shell))
-         : gdk_screen_get_default ();
-  if (gtk_show_uri(screen, "ghelp:dia", gtk_get_current_event_time (), NULL)) {
-    return;
-  }
-
-  helpdir = dia_get_data_directory("help");
-  if (!helpdir) {
-    message_warning(_("Could not find help directory"));
-    return;
-  }
-
-  /* search through helpdir for the helpfile that matches the user's locale */
-  dp = g_dir_open (helpdir, 0, &error);
-  if (!dp) {
-    message_warning(_("Could not open help directory:\n%s"),
-                    error->message);
-    g_error_free (error);
-    return;
-  }
-  
-  while ((dentry = g_dir_read_name(dp)) != NULL) {
-    guint score;
-
-    score = intl_score_locale(dentry);
-    if (score < bestscore) {
-      if (helpindex)
-       g_free(helpindex);
-#ifdef G_OS_WIN32
-      /* use HTML Help on win32 if available */
-      helpindex = g_strconcat(helpdir, G_DIR_SEPARATOR_S, dentry,
-                             G_DIR_SEPARATOR_S "dia-manual.chm", NULL);
-      if (!g_file_test(helpindex, G_FILE_TEST_EXISTS)) {
-       helpindex = g_strconcat(helpdir, G_DIR_SEPARATOR_S, dentry,
-                             G_DIR_SEPARATOR_S "index.html", NULL);
-      }
-#else
-      helpindex = g_strconcat(helpdir, G_DIR_SEPARATOR_S, dentry,
-                             G_DIR_SEPARATOR_S "index.html", NULL);
-#endif
-      bestscore = score;
-    }
-  }
-  g_dir_close (dp);
-  g_free(helpdir);
-  if (!helpindex) {
-    message_warning(_("Could not find help directory"));
-    return;
-  }
-
-#ifdef G_OS_WIN32
-# define SW_SHOWNORMAL 1
-  ShellExecuteA (0, "open", helpindex, NULL, helpdir, SW_SHOWNORMAL);
-#else
-  command = g_strdup_printf("file://%s", helpindex);
-  gtk_show_uri(screen, command, gtk_get_current_event_time (), NULL);
-  g_free(command);
-#endif
-
-  g_free(helpindex);
-}
-
-void 
-activate_url (GtkWidget   *parent,
-              const gchar *link,
-             gpointer     data)
-{
-#ifdef G_OS_WIN32
-  ShellExecuteA (0, "open", link, NULL, NULL, SW_SHOWNORMAL);
-#else
-  GdkScreen *screen;
-  
-  if (parent)
-    screen = gtk_widget_get_screen (GTK_WIDGET(parent));
-  else
-    screen = gdk_screen_get_default ();
-  gtk_show_uri(screen, link, gtk_get_current_event_time (), NULL);
-#endif
-}
-
-void
-help_about_callback (GtkAction *action)
-{
-  const gchar *translators = _("translator_credits-PLEASE_ADD_YOURSELF_HERE");
-  const gchar *license = _(
-       "This program is free software; you can redistribute it and/or modify\n"
-       "it under the terms of the GNU General Public License as published by\n"
-       "the Free Software Foundation; either version 2 of the License, or\n"
-       "(at your option) any later version.\n"
-       "\n"
-       "This program is distributed in the hope that it will be useful,\n"
-       "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-       "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-       "GNU General Public License for more details.\n"
-       "\n"
-       "You should have received a copy of the GNU General Public License\n"
-       "along with this program; if not, write to the Free Software\n"
-       "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n");
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.\n");
 
   gchar *dirname = dia_get_data_directory("");
   gchar *filename = g_build_filename (dirname, "dia-splash.png", NULL);
diff --git a/app/commands.h b/app/commands.h
index 4e3e47e..d68bf75 100644
--- a/app/commands.h
+++ b/app/commands.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef COMMANDS_H
 #define COMMANDS_H
diff --git a/app/confirm.c b/app/confirm.c
index c9f9a76..a15a04a 100644
--- a/app/confirm.c
+++ b/app/confirm.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/app/connectionpoint_ops.c b/app/connectionpoint_ops.c
index ac4b9e4..d57ee7d 100644
--- a/app/connectionpoint_ops.c
+++ b/app/connectionpoint_ops.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 
diff --git a/app/connectionpoint_ops.h b/app/connectionpoint_ops.h
index df8c0d2..a3da037 100644
--- a/app/connectionpoint_ops.h
+++ b/app/connectionpoint_ops.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef CONNECTIONPOINT_OPS_H
 #define CONNECTIONPOINT_OPS_H
diff --git a/app/create_object.c b/app/create_object.c
index 6804123..8ff19b6 100644
--- a/app/create_object.c
+++ b/app/create_object.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 
diff --git a/app/create_object.h b/app/create_object.h
index 9e3500f..3aa90b5 100644
--- a/app/create_object.h
+++ b/app/create_object.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef CREATE_OBJECT_H
 #define CREATE_OBJECT_H
diff --git a/app/cursor.c b/app/cursor.c
index 539cefb..c461d9e 100644
--- a/app/cursor.c
+++ b/app/cursor.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/app/cursor.h b/app/cursor.h
index 2b185cf..af15cf2 100644
--- a/app/cursor.h
+++ b/app/cursor.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Definitions for creating cursors */
diff --git a/app/cut_n_paste.c b/app/cut_n_paste.c
index f2e634f..b8d9bba 100644
--- a/app/cut_n_paste.c
+++ b/app/cut_n_paste.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 
diff --git a/app/cut_n_paste.h b/app/cut_n_paste.h
index d21f981..7ef588e 100644
--- a/app/cut_n_paste.h
+++ b/app/cut_n_paste.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef CUT_N_PASTE_H
 #define CUT_N_PASTE_H
diff --git a/app/defaults.c b/app/defaults.c
index 9800831..6123319 100644
--- a/app/defaults.c
+++ b/app/defaults.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/app/defaults.h b/app/defaults.h
index 18cbf9d..3845590 100644
--- a/app/defaults.h
+++ b/app/defaults.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef DEFAULTS_H
 #define DEFAULTS_H
diff --git a/app/dia-props.c b/app/dia-props.c
index 49aa6ff..e961264 100644
--- a/app/dia-props.c
+++ b/app/dia-props.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/app/dia-props.h b/app/dia-props.h
index 68f6181..3c5d76e 100644
--- a/app/dia-props.h
+++ b/app/dia-props.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _DIA_PROPS_H_
diff --git a/app/diagram.c b/app/diagram.c
index 7f0a3bc..96e6a49 100644
--- a/app/diagram.c
+++ b/app/diagram.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/app/diagram.h b/app/diagram.h
index 57af30b..b8edd88 100644
--- a/app/diagram.h
+++ b/app/diagram.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef DIAGRAM_H
 #define DIAGRAM_H
diff --git a/app/diagram_tree_model.c b/app/diagram_tree_model.c
index 2b5078e..3decf7b 100644
--- a/app/diagram_tree_model.c
+++ b/app/diagram_tree_model.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/app/diagram_tree_view.c b/app/diagram_tree_view.c
index 166e9f8..4951629 100644
--- a/app/diagram_tree_view.c
+++ b/app/diagram_tree_view.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/app/diapagelayout.c b/app/diapagelayout.c
index a463dc8..dbda6b9 100644
--- a/app/diapagelayout.c
+++ b/app/diapagelayout.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*#define PAGELAYOUT_TEST*/
diff --git a/app/diapagelayout.h b/app/diapagelayout.h
index 8ae7c21..59d4525 100644
--- a/app/diapagelayout.h
+++ b/app/diapagelayout.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef DIAPAGELAYOUT_H
diff --git a/app/disp_callbacks.c b/app/disp_callbacks.c
index ebb5226..3e55863 100644
--- a/app/disp_callbacks.c
+++ b/app/disp_callbacks.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/app/disp_callbacks.h b/app/disp_callbacks.h
index 84c5a25..bcc771f 100644
--- a/app/disp_callbacks.h
+++ b/app/disp_callbacks.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef DISP_CALLBACKS_H
 #define DISP_CALLBACKS_H
diff --git a/app/display.c b/app/display.c
index 9d60d96..788ea05 100644
--- a/app/display.c
+++ b/app/display.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/app/display.h b/app/display.h
index 942a209..4b48e5a 100644
--- a/app/display.h
+++ b/app/display.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef DDISPLAY_H
 #define DDISPLAY_H
diff --git a/app/dynamic_refresh.c b/app/dynamic_refresh.c
index d38fce1..23cfa89 100644
--- a/app/dynamic_refresh.c
+++ b/app/dynamic_refresh.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "dynamic_refresh.h"
 #include "dynamic_obj.h"
diff --git a/app/dynamic_refresh.h b/app/dynamic_refresh.h
index 12c9d80..ad481e6 100644
--- a/app/dynamic_refresh.h
+++ b/app/dynamic_refresh.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef DYNAMIC_REFRESH_H
diff --git a/app/exit_dialog.c b/app/exit_dialog.c
index e4c5dec..454dc08 100644
--- a/app/exit_dialog.c
+++ b/app/exit_dialog.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* TODO: Non-modal api */
diff --git a/app/exit_dialog.h b/app/exit_dialog.h
index 30d7df9..d75fa97 100644
--- a/app/exit_dialog.h
+++ b/app/exit_dialog.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef EXIT_DIALOG_H
diff --git a/app/filedlg.c b/app/filedlg.c
index e421941..41a93aa 100644
--- a/app/filedlg.c
+++ b/app/filedlg.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/app/filedlg.h b/app/filedlg.h
index ae98180..635fb00 100644
--- a/app/filedlg.h
+++ b/app/filedlg.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef FILEDLG_H
diff --git a/app/find-and-replace.c b/app/find-and-replace.c
index 3961ee5..94c5dee 100644
--- a/app/find-and-replace.c
+++ b/app/find-and-replace.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/app/find-and-replace.h b/app/find-and-replace.h
index e65cd5d..38a2354 100644
--- a/app/find-and-replace.h
+++ b/app/find-and-replace.h
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef FIND_AND_REPLACE_H
diff --git a/app/grid.c b/app/grid.c
index c80eabf..12d81ff 100644
--- a/app/grid.c
+++ b/app/grid.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/app/grid.h b/app/grid.h
index 13a6c71..57e6a8f 100644
--- a/app/grid.h
+++ b/app/grid.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef GRID_H
 #define GRID_H
diff --git a/app/gtkhwrapbox.c b/app/gtkhwrapbox.c
index 30f5a46..0ee4c77 100644
--- a/app/gtkhwrapbox.c
+++ b/app/gtkhwrapbox.c
@@ -15,9 +15,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/app/gtkhwrapbox.h b/app/gtkhwrapbox.h
index 5a4ea94..b7a93c2 100644
--- a/app/gtkhwrapbox.h
+++ b/app/gtkhwrapbox.h
@@ -15,9 +15,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GTK_HWRAP_BOX_H__
diff --git a/app/gtkvwrapbox.c b/app/gtkvwrapbox.c
index f648e0d..2eecc39 100644
--- a/app/gtkvwrapbox.c
+++ b/app/gtkvwrapbox.c
@@ -15,9 +15,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/app/gtkvwrapbox.h b/app/gtkvwrapbox.h
index 7a618a6..9f9323c 100644
--- a/app/gtkvwrapbox.h
+++ b/app/gtkvwrapbox.h
@@ -15,9 +15,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GTK_VWRAP_BOX_H__
diff --git a/app/gtkwrapbox.c b/app/gtkwrapbox.c
index 6043de0..425e458 100644
--- a/app/gtkwrapbox.c
+++ b/app/gtkwrapbox.c
@@ -15,9 +15,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/app/gtkwrapbox.h b/app/gtkwrapbox.h
index e557b5d..08961ae 100644
--- a/app/gtkwrapbox.h
+++ b/app/gtkwrapbox.h
@@ -15,9 +15,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GTK_WRAP_BOX_H__
diff --git a/app/handle_ops.c b/app/handle_ops.c
index e546f56..6f184a9 100644
--- a/app/handle_ops.c
+++ b/app/handle_ops.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 
diff --git a/app/handle_ops.h b/app/handle_ops.h
index 54ffcf0..bf2da09 100644
--- a/app/handle_ops.h
+++ b/app/handle_ops.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef HANDLE_OPS_H
 #define HANDLE_OPS_H
diff --git a/app/highlight.c b/app/highlight.c
index 61d56b1..e7cf2c8 100644
--- a/app/highlight.c
+++ b/app/highlight.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "highlight.h"
diff --git a/app/highlight.h b/app/highlight.h
index 8913de6..5da1ef3 100644
--- a/app/highlight.h
+++ b/app/highlight.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef HIGHLIGHT_H
 #define HIGHLIGHT_H
diff --git a/app/interface.c b/app/interface.c
index 1d11680..850819f 100644
--- a/app/interface.c
+++ b/app/interface.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/app/interface.h b/app/interface.h
index 884df68..f3a4c02 100644
--- a/app/interface.h
+++ b/app/interface.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef INTERFACE_H
 #define INTERFACE_H
diff --git a/app/layer_dialog.c b/app/layer_dialog.c
index fc173d9..0944386 100644
--- a/app/layer_dialog.c
+++ b/app/layer_dialog.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Parts of this file are derived from the file layers_dialog.c in the Gimp:
diff --git a/app/layer_dialog.h b/app/layer_dialog.h
index 4faba5b..e81f2f5 100644
--- a/app/layer_dialog.h
+++ b/app/layer_dialog.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef LAYER_DIALOG_H
 #define LAYER_DIALOG_H
diff --git a/app/linewidth_area.c b/app/linewidth_area.c
index 6baf0ea..4e57554 100644
--- a/app/linewidth_area.c
+++ b/app/linewidth_area.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/app/linewidth_area.h b/app/linewidth_area.h
index d32b037..5d46a64 100644
--- a/app/linewidth_area.h
+++ b/app/linewidth_area.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef LINEWDITH_AREA_H
 #define LINEWDITH_AREA_H
diff --git a/app/load_save.c b/app/load_save.c
index f67e240..9cca70d 100644
--- a/app/load_save.c
+++ b/app/load_save.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 
diff --git a/app/load_save.h b/app/load_save.h
index ad5adb9..67a74b0 100644
--- a/app/load_save.h
+++ b/app/load_save.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef LOAD_SAVE_H
 #define LOAD_SAVE_H
diff --git a/app/magnify.c b/app/magnify.c
index df4a84b..df13ddf 100644
--- a/app/magnify.c
+++ b/app/magnify.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 #include <stdlib.h>
diff --git a/app/magnify.h b/app/magnify.h
index 6e218a0..7d71e0f 100644
--- a/app/magnify.h
+++ b/app/magnify.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef MAGNIFY_H
 #define MAGNIFY_H
diff --git a/app/main.c b/app/main.c
index 967dd8d..1086c6f 100644
--- a/app/main.c
+++ b/app/main.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 
diff --git a/app/menus.c b/app/menus.c
index be00f27..598a376 100644
--- a/app/menus.c
+++ b/app/menus.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/app/menus.h b/app/menus.h
index 08e4b49..280dc90 100644
--- a/app/menus.h
+++ b/app/menus.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef MENUS_H
 #define MENUS_H
diff --git a/app/modify_tool.c b/app/modify_tool.c
index e463c15..40a4d0a 100644
--- a/app/modify_tool.c
+++ b/app/modify_tool.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 
diff --git a/app/modify_tool.h b/app/modify_tool.h
index 7b85442..e83f1b8 100644
--- a/app/modify_tool.h
+++ b/app/modify_tool.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef MODIFY_TOOL_H
 #define MODIFY_TOOL_H
diff --git a/app/navigation.c b/app/navigation.c
index 704bb8b..0b491e9 100644
--- a/app/navigation.c
+++ b/app/navigation.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *  
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *  
  */
 
diff --git a/app/navigation.h b/app/navigation.h
index 558744e..3915fec 100644
--- a/app/navigation.h
+++ b/app/navigation.h
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *  
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *  
  */
 
diff --git a/app/object_ops.c b/app/object_ops.c
index 254ecca..59f666e 100644
--- a/app/object_ops.c
+++ b/app/object_ops.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/app/object_ops.h b/app/object_ops.h
index 82a3cc7..42bb613 100644
--- a/app/object_ops.h
+++ b/app/object_ops.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef OBJECT_OPS_H
 #define OBJECT_OPS_H
diff --git a/app/pagesetup.c b/app/pagesetup.c
index 0a6ed2a..65b4833 100644
--- a/app/pagesetup.c
+++ b/app/pagesetup.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/app/pagesetup.h b/app/pagesetup.h
index 18e4b7c..5222ff3 100644
--- a/app/pagesetup.h
+++ b/app/pagesetup.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef PAGESETUP_H
diff --git a/app/plugin-manager.c b/app/plugin-manager.c
index d9000f7..c506783 100644
--- a/app/plugin-manager.c
+++ b/app/plugin-manager.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/app/plugin-manager.h b/app/plugin-manager.h
index 8f10bef..527f2c4 100644
--- a/app/plugin-manager.h
+++ b/app/plugin-manager.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef PLUGIN_MANAGER_H
diff --git a/app/preferences.c b/app/preferences.c
index 047bcbc..5b9f654 100644
--- a/app/preferences.c
+++ b/app/preferences.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 
diff --git a/app/preferences.h b/app/preferences.h
index 53464f3..3ccd0f5 100644
--- a/app/preferences.h
+++ b/app/preferences.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef PREFERENCES_H
 #define PREFERENCES_H
diff --git a/app/properties-dialog.c b/app/properties-dialog.c
index 16e086b..b236a81 100644
--- a/app/properties-dialog.c
+++ b/app/properties-dialog.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/app/properties-dialog.h b/app/properties-dialog.h
index 7246b41..f018a67 100644
--- a/app/properties-dialog.h
+++ b/app/properties-dialog.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef PROPERTIES_H
 #define PROPERTIES_H
diff --git a/app/recent_files.c b/app/recent_files.c
index feb0da7..e0f2a38 100644
--- a/app/recent_files.c
+++ b/app/recent_files.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/app/recent_files.h b/app/recent_files.h
index 6947af0..63efa54 100644
--- a/app/recent_files.h
+++ b/app/recent_files.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
  
 #ifndef RECENT_FILES_H
diff --git a/app/render_gdk.c b/app/render_gdk.c
index 930e36b..7f2f057 100644
--- a/app/render_gdk.c
+++ b/app/render_gdk.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/app/render_gdk.h b/app/render_gdk.h
index 01e0fca..6d52beb 100644
--- a/app/render_gdk.h
+++ b/app/render_gdk.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef RENDER_GDK_H
 #define RENDER_GDK_H
diff --git a/app/ruler.c b/app/ruler.c
index dc49a1f..666d1ce 100644
--- a/app/ruler.c
+++ b/app/ruler.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/app/scroll_tool.c b/app/scroll_tool.c
index e9ce9ff..52a9d0d 100644
--- a/app/scroll_tool.c
+++ b/app/scroll_tool.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 
diff --git a/app/scroll_tool.h b/app/scroll_tool.h
index dae320a..08ea23f 100644
--- a/app/scroll_tool.h
+++ b/app/scroll_tool.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef SCROLL_TOOL_H
 #define SCROLL_TOOL_H
diff --git a/app/select.c b/app/select.c
index 738562e..23f046c 100644
--- a/app/select.c
+++ b/app/select.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* select.c -- callbacks to implement the Select menu */
diff --git a/app/select.h b/app/select.h
index 12e66a3..abf0b73 100644
--- a/app/select.h
+++ b/app/select.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef SELECT_H
 #define SELECT_H
diff --git a/app/sheets.c b/app/sheets.c
index d5d6965..eaa6af0 100644
--- a/app/sheets.c
+++ b/app/sheets.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *  
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *  
  */
 #include "config.h"
diff --git a/app/sheets.h b/app/sheets.h
index 93ef8e2..0307ff2 100644
--- a/app/sheets.h
+++ b/app/sheets.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *  
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *  
  */
 
diff --git a/app/sheets_dialog.c b/app/sheets_dialog.c
index 18c3634..93f9f34 100644
--- a/app/sheets_dialog.c
+++ b/app/sheets_dialog.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *  
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *  
  */
 
diff --git a/app/sheets_dialog_callbacks.c b/app/sheets_dialog_callbacks.c
index 0fb96c6..8314e29 100644
--- a/app/sheets_dialog_callbacks.c
+++ b/app/sheets_dialog_callbacks.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/app/sheets_dialog_callbacks.h b/app/sheets_dialog_callbacks.h
index 7a01f5c..5ef7850 100644
--- a/app/sheets_dialog_callbacks.h
+++ b/app/sheets_dialog_callbacks.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/app/textedit.c b/app/textedit.c
index 9e94d50..5f6b913 100644
--- a/app/textedit.c
+++ b/app/textedit.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /** This file handles the display part of text edit stuff: Making text
diff --git a/app/textedit.h b/app/textedit.h
index 2e2b63d..55f8932 100644
--- a/app/textedit.h
+++ b/app/textedit.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef TEXTEDIT_H
diff --git a/app/textedit_tool.c b/app/textedit_tool.c
index 657f382..c0a7d50 100644
--- a/app/textedit_tool.c
+++ b/app/textedit_tool.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 
diff --git a/app/textedit_tool.h b/app/textedit_tool.h
index 5ed5807..214bc97 100644
--- a/app/textedit_tool.h
+++ b/app/textedit_tool.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef TEXTEDIT_TOOL_H
 #define TEXTEDIT_TOOL_H
diff --git a/app/tool.c b/app/tool.c
index 492af30..01b87d9 100644
--- a/app/tool.c
+++ b/app/tool.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 
diff --git a/app/tool.h b/app/tool.h
index 174eda1..0055aaa 100644
--- a/app/tool.h
+++ b/app/tool.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef TOOL_H
 #define TOOL_H
diff --git a/app/toolbox.c b/app/toolbox.c
index 8fdb424..d4ce87c 100644
--- a/app/toolbox.c
+++ b/app/toolbox.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/app/undo.c b/app/undo.c
index bf8cd7a..f71a37e 100644
--- a/app/undo.c
+++ b/app/undo.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/app/undo.h b/app/undo.h
index 4b2e4fc..a8a37bc 100644
--- a/app/undo.h
+++ b/app/undo.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef UNDO_H
 #define UNDO_H
diff --git a/bindings/dia-connections.cpp b/bindings/dia-connections.cpp
index 3c00491..9e448fa 100644
--- a/bindings/dia-connections.cpp
+++ b/bindings/dia-connections.cpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "object.h"
 
diff --git a/bindings/dia-diagramdata.cpp b/bindings/dia-diagramdata.cpp
index a0cf380..45c246e 100644
--- a/bindings/dia-diagramdata.cpp
+++ b/bindings/dia-diagramdata.cpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "object.h"
 #include "diagramdata.h"
diff --git a/bindings/dia-extra.cpp b/bindings/dia-extra.cpp
index 92da4a7..3730e47 100644
--- a/bindings/dia-extra.cpp
+++ b/bindings/dia-extra.cpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "dia-extra.h"
 
diff --git a/bindings/dia-object.cpp b/bindings/dia-object.cpp
index 83fee17..df6a7f6 100644
--- a/bindings/dia-object.cpp
+++ b/bindings/dia-object.cpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "object.h"
 #include <assert.h>
diff --git a/bindings/dia-properties.cpp b/bindings/dia-properties.cpp
index 77e2521..5063860 100644
--- a/bindings/dia-properties.cpp
+++ b/bindings/dia-properties.cpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "properties.h"
 // need access to property internals
diff --git a/bindings/dia-python-extra.cpp b/bindings/dia-python-extra.cpp
index d68ce17..3dbb1a9 100644
--- a/bindings/dia-python-extra.cpp
+++ b/bindings/dia-python-extra.cpp
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <Python.h>
diff --git a/bindings/dia-renderer.cpp b/bindings/dia-renderer.cpp
index 4834a15..64599e1 100644
--- a/bindings/dia-renderer.cpp
+++ b/bindings/dia-renderer.cpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "diarenderer.h"
diff --git a/installer/win32/dia.nsi b/installer/win32/dia.nsi
index 7243bf2..7b8a2b4 100644
--- a/installer/win32/dia.nsi
+++ b/installer/win32/dia.nsi
@@ -15,8 +15,7 @@
 ; GNU General Public License for more details.
 
 ; You should have received a copy of the GNU General Public License
-; along with this program; if not, write to the Free Software
-; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+; along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 ; NOTE: this .NSI script is designed for NSIS v2.0
 
diff --git a/installer/win32/gennsh.c b/installer/win32/gennsh.c
old mode 100755
new mode 100644
diff --git a/lib/arrows.c b/lib/arrows.c
index 083fe46..e8cd8c7 100644
--- a/lib/arrows.c
+++ b/lib/arrows.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/lib/arrows.h b/lib/arrows.h
index 07ca513..c07bf08 100644
--- a/lib/arrows.h
+++ b/lib/arrows.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef ARROWS_H
 #define ARROWS_H
diff --git a/lib/attributes.c b/lib/attributes.c
index 7a44ae3..29bea86 100644
--- a/lib/attributes.c
+++ b/lib/attributes.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 
diff --git a/lib/attributes.h b/lib/attributes.h
index 490b06d..9cee93a 100644
--- a/lib/attributes.h
+++ b/lib/attributes.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef ATTRIBUTES_H
 #define ATTRIBUTES_H
diff --git a/lib/autoroute.c b/lib/autoroute.c
index 0dbc6ae..eb8aa56 100644
--- a/lib/autoroute.c
+++ b/lib/autoroute.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*!
diff --git a/lib/autoroute.h b/lib/autoroute.h
index cf12ae0..676f956 100644
--- a/lib/autoroute.h
+++ b/lib/autoroute.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef AUTOROUTE_H
 #define AUTOROUTE_H
diff --git a/lib/bezier-common.c b/lib/bezier-common.c
index 6c2d118..8d43556 100644
--- a/lib/bezier-common.c
+++ b/lib/bezier-common.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h" 
diff --git a/lib/bezier-common.h b/lib/bezier-common.h
index 428de71..fdc4dbb 100644
--- a/lib/bezier-common.h
+++ b/lib/bezier-common.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef BEZIER_COMMON_H
 #define BEZIER_COMMON_H
diff --git a/lib/bezier_conn.c b/lib/bezier_conn.c
index 65e7053..3bf5105 100644
--- a/lib/bezier_conn.c
+++ b/lib/bezier_conn.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
  /** \file bezier_conn.c Allows to construct object consisting of bezier lines */
diff --git a/lib/bezier_conn.h b/lib/bezier_conn.h
index 628e9d9..2d29a35 100644
--- a/lib/bezier_conn.h
+++ b/lib/bezier_conn.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
  
 #ifndef BEZIER_CONN_H
diff --git a/lib/beziershape.c b/lib/beziershape.c
index c243cd2..1d36598 100644
--- a/lib/beziershape.c
+++ b/lib/beziershape.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/lib/beziershape.h b/lib/beziershape.h
index e651d37..e53bde5 100644
--- a/lib/beziershape.h
+++ b/lib/beziershape.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
  
 /** \file beziershape.h Allows to construct closed objects consisting of bezier lines */
diff --git a/lib/boundingbox.c b/lib/boundingbox.c
index 4c14892..4c9fdb2 100644
--- a/lib/boundingbox.c
+++ b/lib/boundingbox.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/lib/boundingbox.h b/lib/boundingbox.h
index 94d78c6..9b8445e 100644
--- a/lib/boundingbox.h
+++ b/lib/boundingbox.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*!
diff --git a/lib/color.c b/lib/color.c
index 354705a..4d412f4 100644
--- a/lib/color.c
+++ b/lib/color.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
  
 #include <config.h>
diff --git a/lib/color.h b/lib/color.h
index daf36c4..91ed43a 100644
--- a/lib/color.h
+++ b/lib/color.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef COLOR_H
diff --git a/lib/connection.c b/lib/connection.c
index 6283c5f..de1982b 100644
--- a/lib/connection.c
+++ b/lib/connection.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/lib/connection.h b/lib/connection.h
index 470dab4..32eb184 100644
--- a/lib/connection.h
+++ b/lib/connection.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CONNECTION_H
diff --git a/lib/connectionpoint.c b/lib/connectionpoint.c
index 5ea5b1b..765dbde 100644
--- a/lib/connectionpoint.c
+++ b/lib/connectionpoint.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/lib/connectionpoint.h b/lib/connectionpoint.h
index 48aec49..a581d62 100644
--- a/lib/connectionpoint.h
+++ b/lib/connectionpoint.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*!
diff --git a/lib/connpoint_line.c b/lib/connpoint_line.c
index 1d98d5f..f146f46 100644
--- a/lib/connpoint_line.c
+++ b/lib/connpoint_line.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/lib/connpoint_line.h b/lib/connpoint_line.h
index 8bf972e..a056cfb 100644
--- a/lib/connpoint_line.h
+++ b/lib/connpoint_line.h
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*! 
diff --git a/lib/create.c b/lib/create.c
index 66bcc07..a4fbe4c 100644
--- a/lib/create.c
+++ b/lib/create.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /** This file contains functions for importers in particular to create
diff --git a/lib/create.h b/lib/create.h
index ad8b01a..36ef5bb 100644
--- a/lib/create.h
+++ b/lib/create.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*!
diff --git a/lib/debug.c b/lib/debug.c
index 3c8a962..0b39cd5 100644
--- a/lib/debug.c
+++ b/lib/debug.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* This file contains various functions to aid in debugging in general. */
diff --git a/lib/debug.h b/lib/debug.h
index 205b3e1..3776c22 100644
--- a/lib/debug.h
+++ b/lib/debug.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* This file contains various functions to aid in debugging in general. */
diff --git a/lib/dia_dirs.c b/lib/dia_dirs.c
index c0672f7..b4e999f 100644
--- a/lib/dia_dirs.c
+++ b/lib/dia_dirs.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/lib/dia_dirs.h b/lib/dia_dirs.h
index c0cbff0..709c8a4 100644
--- a/lib/dia_dirs.h
+++ b/lib/dia_dirs.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef DIA_DIRS_H
diff --git a/lib/dia_image.c b/lib/dia_image.c
index 88598be..d0da271 100644
--- a/lib/dia_image.c
+++ b/lib/dia_image.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/lib/dia_image.h b/lib/dia_image.h
index b8b06fc..ee0c6d8 100644
--- a/lib/dia_image.h
+++ b/lib/dia_image.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef DIA_IMAGE_H
 #define DIA_IMAGE_H
diff --git a/lib/dia_svg.c b/lib/dia_svg.c
index e7e51e3..da2a78e 100644
--- a/lib/dia_svg.c
+++ b/lib/dia_svg.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/lib/dia_svg.h b/lib/dia_svg.h
index 87bbe5c..6564dc4 100644
--- a/lib/dia_svg.h
+++ b/lib/dia_svg.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef DIA_SVG_H
diff --git a/lib/dia_xml.c b/lib/dia_xml.c
index aaa6cca..2c4e190 100644
--- a/lib/dia_xml.c
+++ b/lib/dia_xml.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 /** \file dia_xml.c  Helper function to convert Dia's basic to and from XML */
 #include <config.h>
diff --git a/lib/dia_xml.h b/lib/dia_xml.h
index 0205336..a38dcbd 100644
--- a/lib/dia_xml.h
+++ b/lib/dia_xml.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef DIA_XML_H
 #define DIA_XML_H
diff --git a/lib/dia_xml_libxml.h b/lib/dia_xml_libxml.h
index 5e331b5..e099d81 100644
--- a/lib/dia_xml_libxml.h
+++ b/lib/dia_xml_libxml.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef DIA_XML_LIBXML_H
 #define DIA_XML_LIBXML_H
diff --git a/lib/diaarrowchooser.c b/lib/diaarrowchooser.c
index 5185a94..6cb915a 100644
--- a/lib/diaarrowchooser.c
+++ b/lib/diaarrowchooser.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /** \file diaarrowchooser.c  A widget to choose arrowhead.  This only select arrowhead, not width  and 
height. 
diff --git a/lib/diaarrowchooser.h b/lib/diaarrowchooser.h
index f8d7766..be330ad 100644
--- a/lib/diaarrowchooser.h
+++ b/lib/diaarrowchooser.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _DIAARROWCHOOSER_H_
diff --git a/lib/diaarrowselector.c b/lib/diaarrowselector.c
index 9812f09..04272d4 100644
--- a/lib/diaarrowselector.c
+++ b/lib/diaarrowselector.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/lib/diacellrendererproperty.c b/lib/diacellrendererproperty.c
index 512cb55..cd5fa10 100644
--- a/lib/diacellrendererproperty.c
+++ b/lib/diacellrendererproperty.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/lib/diacellrendererproperty.h b/lib/diacellrendererproperty.h
index 9cd42b5..a2d0f9e 100644
--- a/lib/diacellrendererproperty.h
+++ b/lib/diacellrendererproperty.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __DIA_CELL_RENDERER_PROPERTY_H__
diff --git a/lib/diacolorselector.c b/lib/diacolorselector.c
index 791bde3..1198b16 100644
--- a/lib/diacolorselector.c
+++ b/lib/diacolorselector.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 
diff --git a/lib/diacontext.c b/lib/diacontext.c
index 04dfcf8..ee52ab5 100644
--- a/lib/diacontext.c
+++ b/lib/diacontext.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/lib/diadynamicmenu.c b/lib/diadynamicmenu.c
index 195a4a4..f60402b 100644
--- a/lib/diadynamicmenu.c
+++ b/lib/diadynamicmenu.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/lib/diaerror.c b/lib/diaerror.c
index 5c71353..56a7e12 100644
--- a/lib/diaerror.c
+++ b/lib/diaerror.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "diaerror.h"
diff --git a/lib/diaerror.h b/lib/diaerror.h
index 576349a..4a3b11d 100644
--- a/lib/diaerror.h
+++ b/lib/diaerror.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef DIA_ERROR_H
diff --git a/lib/diafontselector.c b/lib/diafontselector.c
index d216c2f..7cc5816 100644
--- a/lib/diafontselector.c
+++ b/lib/diafontselector.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/lib/diafontselector.h b/lib/diafontselector.h
index 595bad1..1d773f1 100644
--- a/lib/diafontselector.h
+++ b/lib/diafontselector.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef DIA_FONT_SELECTOR_H
 #define DIA_FONT_SELECTOR_H
diff --git a/lib/diagdkrenderer.c b/lib/diagdkrenderer.c
index 87d7772..ba3fe4e 100644
--- a/lib/diagdkrenderer.c
+++ b/lib/diagdkrenderer.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/lib/diagramdata.c b/lib/diagramdata.c
index d031f5d..1922c89 100644
--- a/lib/diagramdata.c
+++ b/lib/diagramdata.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /** \file diagramdata.c  This file defines the DiagramData object, which holds (mostly) saveable
diff --git a/lib/diagramdata.h b/lib/diagramdata.h
index 4578813..6d0f7a8 100644
--- a/lib/diagramdata.h
+++ b/lib/diagramdata.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 /*! \file diagramdata.h -- Describing the base class of diagrams */
 #ifndef DIAGRAMDATA_H
diff --git a/lib/diainteractiverenderer.c b/lib/diainteractiverenderer.c
index 0419797..b66e67c 100644
--- a/lib/diainteractiverenderer.c
+++ b/lib/diainteractiverenderer.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "diarenderer.h"
diff --git a/lib/dialib.c b/lib/dialib.c
index b6b3386..24b81f3 100644
--- a/lib/dialib.c
+++ b/lib/dialib.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/lib/dialinechooser.c b/lib/dialinechooser.c
index da8f19c..1d6cb8a 100644
--- a/lib/dialinechooser.c
+++ b/lib/dialinechooser.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/dialinechooser.h b/lib/dialinechooser.h
index 5a70104..7d4c313 100644
--- a/lib/dialinechooser.h
+++ b/lib/dialinechooser.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef DIALINECHOOSER_H
diff --git a/lib/dialinestyleselector.c b/lib/dialinestyleselector.c
index 4c6c479..f0957db 100644
--- a/lib/dialinestyleselector.c
+++ b/lib/dialinestyleselector.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/lib/dialogs.c b/lib/dialogs.c
index 1f2cc36..772d3c9 100644
--- a/lib/dialogs.c
+++ b/lib/dialogs.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/dialogs.h b/lib/dialogs.h
index 3486d71..0c165f1 100644
--- a/lib/dialogs.h
+++ b/lib/dialogs.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <gtk/gtk.h>
 
diff --git a/lib/diamenu.h b/lib/diamenu.h
index 926882a..7da99f8 100644
--- a/lib/diamenu.h
+++ b/lib/diamenu.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef DIAMENU_H
 #define DIAMENU_H
diff --git a/lib/diaoptionmenu.c b/lib/diaoptionmenu.c
index 1201e0c..198e7e3 100644
--- a/lib/diaoptionmenu.c
+++ b/lib/diaoptionmenu.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 
diff --git a/lib/diaoptionmenu.h b/lib/diaoptionmenu.h
index a113631..fc38a5d 100644
--- a/lib/diaoptionmenu.h
+++ b/lib/diaoptionmenu.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <gtk/gtk.h>
 
diff --git a/lib/diapathrenderer.c b/lib/diapathrenderer.c
index 96ea988..c48f479 100644
--- a/lib/diapathrenderer.c
+++ b/lib/diapathrenderer.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "config.h"
 
diff --git a/lib/diapathrenderer.h b/lib/diapathrenderer.h
index a679f03..677c3de 100644
--- a/lib/diapathrenderer.h
+++ b/lib/diapathrenderer.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef DIA_PATH_RENDERER_H
 #define DIA_PATH_RENDERER_H
diff --git a/lib/diarenderer.c b/lib/diarenderer.c
index 3428216..b8dd6bf 100644
--- a/lib/diarenderer.c
+++ b/lib/diarenderer.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/lib/diarenderer.h b/lib/diarenderer.h
index 8cc2857..3d59b1b 100644
--- a/lib/diarenderer.h
+++ b/lib/diarenderer.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*! \file diarenderer.h -- the basic renderer interface definition */
diff --git a/lib/diasvgrenderer.c b/lib/diasvgrenderer.c
index b606731..1e4c7be 100644
--- a/lib/diasvgrenderer.c
+++ b/lib/diasvgrenderer.c
@@ -20,8 +20,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/lib/diatransform.c b/lib/diatransform.c
index b5c8b5e..9b49ad6 100644
--- a/lib/diatransform.c
+++ b/lib/diatransform.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "diatransform.h"
diff --git a/lib/diatransformrenderer.c b/lib/diatransformrenderer.c
index e0f6827..0cfc787 100644
--- a/lib/diatransformrenderer.c
+++ b/lib/diatransformrenderer.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "config.h"
 
diff --git a/lib/diatransformrenderer.h b/lib/diatransformrenderer.h
index 3f9ae86..aec8128 100644
--- a/lib/diatransformrenderer.h
+++ b/lib/diatransformrenderer.h
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "diarenderer.h"
 
diff --git a/lib/diatypes.h b/lib/diatypes.h
index 35b38fc..671fc19 100644
--- a/lib/diatypes.h
+++ b/lib/diatypes.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file diatypes.h -- All externally visible structures should be defined here */
diff --git a/lib/dummy_dep.h b/lib/dummy_dep.h
index 0d10b75..39cd596 100644
--- a/lib/dummy_dep.h
+++ b/lib/dummy_dep.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <glib.h>
 #include "connection.h"
diff --git a/lib/dynamic_obj.c b/lib/dynamic_obj.c
index 1673eb7..e3c577f 100644
--- a/lib/dynamic_obj.c
+++ b/lib/dynamic_obj.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glib.h>
diff --git a/lib/dynamic_obj.h b/lib/dynamic_obj.h
index aa9c3f1..715a74e 100644
--- a/lib/dynamic_obj.h
+++ b/lib/dynamic_obj.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef DYNAMIC_OBJ_H
diff --git a/lib/element.c b/lib/element.c
index 23b6ddf..6bb655f 100644
--- a/lib/element.c
+++ b/lib/element.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /** The Element object type is a rectangular box that has
diff --git a/lib/element.h b/lib/element.h
index ac72ebe..02b1a33 100644
--- a/lib/element.h
+++ b/lib/element.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* ** \file element.h -- Definition of a diagram - usual rectangular - object with eight handles  */
diff --git a/lib/filter.c b/lib/filter.c
index fc6644e..ed727a1 100644
--- a/lib/filter.c
+++ b/lib/filter.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/filter.h b/lib/filter.h
index 1c80c7f..3c5525f 100644
--- a/lib/filter.h
+++ b/lib/filter.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef FILTER_H
 #define FILTER_H
diff --git a/lib/focus.c b/lib/focus.c
index 1a6bb15..956260d 100644
--- a/lib/focus.c
+++ b/lib/focus.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /** This files handles which text elements are currently eligible to get
diff --git a/lib/focus.h b/lib/focus.h
index 4dc1258..855cb66 100644
--- a/lib/focus.h
+++ b/lib/focus.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef FOCUS_H
 #define FOCUS_H
diff --git a/lib/font-height.c b/lib/font-height.c
index d1593bf..b5d5cb8 100644
--- a/lib/font-height.c
+++ b/lib/font-height.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/font.c b/lib/font.c
index c2d21e6..129ed8d 100644
--- a/lib/font.c
+++ b/lib/font.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/font.h b/lib/font.h
index 63ebb96..9f98e50 100644
--- a/lib/font.h
+++ b/lib/font.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef FONT_H
 #define FONT_H
diff --git a/lib/geometry.c b/lib/geometry.c
index a67427a..1fbba92 100644
--- a/lib/geometry.c
+++ b/lib/geometry.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* include glib.h first, so we don't pick up its inline functions as well */
diff --git a/lib/geometry.h b/lib/geometry.h
index 13b49e5..78b492e 100644
--- a/lib/geometry.h
+++ b/lib/geometry.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /** \file geometry.h -- basic geometry classes and functions operationg on them */
diff --git a/lib/group.c b/lib/group.c
index 08ff7f8..ce45545 100644
--- a/lib/group.c
+++ b/lib/group.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 
diff --git a/lib/group.h b/lib/group.h
index e3022bb..0fcd7f7 100644
--- a/lib/group.h
+++ b/lib/group.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef GROUP_H
 #define GROUP_H
diff --git a/lib/handle.h b/lib/handle.h
index f6d73fa..d32589e 100644
--- a/lib/handle.h
+++ b/lib/handle.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*! 
diff --git a/lib/layer.c b/lib/layer.c
index 9f63c5f..db53d1a 100644
--- a/lib/layer.c
+++ b/lib/layer.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/message.c b/lib/message.c
index b0e1737..bf905ae 100644
--- a/lib/message.c
+++ b/lib/message.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/lib/message.h b/lib/message.h
index 4d31b37..fb43726 100644
--- a/lib/message.h
+++ b/lib/message.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef MESSAGE_H
 #define MESSAGE_H
diff --git a/lib/objchange.c b/lib/objchange.c
index 3530662..c85b17a 100644
--- a/lib/objchange.c
+++ b/lib/objchange.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/lib/objchange.h b/lib/objchange.h
index 7491bbf..3e8d85d 100644
--- a/lib/objchange.h
+++ b/lib/objchange.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*! 
diff --git a/lib/object-alias.c b/lib/object-alias.c
index 3192cf8..177f85d 100644
--- a/lib/object-alias.c
+++ b/lib/object-alias.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 
diff --git a/lib/object.c b/lib/object.c
index c510d00..21df504 100644
--- a/lib/object.c
+++ b/lib/object.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/lib/object.h b/lib/object.h
index 968305a..16ae041 100644
--- a/lib/object.h
+++ b/lib/object.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file object.h -- definitions for Dia objects, in particular the 'virtual'
diff --git a/lib/object_defaults.c b/lib/object_defaults.c
index fd151a8..0c14cd9 100644
--- a/lib/object_defaults.c
+++ b/lib/object_defaults.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 
diff --git a/lib/orth_conn.c b/lib/orth_conn.c
index 741c415..642e807 100644
--- a/lib/orth_conn.c
+++ b/lib/orth_conn.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 
diff --git a/lib/orth_conn.h b/lib/orth_conn.h
index b901197..7cea773 100644
--- a/lib/orth_conn.h
+++ b/lib/orth_conn.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef ORTH_CONN_H
 #define ORTH_CONN_H
diff --git a/lib/paper.c b/lib/paper.c
index 7b30fd6..9a39fc8 100644
--- a/lib/paper.c
+++ b/lib/paper.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/lib/paper.h b/lib/paper.h
index 5c65cf1..1a5e97e 100644
--- a/lib/paper.h
+++ b/lib/paper.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef PAPER_H
diff --git a/lib/parent.c b/lib/parent.c
index ba0f248..e2106ca 100644
--- a/lib/parent.c
+++ b/lib/parent.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/lib/parent.h b/lib/parent.h
index eebe749..3fe9fa4 100644
--- a/lib/parent.h
+++ b/lib/parent.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef PARENT_H
diff --git a/lib/pattern.c b/lib/pattern.c
index 5260254..bedaf8b 100644
--- a/lib/pattern.c
+++ b/lib/pattern.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h> 
 #include "diatypes.h"
diff --git a/lib/pattern.h b/lib/pattern.h
index 0815f1b..d1200ad 100644
--- a/lib/pattern.h
+++ b/lib/pattern.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef PATTERN_H
 #define PATTERN_H
diff --git a/lib/persistence.c b/lib/persistence.c
index 2cba2cb..2569192 100644
--- a/lib/persistence.c
+++ b/lib/persistence.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*!
diff --git a/lib/persistence.h b/lib/persistence.h
index 5980a77..1e084b9 100644
--- a/lib/persistence.h
+++ b/lib/persistence.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* persistence.h -- definitions for persistent storage.
diff --git a/lib/plug-ins.c b/lib/plug-ins.c
index ce31b18..d8900cf 100644
--- a/lib/plug-ins.c
+++ b/lib/plug-ins.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/lib/plug-ins.h b/lib/plug-ins.h
index 3fa6665..0b5830c 100644
--- a/lib/plug-ins.h
+++ b/lib/plug-ins.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef PLUG_INS_H
diff --git a/lib/poly_conn.c b/lib/poly_conn.c
index ea337c3..56f928f 100644
--- a/lib/poly_conn.c
+++ b/lib/poly_conn.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/lib/poly_conn.h b/lib/poly_conn.h
index 86c7981..0690ac0 100644
--- a/lib/poly_conn.h
+++ b/lib/poly_conn.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef POLY_CONN_H
 #define POLY_CONN_H
diff --git a/lib/polyshape.c b/lib/polyshape.c
index df0afb3..78cf376 100644
--- a/lib/polyshape.c
+++ b/lib/polyshape.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/lib/polyshape.h b/lib/polyshape.h
index 395800c..230d1ff 100644
--- a/lib/polyshape.h
+++ b/lib/polyshape.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef POLYSHAPE_H
 #define POLYSHAPE_H
diff --git a/lib/prefs.c b/lib/prefs.c
index 2ee42c8..2691125 100644
--- a/lib/prefs.c
+++ b/lib/prefs.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/prefs.h b/lib/prefs.h
index 29d35dc..d1a17c0 100644
--- a/lib/prefs.h
+++ b/lib/prefs.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Handling of user prefs that affect internals of Dia. */
diff --git a/lib/prop_attr.c b/lib/prop_attr.c
index 707f209..6344d69 100644
--- a/lib/prop_attr.c
+++ b/lib/prop_attr.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib/prop_attr.h b/lib/prop_attr.h
index fb89f5d..611a348 100644
--- a/lib/prop_attr.h
+++ b/lib/prop_attr.h
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef PROP_ATTR_H
 #define PROP_ATTR_H
diff --git a/lib/prop_basic.c b/lib/prop_basic.c
index 495b662..cf57a5a 100644
--- a/lib/prop_basic.c
+++ b/lib/prop_basic.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/prop_basic.h b/lib/prop_basic.h
index 9bba042..98ee239 100644
--- a/lib/prop_basic.h
+++ b/lib/prop_basic.h
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef PROP_BASIC_H
diff --git a/lib/prop_dict.c b/lib/prop_dict.c
index eada7d1..ba4441e 100644
--- a/lib/prop_dict.c
+++ b/lib/prop_dict.c
@@ -20,8 +20,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib/prop_dict.h b/lib/prop_dict.h
index 1f059d4..ba954cf 100644
--- a/lib/prop_dict.h
+++ b/lib/prop_dict.h
@@ -20,8 +20,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef PROP_DICT_H
 #define PROP_DICT_H
diff --git a/lib/prop_geomtypes.c b/lib/prop_geomtypes.c
index 8632473..0c44f26 100644
--- a/lib/prop_geomtypes.c
+++ b/lib/prop_geomtypes.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib/prop_geomtypes.h b/lib/prop_geomtypes.h
index 7376474..504d125 100644
--- a/lib/prop_geomtypes.h
+++ b/lib/prop_geomtypes.h
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef PROP_GEOMTYPES_H
 #define PROP_GEOMTYPES_H
diff --git a/lib/prop_inttypes.c b/lib/prop_inttypes.c
index b1aaf06..5a806b8 100644
--- a/lib/prop_inttypes.c
+++ b/lib/prop_inttypes.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/prop_inttypes.h b/lib/prop_inttypes.h
index cc077af..15789a0 100644
--- a/lib/prop_inttypes.h
+++ b/lib/prop_inttypes.h
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef PROP_INTTYPES_H
 #define PROP_INTTYPES_H
diff --git a/lib/prop_matrix.c b/lib/prop_matrix.c
index 9dcfccd..3fa5f72 100644
--- a/lib/prop_matrix.c
+++ b/lib/prop_matrix.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 
diff --git a/lib/prop_matrix.h b/lib/prop_matrix.h
index 814e21d..02caeaa 100644
--- a/lib/prop_matrix.h
+++ b/lib/prop_matrix.h
@@ -20,8 +20,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef PROP_MATRIX_H
 #define PROP_MATRIX_H
diff --git a/lib/prop_pattern.c b/lib/prop_pattern.c
index 3005185..48b8918 100644
--- a/lib/prop_pattern.c
+++ b/lib/prop_pattern.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 
diff --git a/lib/prop_pattern.h b/lib/prop_pattern.h
index ceb8e56..f8b5420 100644
--- a/lib/prop_pattern.h
+++ b/lib/prop_pattern.h
@@ -20,8 +20,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef PROP_PATTERN_H
 #define PROP_PATTERN_H
diff --git a/lib/prop_pixbuf.c b/lib/prop_pixbuf.c
index b51e243..e4634f9 100644
--- a/lib/prop_pixbuf.c
+++ b/lib/prop_pixbuf.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 
diff --git a/lib/prop_pixbuf.h b/lib/prop_pixbuf.h
index 242c3cd..c4a9536 100644
--- a/lib/prop_pixbuf.h
+++ b/lib/prop_pixbuf.h
@@ -20,8 +20,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef PROP_PIXBUF_H
 #define PROP_PIXBUF_H
diff --git a/lib/prop_sdarray.c b/lib/prop_sdarray.c
index 5995820..c80ddca 100644
--- a/lib/prop_sdarray.c
+++ b/lib/prop_sdarray.c
@@ -21,8 +21,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib/prop_sdarray.h b/lib/prop_sdarray.h
index 9adeb1b..456a304 100644
--- a/lib/prop_sdarray.h
+++ b/lib/prop_sdarray.h
@@ -21,8 +21,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef PROP_SDARRAY_H
 #define PROP_SDARRAY_H
diff --git a/lib/prop_sdarray_widget.c b/lib/prop_sdarray_widget.c
index 438c8e8..31c541b 100644
--- a/lib/prop_sdarray_widget.c
+++ b/lib/prop_sdarray_widget.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/lib/prop_text.c b/lib/prop_text.c
index 447cd12..1fc6170 100644
--- a/lib/prop_text.c
+++ b/lib/prop_text.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/prop_text.h b/lib/prop_text.h
index ec8ad11..2789e7c 100644
--- a/lib/prop_text.h
+++ b/lib/prop_text.h
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef PROP_TEXT_H
 #define PROP_TEXT_H
diff --git a/lib/prop_widgets.c b/lib/prop_widgets.c
index 4d2a12f..68b33a0 100644
--- a/lib/prop_widgets.c
+++ b/lib/prop_widgets.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib/prop_widgets.h b/lib/prop_widgets.h
index 1bb775a..fed9d28 100644
--- a/lib/prop_widgets.h
+++ b/lib/prop_widgets.h
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef PROP_WIDGETS_H
 #define PROP_WIDGETS_H
diff --git a/lib/propdesc.c b/lib/propdesc.c
index b6f529b..0790c64 100644
--- a/lib/propdesc.c
+++ b/lib/propdesc.c
@@ -20,8 +20,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/propdialogs.c b/lib/propdialogs.c
index 273e1d1..df49001 100644
--- a/lib/propdialogs.c
+++ b/lib/propdialogs.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib/properties.c b/lib/properties.c
index e70de41..edbb8c4 100644
--- a/lib/properties.c
+++ b/lib/properties.c
@@ -20,8 +20,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/properties.h b/lib/properties.h
index 435e2e4..a4b2bca 100644
--- a/lib/properties.h
+++ b/lib/properties.h
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef LIB_PROPERTIES_H
diff --git a/lib/propinternals.h b/lib/propinternals.h
index 537b24e..eb98b24 100644
--- a/lib/propinternals.h
+++ b/lib/propinternals.h
@@ -21,8 +21,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef PROPINTERNALS_H
 #define PROPINTERNALS_H
diff --git a/lib/proplist.c b/lib/proplist.c
index e47ba2f..b69fb09 100644
--- a/lib/proplist.c
+++ b/lib/proplist.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/propobject.c b/lib/propobject.c
index 2e3f5f6..02eac4b 100644
--- a/lib/propobject.c
+++ b/lib/propobject.c
@@ -23,8 +23,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/propoffsets.c b/lib/propoffsets.c
index 60e53d2..efbedc2 100644
--- a/lib/propoffsets.c
+++ b/lib/propoffsets.c
@@ -20,8 +20,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glib.h>
diff --git a/lib/propregistry.c b/lib/propregistry.c
index 4bfe839..7a23164 100644
--- a/lib/propregistry.c
+++ b/lib/propregistry.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib/render_pixmap.c b/lib/render_pixmap.c
index 6bf9bbf..7563c75 100644
--- a/lib/render_pixmap.c
+++ b/lib/render_pixmap.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* This renderer is similar to RenderGdk, except that it renders onto
diff --git a/lib/render_pixmap.h b/lib/render_pixmap.h
index da0b05f..853adbc 100644
--- a/lib/render_pixmap.h
+++ b/lib/render_pixmap.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef RENDER_PIXMAP_H
 #define RENDER_PIXMAP_H
diff --git a/lib/sheet.c b/lib/sheet.c
index 7f02e65..4549a57 100644
--- a/lib/sheet.c
+++ b/lib/sheet.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/lib/sheet.h b/lib/sheet.h
index 2c47aed..01a5855 100644
--- a/lib/sheet.h
+++ b/lib/sheet.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef SHEET_H
 #define SHEET_H
diff --git a/lib/standard-path.c b/lib/standard-path.c
index 4a90ca9..b9faa07 100644
--- a/lib/standard-path.c
+++ b/lib/standard-path.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*!
diff --git a/lib/standard-path.h b/lib/standard-path.h
index a5ec7dd..af53be9 100644
--- a/lib/standard-path.h
+++ b/lib/standard-path.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef STANDARD_PATH_H
diff --git a/lib/text.c b/lib/text.c
index 592a4bc..e8570d5 100644
--- a/lib/text.c
+++ b/lib/text.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 
diff --git a/lib/text.h b/lib/text.h
index 368cff8..d2ac90d 100644
--- a/lib/text.h
+++ b/lib/text.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef TEXT_H
 #define TEXT_H
diff --git a/lib/textattr.h b/lib/textattr.h
index 993f7fc..fcf93bd 100644
--- a/lib/textattr.h
+++ b/lib/textattr.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef TEXTATTR_H
 #define TEXTATTR_H
diff --git a/lib/textline.c b/lib/textline.c
index 65eb9a0..c10a836 100644
--- a/lib/textline.c
+++ b/lib/textline.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 
diff --git a/lib/textline.h b/lib/textline.h
index 7cc938d..f81d2a7 100644
--- a/lib/textline.h
+++ b/lib/textline.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef TEXTLINE_H
 #define TEXTLINE_H
diff --git a/lib/units.h b/lib/units.h
index 49f1db6..193a43d 100644
--- a/lib/units.h
+++ b/lib/units.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef UNITS_H
 #define UNITS_H
diff --git a/lib/utils.c b/lib/utils.c
index e358bf6..bcb9c6b 100644
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* This file contains some code from glib.
diff --git a/lib/utils.h b/lib/utils.h
index 93252db..d6e568a 100644
--- a/lib/utils.h
+++ b/lib/utils.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef UTILS_H
 #define UTILS_H
diff --git a/lib/widgets.c b/lib/widgets.c
index d146763..f7e3d28 100644
--- a/lib/widgets.c
+++ b/lib/widgets.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/lib/widgets.h b/lib/widgets.h
index d35cb08..f353a41 100644
--- a/lib/widgets.h
+++ b/lib/widgets.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef WIDGETS_H
 #define WIDGETS_H
diff --git a/objects/AADL/aadl.c b/objects/AADL/aadl.c
old mode 100755
new mode 100644
index 40a5b1d..f2c4db7
--- a/objects/AADL/aadl.c
+++ b/objects/AADL/aadl.c
@@ -14,8 +14,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+* along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
 
diff --git a/objects/AADL/aadl.h b/objects/AADL/aadl.h
old mode 100755
new mode 100644
index 9050599..e2ccd8c
--- a/objects/AADL/aadl.h
+++ b/objects/AADL/aadl.h
@@ -14,8 +14,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+* along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
 
diff --git a/objects/AADL/aadlbox.c b/objects/AADL/aadlbox.c
old mode 100755
new mode 100644
index 921eb7b..b2c9a43
--- a/objects/AADL/aadlbox.c
+++ b/objects/AADL/aadlbox.c
@@ -14,8 +14,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+* along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
 
diff --git a/objects/AADL/aadlbus.c b/objects/AADL/aadlbus.c
old mode 100755
new mode 100644
index 0ab5e69..41ccc9d
--- a/objects/AADL/aadlbus.c
+++ b/objects/AADL/aadlbus.c
@@ -14,8 +14,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+* along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
 
diff --git a/objects/AADL/aadldata.c b/objects/AADL/aadldata.c
old mode 100755
new mode 100644
index 76019b3..1497904
--- a/objects/AADL/aadldata.c
+++ b/objects/AADL/aadldata.c
@@ -14,8 +14,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+* along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
 
diff --git a/objects/AADL/aadldevice.c b/objects/AADL/aadldevice.c
old mode 100755
new mode 100644
index 7e2496d..8bda3b1
--- a/objects/AADL/aadldevice.c
+++ b/objects/AADL/aadldevice.c
@@ -14,8 +14,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+* along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
 
diff --git a/objects/AADL/aadlmemory.c b/objects/AADL/aadlmemory.c
old mode 100755
new mode 100644
index ae2c308..419eab3
--- a/objects/AADL/aadlmemory.c
+++ b/objects/AADL/aadlmemory.c
@@ -14,8 +14,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+* along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
 
diff --git a/objects/AADL/aadlpackage.c b/objects/AADL/aadlpackage.c
old mode 100755
new mode 100644
index bdca818..58b5777
--- a/objects/AADL/aadlpackage.c
+++ b/objects/AADL/aadlpackage.c
@@ -14,8 +14,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+* along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
 
diff --git a/objects/AADL/aadlport.c b/objects/AADL/aadlport.c
old mode 100755
new mode 100644
index 9c20dca..ac4ecb3
--- a/objects/AADL/aadlport.c
+++ b/objects/AADL/aadlport.c
@@ -14,27 +14,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-
-/* AADL plugin for DIA 
- * Author: Pierre Duquesne
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+* along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "aadl.h"
diff --git a/objects/AADL/aadlprocess.c b/objects/AADL/aadlprocess.c
old mode 100755
new mode 100644
index 3111368..5ed1c15
--- a/objects/AADL/aadlprocess.c
+++ b/objects/AADL/aadlprocess.c
@@ -14,8 +14,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+* along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
 
diff --git a/objects/AADL/aadlprocessor.c b/objects/AADL/aadlprocessor.c
old mode 100755
new mode 100644
index 4b9499b..b420181
--- a/objects/AADL/aadlprocessor.c
+++ b/objects/AADL/aadlprocessor.c
@@ -14,8 +14,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+* along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
 
diff --git a/objects/AADL/aadlsubprogram.c b/objects/AADL/aadlsubprogram.c
old mode 100755
new mode 100644
index 5d4962e..86738ae
--- a/objects/AADL/aadlsubprogram.c
+++ b/objects/AADL/aadlsubprogram.c
@@ -14,8 +14,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+* along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
 
diff --git a/objects/AADL/aadlsystem.c b/objects/AADL/aadlsystem.c
old mode 100755
new mode 100644
index d243ced..d6b8ca5
--- a/objects/AADL/aadlsystem.c
+++ b/objects/AADL/aadlsystem.c
@@ -14,8 +14,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+* along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
 
diff --git a/objects/AADL/aadltext.c b/objects/AADL/aadltext.c
old mode 100755
new mode 100644
index 9e7d515..ef7e631
--- a/objects/AADL/aadltext.c
+++ b/objects/AADL/aadltext.c
@@ -14,8 +14,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+* along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "aadl.h"
diff --git a/objects/AADL/aadlthread.c b/objects/AADL/aadlthread.c
old mode 100755
new mode 100644
index ff7d411..c5c52d3
--- a/objects/AADL/aadlthread.c
+++ b/objects/AADL/aadlthread.c
@@ -14,8 +14,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+* along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
 
diff --git a/objects/AADL/aadlthreadgroup.c b/objects/AADL/aadlthreadgroup.c
old mode 100755
new mode 100644
index 72ba861..064ca34
--- a/objects/AADL/aadlthreadgroup.c
+++ b/objects/AADL/aadlthreadgroup.c
@@ -14,8 +14,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+* along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
 
diff --git a/objects/AADL/edit_port_declaration.c b/objects/AADL/edit_port_declaration.c
old mode 100755
new mode 100644
index fcc9171..ebc2cd2
--- a/objects/AADL/edit_port_declaration.c
+++ b/objects/AADL/edit_port_declaration.c
@@ -14,8 +14,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+* along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <config.h>
diff --git a/objects/AADL/edit_port_declaration.h b/objects/AADL/edit_port_declaration.h
old mode 100755
new mode 100644
index 921674a..d208c28
--- a/objects/AADL/edit_port_declaration.h
+++ b/objects/AADL/edit_port_declaration.h
@@ -14,8 +14,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+* along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
 
diff --git a/objects/Database/compound.c b/objects/Database/compound.c
index 524b1a0..47d5e9f 100644
--- a/objects/Database/compound.c
+++ b/objects/Database/compound.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * File:    compound.c
  *
diff --git a/objects/Database/database.c b/objects/Database/database.c
index 74106e3..b703518 100644
--- a/objects/Database/database.c
+++ b/objects/Database/database.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/Database/database.h b/objects/Database/database.h
index 8379de8..e814fce 100644
--- a/objects/Database/database.h
+++ b/objects/Database/database.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef DATABASE_H
diff --git a/objects/Database/reference.c b/objects/Database/reference.c
index ff98203..941f84f 100644
--- a/objects/Database/reference.c
+++ b/objects/Database/reference.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * File:    reference.c
  *
diff --git a/objects/Database/table.c b/objects/Database/table.c
index 3d19f49..acdcb25 100644
--- a/objects/Database/table.c
+++ b/objects/Database/table.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * File:    table.c
  *
diff --git a/objects/ER/attribute.c b/objects/ER/attribute.c
index c129b6a..ad515ed 100644
--- a/objects/ER/attribute.c
+++ b/objects/ER/attribute.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* DO NOT USE THIS OBJECT AS A BASIS FOR A NEW OBJECT. */
diff --git a/objects/ER/entity.c b/objects/ER/entity.c
index ed26a2b..82d708e 100644
--- a/objects/ER/entity.c
+++ b/objects/ER/entity.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* DO NOT USE THIS OBJECT AS A BASIS FOR A NEW OBJECT. */
diff --git a/objects/ER/er.c b/objects/ER/er.c
index 31e56c3..b194968 100644
--- a/objects/ER/er.c
+++ b/objects/ER/er.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/ER/participation.c b/objects/ER/participation.c
index 6fea3f9..4b9f7f8 100644
--- a/objects/ER/participation.c
+++ b/objects/ER/participation.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* DO NOT USE THIS OBJECT AS A BASIS FOR A NEW OBJECT. */
diff --git a/objects/ER/relationship.c b/objects/ER/relationship.c
index 425c01e..4299d7f 100644
--- a/objects/ER/relationship.c
+++ b/objects/ER/relationship.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* DO NOT USE THIS OBJECT AS A BASIS FOR A NEW OBJECT. */
diff --git a/objects/FS/flow-ortho.c b/objects/FS/flow-ortho.c
index 3f662f2..250a6a0 100644
--- a/objects/FS/flow-ortho.c
+++ b/objects/FS/flow-ortho.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* If you have a problem with the Function Structure (FS) components,
diff --git a/objects/FS/flow.c b/objects/FS/flow.c
index 05a88db..26a60f1 100644
--- a/objects/FS/flow.c
+++ b/objects/FS/flow.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* DO NOT USE THIS OBJECT AS A BASIS FOR A NEW OBJECT. */
diff --git a/objects/FS/fs.c b/objects/FS/fs.c
index 2030fca..f05d3d5 100644
--- a/objects/FS/fs.c
+++ b/objects/FS/fs.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/FS/function.c b/objects/FS/function.c
index 3e1122e..736661a 100644
--- a/objects/FS/function.c
+++ b/objects/FS/function.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* DO NOT USE THIS OBJECT AS A BASIS FOR A NEW OBJECT. */
diff --git a/objects/GRAFCET/action.c b/objects/GRAFCET/action.c
index ed4acaf..1e82c3e 100644
--- a/objects/GRAFCET/action.c
+++ b/objects/GRAFCET/action.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/GRAFCET/action_text_draw.c b/objects/GRAFCET/action_text_draw.c
index e6a2cab..7498611 100644
--- a/objects/GRAFCET/action_text_draw.c
+++ b/objects/GRAFCET/action_text_draw.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 
diff --git a/objects/GRAFCET/action_text_draw.h b/objects/GRAFCET/action_text_draw.h
index 846b5a2..9c67c2e 100644
--- a/objects/GRAFCET/action_text_draw.h
+++ b/objects/GRAFCET/action_text_draw.h
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/objects/GRAFCET/boolequation.c b/objects/GRAFCET/boolequation.c
index f446783..4e4c1fc 100644
--- a/objects/GRAFCET/boolequation.c
+++ b/objects/GRAFCET/boolequation.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/objects/GRAFCET/boolequation.h b/objects/GRAFCET/boolequation.h
index 1f2f6b7..6177f6a 100644
--- a/objects/GRAFCET/boolequation.h
+++ b/objects/GRAFCET/boolequation.h
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/objects/GRAFCET/condition.c b/objects/GRAFCET/condition.c
index 9984106..3b7f50b 100644
--- a/objects/GRAFCET/condition.c
+++ b/objects/GRAFCET/condition.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/GRAFCET/grafcet.c b/objects/GRAFCET/grafcet.c
index 4add6d4..451f20f 100644
--- a/objects/GRAFCET/grafcet.c
+++ b/objects/GRAFCET/grafcet.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/GRAFCET/grafcet.h b/objects/GRAFCET/grafcet.h
index e511892..9711a58 100644
--- a/objects/GRAFCET/grafcet.h
+++ b/objects/GRAFCET/grafcet.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef GRAFCET_H
 #define GRAFCET_H
diff --git a/objects/GRAFCET/step.c b/objects/GRAFCET/step.c
index cccfec0..9d54ca8 100644
--- a/objects/GRAFCET/step.c
+++ b/objects/GRAFCET/step.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/GRAFCET/transition.c b/objects/GRAFCET/transition.c
index 870ceb1..8be22c0 100644
--- a/objects/GRAFCET/transition.c
+++ b/objects/GRAFCET/transition.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/GRAFCET/vector.c b/objects/GRAFCET/vector.c
index 32806d7..e2b5336 100644
--- a/objects/GRAFCET/vector.c
+++ b/objects/GRAFCET/vector.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/GRAFCET/vergent.c b/objects/GRAFCET/vergent.c
index 7e206b0..ae0871a 100644
--- a/objects/GRAFCET/vergent.c
+++ b/objects/GRAFCET/vergent.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/Istar/actor.c b/objects/Istar/actor.c
index 6f3b82e..eddd422 100644
--- a/objects/Istar/actor.c
+++ b/objects/Istar/actor.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/Istar/goal.c b/objects/Istar/goal.c
index 13e0c67..a26bc1a 100644
--- a/objects/Istar/goal.c
+++ b/objects/Istar/goal.c
@@ -22,8 +22,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/Istar/istar.c b/objects/Istar/istar.c
index 7d2f9c5..79dc7cf 100644
--- a/objects/Istar/istar.c
+++ b/objects/Istar/istar.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
                 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/Istar/istar.h b/objects/Istar/istar.h
index 3f64e7d..a6055f9 100644
--- a/objects/Istar/istar.h
+++ b/objects/Istar/istar.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef ISTAR_H
diff --git a/objects/Istar/link.c b/objects/Istar/link.c
index 44174b9..44f03f2 100644
--- a/objects/Istar/link.c
+++ b/objects/Istar/link.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/Istar/other.c b/objects/Istar/other.c
index 662ff1d..d0ea498 100644
--- a/objects/Istar/other.c
+++ b/objects/Istar/other.c
@@ -21,8 +21,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/Jackson/domain.c b/objects/Jackson/domain.c
index 4d69a03..5f32570 100644
--- a/objects/Jackson/domain.c
+++ b/objects/Jackson/domain.c
@@ -21,8 +21,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/Jackson/jackson.c b/objects/Jackson/jackson.c
index 33614c2..85ac313 100644
--- a/objects/Jackson/jackson.c
+++ b/objects/Jackson/jackson.c
@@ -21,8 +21,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
                 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/Jackson/jackson.h b/objects/Jackson/jackson.h
index d2c72aa..af56a84 100644
--- a/objects/Jackson/jackson.h
+++ b/objects/Jackson/jackson.h
@@ -21,8 +21,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef JACKSON_H
diff --git a/objects/Jackson/phenomenon.c b/objects/Jackson/phenomenon.c
index df644dc..1388ddd 100644
--- a/objects/Jackson/phenomenon.c
+++ b/objects/Jackson/phenomenon.c
@@ -21,8 +21,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/Jackson/requirement.c b/objects/Jackson/requirement.c
index 5b676f7..a6c0b09 100644
--- a/objects/Jackson/requirement.c
+++ b/objects/Jackson/requirement.c
@@ -21,8 +21,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/KAOS/goal.c b/objects/KAOS/goal.c
index c3612c5..dc011fc 100644
--- a/objects/KAOS/goal.c
+++ b/objects/KAOS/goal.c
@@ -22,8 +22,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/KAOS/kaos.c b/objects/KAOS/kaos.c
index fc23a07..282db9a 100644
--- a/objects/KAOS/kaos.c
+++ b/objects/KAOS/kaos.c
@@ -22,8 +22,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
                 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/KAOS/kaos.h b/objects/KAOS/kaos.h
index be593e2..5860757 100644
--- a/objects/KAOS/kaos.h
+++ b/objects/KAOS/kaos.h
@@ -22,8 +22,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef KAOS_H
diff --git a/objects/KAOS/metaandorrel.c b/objects/KAOS/metaandorrel.c
index 9ecb18a..ca7d384 100644
--- a/objects/KAOS/metaandorrel.c
+++ b/objects/KAOS/metaandorrel.c
@@ -22,8 +22,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/KAOS/metabinrel.c b/objects/KAOS/metabinrel.c
index 637da8d..891713c 100644
--- a/objects/KAOS/metabinrel.c
+++ b/objects/KAOS/metabinrel.c
@@ -22,8 +22,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/KAOS/other.c b/objects/KAOS/other.c
index c12c314..c6f3c67 100644
--- a/objects/KAOS/other.c
+++ b/objects/KAOS/other.c
@@ -22,8 +22,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/Misc/analog_clock.c b/objects/Misc/analog_clock.c
index ae09384..24b16da 100644
--- a/objects/Misc/analog_clock.c
+++ b/objects/Misc/analog_clock.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/Misc/diagram_as_object.c b/objects/Misc/diagram_as_object.c
index 7b1911e..6d951f9 100644
--- a/objects/Misc/diagram_as_object.c
+++ b/objects/Misc/diagram_as_object.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 
diff --git a/objects/Misc/grid_object.c b/objects/Misc/grid_object.c
index efb52a2..c1e24f3 100644
--- a/objects/Misc/grid_object.c
+++ b/objects/Misc/grid_object.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/Misc/libmisc.c b/objects/Misc/libmisc.c
index e72ea9a..b37cadf 100644
--- a/objects/Misc/libmisc.c
+++ b/objects/Misc/libmisc.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/Misc/measure.c b/objects/Misc/measure.c
index 5469c10..93eb584 100644
--- a/objects/Misc/measure.c
+++ b/objects/Misc/measure.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 
diff --git a/objects/Misc/tree.c b/objects/Misc/tree.c
index cad8823..d96e21f 100644
--- a/objects/Misc/tree.c
+++ b/objects/Misc/tree.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/SADT/annotation.c b/objects/SADT/annotation.c
index 463db4e..ab89d16 100644
--- a/objects/SADT/annotation.c
+++ b/objects/SADT/annotation.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/SADT/arrow.c b/objects/SADT/arrow.c
index f03af29..95cfa14 100644
--- a/objects/SADT/arrow.c
+++ b/objects/SADT/arrow.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/SADT/box.c b/objects/SADT/box.c
index c099f3b..3f5b13e 100644
--- a/objects/SADT/box.c
+++ b/objects/SADT/box.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/SADT/sadt.c b/objects/SADT/sadt.c
index b87e911..de2da2f 100644
--- a/objects/SADT/sadt.c
+++ b/objects/SADT/sadt.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/SADT/sadt.h b/objects/SADT/sadt.h
index bd4825b..56ea9f5 100644
--- a/objects/SADT/sadt.h
+++ b/objects/SADT/sadt.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef SADT_H
 #define SADT_H
diff --git a/objects/UML/activity.c b/objects/UML/activity.c
index ddf3f4a..0e884c5 100644
--- a/objects/UML/activity.c
+++ b/objects/UML/activity.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/UML/actor.c b/objects/UML/actor.c
index cdb59ad..57ab12e 100644
--- a/objects/UML/actor.c
+++ b/objects/UML/actor.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/objects/UML/association.c b/objects/UML/association.c
index c0814cd..94984f7 100644
--- a/objects/UML/association.c
+++ b/objects/UML/association.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  *
  */
diff --git a/objects/UML/branch.c b/objects/UML/branch.c
index a1f4098..a13202d 100644
--- a/objects/UML/branch.c
+++ b/objects/UML/branch.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/UML/class.c b/objects/UML/class.c
index cdeb398..651c46d 100644
--- a/objects/UML/class.c
+++ b/objects/UML/class.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * File:    class.c
  *
diff --git a/objects/UML/class.h b/objects/UML/class.h
index 46bc07f..29beb6e 100644
--- a/objects/UML/class.h
+++ b/objects/UML/class.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * File:    class.h
  *
diff --git a/objects/UML/class_attributes_dialog.c b/objects/UML/class_attributes_dialog.c
index ce05bff..65940b7 100644
--- a/objects/UML/class_attributes_dialog.c
+++ b/objects/UML/class_attributes_dialog.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 #include <config.h>
diff --git a/objects/UML/class_dialog.c b/objects/UML/class_dialog.c
index 2910924..9acfda2 100644
--- a/objects/UML/class_dialog.c
+++ b/objects/UML/class_dialog.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * File:    class_dialog.c
  *
diff --git a/objects/UML/class_operations_dialog.c b/objects/UML/class_operations_dialog.c
index 607ba22..43c497a 100644
--- a/objects/UML/class_operations_dialog.c
+++ b/objects/UML/class_operations_dialog.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 #include <config.h>
diff --git a/objects/UML/class_templates_dialog.c b/objects/UML/class_templates_dialog.c
index 9f9fadb..094088b 100644
--- a/objects/UML/class_templates_dialog.c
+++ b/objects/UML/class_templates_dialog.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 #include <config.h>
diff --git a/objects/UML/classicon.c b/objects/UML/classicon.c
index 26730d3..f309a77 100644
--- a/objects/UML/classicon.c
+++ b/objects/UML/classicon.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/UML/component.c b/objects/UML/component.c
index ce47943..69c44c3 100644
--- a/objects/UML/component.c
+++ b/objects/UML/component.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/UML/component_feature.c b/objects/UML/component_feature.c
index 4b04c32..3a0f969 100644
--- a/objects/UML/component_feature.c
+++ b/objects/UML/component_feature.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/objects/UML/constraint.c b/objects/UML/constraint.c
index 35baf3b..76a4a5b 100644
--- a/objects/UML/constraint.c
+++ b/objects/UML/constraint.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/UML/dependency.c b/objects/UML/dependency.c
index 2ca6957..c11fe42 100644
--- a/objects/UML/dependency.c
+++ b/objects/UML/dependency.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/UML/fork.c b/objects/UML/fork.c
index 098d187..c109cab 100644
--- a/objects/UML/fork.c
+++ b/objects/UML/fork.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/UML/generalization.c b/objects/UML/generalization.c
index c4a9b01..6a43880 100644
--- a/objects/UML/generalization.c
+++ b/objects/UML/generalization.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/UML/implements.c b/objects/UML/implements.c
index cce4fac..fcc0ece 100644
--- a/objects/UML/implements.c
+++ b/objects/UML/implements.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/UML/large_package.c b/objects/UML/large_package.c
index 2530551..b5e0987 100644
--- a/objects/UML/large_package.c
+++ b/objects/UML/large_package.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/UML/lifeline.c b/objects/UML/lifeline.c
index 351eff2..895dc22 100644
--- a/objects/UML/lifeline.c
+++ b/objects/UML/lifeline.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/UML/message.c b/objects/UML/message.c
index 0160383..6a31395 100644
--- a/objects/UML/message.c
+++ b/objects/UML/message.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/UML/node.c b/objects/UML/node.c
index 89379ba..4674c68 100644
--- a/objects/UML/node.c
+++ b/objects/UML/node.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/UML/note.c b/objects/UML/note.c
index 35c7940..2390965 100644
--- a/objects/UML/note.c
+++ b/objects/UML/note.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/UML/object.c b/objects/UML/object.c
index 437bb0e..7cde7a9 100644
--- a/objects/UML/object.c
+++ b/objects/UML/object.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/UML/realizes.c b/objects/UML/realizes.c
index 30c7c41..12d61df 100644
--- a/objects/UML/realizes.c
+++ b/objects/UML/realizes.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/UML/small_package.c b/objects/UML/small_package.c
index 72bbc31..0e23096 100644
--- a/objects/UML/small_package.c
+++ b/objects/UML/small_package.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/UML/state.c b/objects/UML/state.c
index 07017b1..0c0cac8 100644
--- a/objects/UML/state.c
+++ b/objects/UML/state.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/UML/state_term.c b/objects/UML/state_term.c
index 9d2dde8..0ee70c2 100644
--- a/objects/UML/state_term.c
+++ b/objects/UML/state_term.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/UML/stereotype.c b/objects/UML/stereotype.c
index c15f1ec..4b0c7d2 100644
--- a/objects/UML/stereotype.c
+++ b/objects/UML/stereotype.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Separate functions to handle stereotypes in guillemots. */
diff --git a/objects/UML/stereotype.h b/objects/UML/stereotype.h
index 6dee5d2..0667ce1 100644
--- a/objects/UML/stereotype.h
+++ b/objects/UML/stereotype.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef STEREOTYPE_H
diff --git a/objects/UML/transition.c b/objects/UML/transition.c
index 0d5ab9a..0918e23 100644
--- a/objects/UML/transition.c
+++ b/objects/UML/transition.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/UML/uml.c b/objects/UML/uml.c
index ccf98ac..a372d3d 100644
--- a/objects/UML/uml.c
+++ b/objects/UML/uml.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/UML/uml.h b/objects/UML/uml.h
index 0d30b0c..ac1df76 100644
--- a/objects/UML/uml.h
+++ b/objects/UML/uml.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /** \file objects/UML/uml.h  Objects contained  in 'UML - Class' type also and helper functions */
diff --git a/objects/UML/umlattribute.c b/objects/UML/umlattribute.c
index 67c61d9..a82471b 100644
--- a/objects/UML/umlattribute.c
+++ b/objects/UML/umlattribute.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/UML/umlformalparameter.c b/objects/UML/umlformalparameter.c
index 10224f9..ec45d3b 100644
--- a/objects/UML/umlformalparameter.c
+++ b/objects/UML/umlformalparameter.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/UML/umloperation.c b/objects/UML/umloperation.c
index bf7924c..0cfb1e8 100644
--- a/objects/UML/umloperation.c
+++ b/objects/UML/umloperation.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/objects/UML/umlparameter.c b/objects/UML/umlparameter.c
index 0fb3522..f571215 100644
--- a/objects/UML/umlparameter.c
+++ b/objects/UML/umlparameter.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/UML/usecase.c b/objects/UML/usecase.c
index 3159940..46fbaf4 100644
--- a/objects/UML/usecase.c
+++ b/objects/UML/usecase.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/chronogram/chronogram.c b/objects/chronogram/chronogram.c
index 994048d..d08eaf1 100644
--- a/objects/chronogram/chronogram.c
+++ b/objects/chronogram/chronogram.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/chronogram/chronogram.h b/objects/chronogram/chronogram.h
index b8cce05..b2ad2f0 100644
--- a/objects/chronogram/chronogram.h
+++ b/objects/chronogram/chronogram.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef CHRONOGRAM_H
 #define CHRONOGRAM_H
diff --git a/objects/chronogram/chronoline.c b/objects/chronogram/chronoline.c
index 7013226..1d902b3 100644
--- a/objects/chronogram/chronoline.c
+++ b/objects/chronogram/chronoline.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/chronogram/chronoline_event.c b/objects/chronogram/chronoline_event.c
index 01afefc..e6db1f0 100644
--- a/objects/chronogram/chronoline_event.c
+++ b/objects/chronogram/chronoline_event.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/objects/chronogram/chronoline_event.h b/objects/chronogram/chronoline_event.h
index 881440b..0079230 100644
--- a/objects/chronogram/chronoline_event.h
+++ b/objects/chronogram/chronoline_event.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __CHRONOLINE_EVENT_H
diff --git a/objects/chronogram/chronoref.c b/objects/chronogram/chronoref.c
index aa207bc..38574e9 100644
--- a/objects/chronogram/chronoref.c
+++ b/objects/chronogram/chronoref.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/custom/custom.c b/objects/custom/custom.c
index 5de009d..692d638 100644
--- a/objects/custom/custom.c
+++ b/objects/custom/custom.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/objects/custom/custom_object.c b/objects/custom/custom_object.c
index b8d27ff..c48605d 100644
--- a/objects/custom/custom_object.c
+++ b/objects/custom/custom_object.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/custom/custom_object.h b/objects/custom/custom_object.h
index 24c81be..9e4cbca 100644
--- a/objects/custom/custom_object.h
+++ b/objects/custom/custom_object.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef CUSTOM_OBJECT_H
diff --git a/objects/custom/custom_util.c b/objects/custom/custom_util.c
index e276aff..10a3e0a 100644
--- a/objects/custom/custom_util.c
+++ b/objects/custom/custom_util.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/objects/custom/custom_util.h b/objects/custom/custom_util.h
index 85289d7..67ad443 100644
--- a/objects/custom/custom_util.h
+++ b/objects/custom/custom_util.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _CUSTOM_UTIL_H_
diff --git a/objects/custom/shape_info.c b/objects/custom/shape_info.c
index 6a3e757..9444cc9 100644
--- a/objects/custom/shape_info.c
+++ b/objects/custom/shape_info.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 
diff --git a/objects/custom/shape_info.h b/objects/custom/shape_info.h
index fba702a..1b2375a 100644
--- a/objects/custom/shape_info.h
+++ b/objects/custom/shape_info.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef _SHAPE_INFO_H_
 #define _SHAPE_INFO_H_
diff --git a/objects/custom/shape_typeinfo.c b/objects/custom/shape_typeinfo.c
index 6f3d7cd..ddfede6 100644
--- a/objects/custom/shape_typeinfo.c
+++ b/objects/custom/shape_typeinfo.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 
diff --git a/objects/custom_lines/custom_lines.c b/objects/custom_lines/custom_lines.c
index 0591630..da14461 100644
--- a/objects/custom_lines/custom_lines.c
+++ b/objects/custom_lines/custom_lines.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/objects/custom_lines/custom_linetypes.c b/objects/custom_lines/custom_linetypes.c
index 480c8e7..aaea5d9 100644
--- a/objects/custom_lines/custom_linetypes.c
+++ b/objects/custom_lines/custom_linetypes.c
@@ -21,8 +21,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <assert.h>
diff --git a/objects/custom_lines/custom_linetypes.h b/objects/custom_lines/custom_linetypes.h
index e5f6979..3e5af70 100644
--- a/objects/custom_lines/custom_linetypes.h
+++ b/objects/custom_lines/custom_linetypes.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef _CUSTOM_LINETYPES_H_
 #define _CUSTOM_LINETYPES_H_
diff --git a/objects/custom_lines/line_info.c b/objects/custom_lines/line_info.c
index 5341ea4..23f7e26 100644
--- a/objects/custom_lines/line_info.c
+++ b/objects/custom_lines/line_info.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdlib.h>
diff --git a/objects/custom_lines/line_info.h b/objects/custom_lines/line_info.h
index 48c0b2d..f10835a 100644
--- a/objects/custom_lines/line_info.h
+++ b/objects/custom_lines/line_info.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef _LINE_INFO_H_
 #define _LINE_INFO_H_
diff --git a/objects/custom_lines/pixmaps/default.xpm b/objects/custom_lines/pixmaps/default.xpm
index e16304d..28b477e 100644
--- a/objects/custom_lines/pixmaps/default.xpm
+++ b/objects/custom_lines/pixmaps/default.xpm
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* XPM */
diff --git a/objects/flowchart/box.c b/objects/flowchart/box.c
index f3330c8..5296ee1 100644
--- a/objects/flowchart/box.c
+++ b/objects/flowchart/box.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* DO NOT USE THIS OBJECT AS A BASIS FOR A NEW OBJECT. */
diff --git a/objects/flowchart/diamond.c b/objects/flowchart/diamond.c
index 62f2070..4ce1e90 100644
--- a/objects/flowchart/diamond.c
+++ b/objects/flowchart/diamond.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* DO NOT USE THIS OBJECT AS A BASIS FOR A NEW OBJECT. */
diff --git a/objects/flowchart/ellipse.c b/objects/flowchart/ellipse.c
index f1ebab5..3bb7cec 100644
--- a/objects/flowchart/ellipse.c
+++ b/objects/flowchart/ellipse.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* DO NOT USE THIS OBJECT AS A BASIS FOR A NEW OBJECT. */
diff --git a/objects/flowchart/flowchart.c b/objects/flowchart/flowchart.c
index d1c05c4..bc6aa6e 100644
--- a/objects/flowchart/flowchart.c
+++ b/objects/flowchart/flowchart.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/flowchart/parallelogram.c b/objects/flowchart/parallelogram.c
index b8c0867..0774560 100644
--- a/objects/flowchart/parallelogram.c
+++ b/objects/flowchart/parallelogram.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* DO NOT USE THIS OBJECT AS A BASIS FOR A NEW OBJECT. */
diff --git a/objects/network/basestation.c b/objects/network/basestation.c
index 7dd2728..3f34e94 100644
--- a/objects/network/basestation.c
+++ b/objects/network/basestation.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Copyright 2003, W. Borgert <debacle debian org>
diff --git a/objects/network/bus.c b/objects/network/bus.c
index 7072542..65979e4 100644
--- a/objects/network/bus.c
+++ b/objects/network/bus.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/network/network.c b/objects/network/network.c
index 64ea5c8..99c5370 100644
--- a/objects/network/network.c
+++ b/objects/network/network.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/network/network.h b/objects/network/network.h
index d74423e..84ed81e 100644
--- a/objects/network/network.h
+++ b/objects/network/network.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef NETWORK_H
 #define NETWORK_H
diff --git a/objects/network/radiocell.c b/objects/network/radiocell.c
index 636156d..5b9cd47 100644
--- a/objects/network/radiocell.c
+++ b/objects/network/radiocell.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Copyright 2003, W. Borgert <debacle debian org>
diff --git a/objects/network/wanlink.c b/objects/network/wanlink.c
index 043347a..b33a51c 100644
--- a/objects/network/wanlink.c
+++ b/objects/network/wanlink.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <assert.h>
diff --git a/objects/standard/arc.c b/objects/standard/arc.c
index dd2258e..ca8f98d 100644
--- a/objects/standard/arc.c
+++ b/objects/standard/arc.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
  /*! \file arc.c -- Implementation of "Standard - Arc" */
diff --git a/objects/standard/bezier.c b/objects/standard/bezier.c
index e3286a2..23b4905 100644
--- a/objects/standard/bezier.c
+++ b/objects/standard/bezier.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/standard/beziergon.c b/objects/standard/beziergon.c
index d9761d0..8c6f149 100644
--- a/objects/standard/beziergon.c
+++ b/objects/standard/beziergon.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/standard/box.c b/objects/standard/box.c
index b295678..cf865fc 100644
--- a/objects/standard/box.c
+++ b/objects/standard/box.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/standard/ellipse.c b/objects/standard/ellipse.c
index 1264279..be7ecfe 100644
--- a/objects/standard/ellipse.c
+++ b/objects/standard/ellipse.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/standard/image.c b/objects/standard/image.c
index 2957464..5cabfc1 100644
--- a/objects/standard/image.c
+++ b/objects/standard/image.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 
diff --git a/objects/standard/line.c b/objects/standard/line.c
index f2f2edf..8b3097c 100644
--- a/objects/standard/line.c
+++ b/objects/standard/line.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*! \file line.c -- Implements the "Standard - Line" object */
diff --git a/objects/standard/outline.c b/objects/standard/outline.c
index db42d5a..b91f19e 100644
--- a/objects/standard/outline.c
+++ b/objects/standard/outline.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*!
diff --git a/objects/standard/polygon.c b/objects/standard/polygon.c
index 2444922..063fe3d 100644
--- a/objects/standard/polygon.c
+++ b/objects/standard/polygon.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/standard/polyline.c b/objects/standard/polyline.c
index 8fc8dca..ae613bd 100644
--- a/objects/standard/polyline.c
+++ b/objects/standard/polyline.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/standard/standard.c b/objects/standard/standard.c
index ea75b97..38b9e9d 100644
--- a/objects/standard/standard.c
+++ b/objects/standard/standard.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/standard/textobj.c b/objects/standard/textobj.c
index bec7e8e..70c9bca 100644
--- a/objects/standard/textobj.c
+++ b/objects/standard/textobj.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/objects/standard/zigzagline.c b/objects/standard/zigzagline.c
index 9953a35..8acf369 100644
--- a/objects/standard/zigzagline.c
+++ b/objects/standard/zigzagline.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/plug-ins/cairo/diacairo-interactive.c b/plug-ins/cairo/diacairo-interactive.c
index 9cd2296..d54bfd5 100644
--- a/plug-ins/cairo/diacairo-interactive.c
+++ b/plug-ins/cairo/diacairo-interactive.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "diacairo.h"
diff --git a/plug-ins/cairo/diacairo-print.c b/plug-ins/cairo/diacairo-print.c
index 2721297..3de37c4 100644
--- a/plug-ins/cairo/diacairo-print.c
+++ b/plug-ins/cairo/diacairo-print.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "diacairo.h"
diff --git a/plug-ins/cairo/diacairo-renderer.c b/plug-ins/cairo/diacairo-renderer.c
index 334a416..67d3330 100644
--- a/plug-ins/cairo/diacairo-renderer.c
+++ b/plug-ins/cairo/diacairo-renderer.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/plug-ins/cairo/diacairo.c b/plug-ins/cairo/diacairo.c
index ef5ac10..dc75112 100644
--- a/plug-ins/cairo/diacairo.c
+++ b/plug-ins/cairo/diacairo.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/plug-ins/cairo/diacairo.h b/plug-ins/cairo/diacairo.h
index b4b809e..165c26e 100644
--- a/plug-ins/cairo/diacairo.h
+++ b/plug-ins/cairo/diacairo.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <cairo.h>
diff --git a/plug-ins/cgm/cgm.c b/plug-ins/cgm/cgm.c
index b80f483..407ff73 100644
--- a/plug-ins/cgm/cgm.c
+++ b/plug-ins/cgm/cgm.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/plug-ins/drs/dia-render-script-import.c b/plug-ins/drs/dia-render-script-import.c
index 9bec0ed..b334333 100644
--- a/plug-ins/drs/dia-render-script-import.c
+++ b/plug-ins/drs/dia-render-script-import.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*!  \file dia-render-script-import.c import of dia-render-script either to 
diff --git a/plug-ins/drs/dia-render-script-renderer.c b/plug-ins/drs/dia-render-script-renderer.c
index fa90842..c22b4c0 100644
--- a/plug-ins/drs/dia-render-script-renderer.c
+++ b/plug-ins/drs/dia-render-script-renderer.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*! A DiaRenderer mapping every renderer method to some metafile representation */
diff --git a/plug-ins/drs/dia-render-script-renderer.h b/plug-ins/drs/dia-render-script-renderer.h
index 4e52080..507c6d5 100644
--- a/plug-ins/drs/dia-render-script-renderer.h
+++ b/plug-ins/drs/dia-render-script-renderer.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "diarenderer.h"
 #include <libxml/tree.h>
diff --git a/plug-ins/drs/dia-render-script.c b/plug-ins/drs/dia-render-script.c
index 566f4fd..3804ceb 100644
--- a/plug-ins/drs/dia-render-script.c
+++ b/plug-ins/drs/dia-render-script.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Dia Render File - Serialization of Dia  Renderers.
diff --git a/plug-ins/drs/dia-render-script.h b/plug-ins/drs/dia-render-script.h
index 823c27b..646cf29 100644
--- a/plug-ins/drs/dia-render-script.h
+++ b/plug-ins/drs/dia-render-script.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 gboolean import_drs (const gchar *filename, DiagramData *dia, DiaContext *ctx, void* user_data);
diff --git a/plug-ins/dxf/autocad_pal.c b/plug-ins/dxf/autocad_pal.c
index 3a5e66f..176e1d9 100644
--- a/plug-ins/dxf/autocad_pal.c
+++ b/plug-ins/dxf/autocad_pal.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "config.h"
 
diff --git a/plug-ins/dxf/autocad_pal.h b/plug-ins/dxf/autocad_pal.h
index e1607ea..2c34893 100644
--- a/plug-ins/dxf/autocad_pal.h
+++ b/plug-ins/dxf/autocad_pal.h
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef AUTOCAD_PAL_H
 #define AUTOCAD_PAL_H
diff --git a/plug-ins/dxf/dxf-export.c b/plug-ins/dxf/dxf-export.c
index a858c8e..98951d8 100644
--- a/plug-ins/dxf/dxf-export.c
+++ b/plug-ins/dxf/dxf-export.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/plug-ins/dxf/dxf-import.c b/plug-ins/dxf/dxf-import.c
index 77f82b6..21e1130 100644
--- a/plug-ins/dxf/dxf-import.c
+++ b/plug-ins/dxf/dxf-import.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
  
 #ifdef HAVE_CONFIG_H
diff --git a/plug-ins/dxf/dxf.c b/plug-ins/dxf/dxf.c
index aa245be..55f536d 100644
--- a/plug-ins/dxf/dxf.c
+++ b/plug-ins/dxf/dxf.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/plug-ins/hpgl/hpgl.c b/plug-ins/hpgl/hpgl.c
index dbb16ad..e771db1 100644
--- a/plug-ins/hpgl/hpgl.c
+++ b/plug-ins/hpgl/hpgl.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/plug-ins/layout/dia-graph.cpp b/plug-ins/layout/dia-graph.cpp
index 7542fd1..528e7cd 100644
--- a/plug-ins/layout/dia-graph.cpp
+++ b/plug-ins/layout/dia-graph.cpp
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 
diff --git a/plug-ins/layout/layout.cpp b/plug-ins/layout/layout.cpp
index 6b066e4..5b13719 100644
--- a/plug-ins/layout/layout.cpp
+++ b/plug-ins/layout/layout.cpp
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
  
 /*!
diff --git a/plug-ins/libart/dialibart.c b/plug-ins/libart/dialibart.c
index 4eafa34..32ac0fe 100644
--- a/plug-ins/libart/dialibart.c
+++ b/plug-ins/libart/dialibart.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/plug-ins/libart/dialibartrenderer.c b/plug-ins/libart/dialibartrenderer.c
index 3c4b56d..5212d12 100644
--- a/plug-ins/libart/dialibartrenderer.c
+++ b/plug-ins/libart/dialibartrenderer.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/plug-ins/libart/export_png.c b/plug-ins/libart/export_png.c
index a9daec9..12c26de 100644
--- a/plug-ins/libart/export_png.c
+++ b/plug-ins/libart/export_png.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/plug-ins/libart/render_libart.c b/plug-ins/libart/render_libart.c
index db54e1f..2b39e7a 100644
--- a/plug-ins/libart/render_libart.c
+++ b/plug-ins/libart/render_libart.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/plug-ins/libart/render_libart.h b/plug-ins/libart/render_libart.h
index ae5fffe..788e0e9 100644
--- a/plug-ins/libart/render_libart.h
+++ b/plug-ins/libart/render_libart.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef RENDER_LIBART_H
 #define RENDER_LIBART_H
diff --git a/plug-ins/metapost/metapost.c b/plug-ins/metapost/metapost.c
index fc52dad..952ed66 100644
--- a/plug-ins/metapost/metapost.c
+++ b/plug-ins/metapost/metapost.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 #include "render_metapost.h"
diff --git a/plug-ins/metapost/render_metapost.c b/plug-ins/metapost/render_metapost.c
index 04fae41..2045e7f 100644
--- a/plug-ins/metapost/render_metapost.c
+++ b/plug-ins/metapost/render_metapost.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/plug-ins/metapost/render_metapost.h b/plug-ins/metapost/render_metapost.h
index 7758d8f..2867afd 100644
--- a/plug-ins/metapost/render_metapost.h
+++ b/plug-ins/metapost/render_metapost.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef RENDER_METAPOST_H
 #define RENDER_METAPOST_H
diff --git a/plug-ins/pdf/pdf-import.cpp b/plug-ins/pdf/pdf-import.cpp
index da00a18..6ec8ed1 100644
--- a/plug-ins/pdf/pdf-import.cpp
+++ b/plug-ins/pdf/pdf-import.cpp
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "config.h"
 
diff --git a/plug-ins/pdf/pdf.c b/plug-ins/pdf/pdf.c
index fd5b0ec..9d430b8 100644
--- a/plug-ins/pdf/pdf.c
+++ b/plug-ins/pdf/pdf.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 #include "intl.h"
diff --git a/plug-ins/pgf/render_pgf.c b/plug-ins/pgf/render_pgf.c
index ff3c125..75ae3f3 100644
--- a/plug-ins/pgf/render_pgf.c
+++ b/plug-ins/pgf/render_pgf.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/plug-ins/pgf/render_pgf.h b/plug-ins/pgf/render_pgf.h
index d5b9ce5..5592995 100644
--- a/plug-ins/pgf/render_pgf.h
+++ b/plug-ins/pgf/render_pgf.h
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef RENDER_PGF_H
 #define RENDER_PGF_H
diff --git a/plug-ins/pixbuf/pixbuf.c b/plug-ins/pixbuf/pixbuf.c
index b8bd536..f779934 100644
--- a/plug-ins/pixbuf/pixbuf.c
+++ b/plug-ins/pixbuf/pixbuf.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <string.h>
diff --git a/plug-ins/postscript/diapsft2renderer.c b/plug-ins/postscript/diapsft2renderer.c
index 9399ee9..e816c5f 100644
--- a/plug-ins/postscript/diapsft2renderer.c
+++ b/plug-ins/postscript/diapsft2renderer.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/plug-ins/postscript/diapsrenderer.c b/plug-ins/postscript/diapsrenderer.c
index c2dd07e..a5fe78c 100644
--- a/plug-ins/postscript/diapsrenderer.c
+++ b/plug-ins/postscript/diapsrenderer.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/plug-ins/postscript/paginate_psprint.c b/plug-ins/postscript/paginate_psprint.c
index f36db52..6d46331 100644
--- a/plug-ins/postscript/paginate_psprint.c
+++ b/plug-ins/postscript/paginate_psprint.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/plug-ins/postscript/paginate_psprint.h b/plug-ins/postscript/paginate_psprint.h
index eacc278..62b72f3 100644
--- a/plug-ins/postscript/paginate_psprint.h
+++ b/plug-ins/postscript/paginate_psprint.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _PAGINATE_PSPRINT_H
diff --git a/plug-ins/postscript/postscript.c b/plug-ins/postscript/postscript.c
index 1859c4b..ea5c31e 100644
--- a/plug-ins/postscript/postscript.c
+++ b/plug-ins/postscript/postscript.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/plug-ins/postscript/ps-utf8.c b/plug-ins/postscript/ps-utf8.c
index 3103b3d..41f18bc 100644
--- a/plug-ins/postscript/ps-utf8.c
+++ b/plug-ins/postscript/ps-utf8.c
@@ -20,8 +20,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "ps-utf8.h"
 
diff --git a/plug-ins/postscript/ps-utf8.h b/plug-ins/postscript/ps-utf8.h
index e25eb94..330ac58 100644
--- a/plug-ins/postscript/ps-utf8.h
+++ b/plug-ins/postscript/ps-utf8.h
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef PS_UTF8_H
diff --git a/plug-ins/postscript/render_eps.c b/plug-ins/postscript/render_eps.c
index 5cd8a58..f19d9f5 100644
--- a/plug-ins/postscript/render_eps.c
+++ b/plug-ins/postscript/render_eps.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* The eps_dump_truetype_body function and much inspiration for font dumping
diff --git a/plug-ins/postscript/render_eps.h b/plug-ins/postscript/render_eps.h
index 9f9bb51..ac16b8b 100644
--- a/plug-ins/postscript/render_eps.h
+++ b/plug-ins/postscript/render_eps.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef RENDER_EPS_H
 #define RENDER_EPS_H
diff --git a/plug-ins/postscript/win32print.c b/plug-ins/postscript/win32print.c
index 10f1e2d..3ff7b9b 100644
--- a/plug-ins/postscript/win32print.c
+++ b/plug-ins/postscript/win32print.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/plug-ins/pstricks/render_pstricks.c b/plug-ins/pstricks/render_pstricks.c
index 47876f7..2c561c0 100644
--- a/plug-ins/pstricks/render_pstricks.c
+++ b/plug-ins/pstricks/render_pstricks.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/plug-ins/pstricks/render_pstricks.h b/plug-ins/pstricks/render_pstricks.h
index 3cdb1a5..51c3c96 100644
--- a/plug-ins/pstricks/render_pstricks.h
+++ b/plug-ins/pstricks/render_pstricks.h
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef RENDER_PSTRICKS_H
 #define RENDER_PSTRICKS_H
diff --git a/plug-ins/shape/shape-export.c b/plug-ins/shape/shape-export.c
index e42c0e8..b44af56 100644
--- a/plug-ins/shape/shape-export.c
+++ b/plug-ins/shape/shape-export.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 /*
  * TODO:
diff --git a/plug-ins/shape/shape.c b/plug-ins/shape/shape.c
index 1ccb963..f9e99e1 100644
--- a/plug-ins/shape/shape.c
+++ b/plug-ins/shape/shape.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/plug-ins/stress/stress-memory.c b/plug-ins/stress/stress-memory.c
index 46b8d84..f75e8bc 100644
--- a/plug-ins/stress/stress-memory.c
+++ b/plug-ins/stress/stress-memory.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* NOTHING Dia specific HERE */
diff --git a/plug-ins/stress/stress.c b/plug-ins/stress/stress.c
index 1dc04c6..40b74f3 100644
--- a/plug-ins/stress/stress.c
+++ b/plug-ins/stress/stress.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 
diff --git a/plug-ins/svg/render_svg.c b/plug-ins/svg/render_svg.c
index d0685ab..4e1e65e 100644
--- a/plug-ins/svg/render_svg.c
+++ b/plug-ins/svg/render_svg.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 
diff --git a/plug-ins/svg/svg-import.c b/plug-ins/svg/svg-import.c
index 2bb7dde..9544082 100644
--- a/plug-ins/svg/svg-import.c
+++ b/plug-ins/svg/svg-import.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/plug-ins/svg/svg.c b/plug-ins/svg/svg.c
index 8c6d8d3..b38f532 100644
--- a/plug-ins/svg/svg.c
+++ b/plug-ins/svg/svg.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/plug-ins/vdx/vdx-common.c b/plug-ins/vdx/vdx-common.c
index 5a6f52e..351960a 100644
--- a/plug-ins/vdx/vdx-common.c
+++ b/plug-ins/vdx/vdx-common.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdio.h>
diff --git a/plug-ins/vdx/vdx-export.c b/plug-ins/vdx/vdx-export.c
index 812a3ba..0e602ca 100644
--- a/plug-ins/vdx/vdx-export.c
+++ b/plug-ins/vdx/vdx-export.c
@@ -20,8 +20,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/plug-ins/vdx/vdx-import.c b/plug-ins/vdx/vdx-import.c
index bbc25f8..09393d9 100644
--- a/plug-ins/vdx/vdx-import.c
+++ b/plug-ins/vdx/vdx-import.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/plug-ins/vdx/vdx-xml.c b/plug-ins/vdx/vdx-xml.c
index 70afb26..06fde7e 100644
--- a/plug-ins/vdx/vdx-xml.c
+++ b/plug-ins/vdx/vdx-xml.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Generated Wed Jan 24 17:00:55 2007 */
diff --git a/plug-ins/vdx/vdx.c b/plug-ins/vdx/vdx.c
index 82ddc4b..2c7a3a1 100644
--- a/plug-ins/vdx/vdx.c
+++ b/plug-ins/vdx/vdx.c
@@ -20,8 +20,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/plug-ins/vdx/vdx.h b/plug-ins/vdx/vdx.h
index ca223c1..f3acd8b 100644
--- a/plug-ins/vdx/vdx.h
+++ b/plug-ins/vdx/vdx.h
@@ -20,8 +20,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef VISIO_H
diff --git a/plug-ins/vdx/visio-types.h b/plug-ins/vdx/visio-types.h
index 4d9111f..251d2a2 100644
--- a/plug-ins/vdx/visio-types.h
+++ b/plug-ins/vdx/visio-types.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Generated Wed Jan 24 17:00:55 2007 */
diff --git a/plug-ins/wmf/paginate_gdiprint.cpp b/plug-ins/wmf/paginate_gdiprint.cpp
index e54fbad..4299cdf 100644
--- a/plug-ins/wmf/paginate_gdiprint.cpp
+++ b/plug-ins/wmf/paginate_gdiprint.cpp
@@ -22,8 +22,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glib.h>
diff --git a/plug-ins/wmf/wmf.cpp b/plug-ins/wmf/wmf.cpp
index cc55892..a4a1a68 100644
--- a/plug-ins/wmf/wmf.cpp
+++ b/plug-ins/wmf/wmf.cpp
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/plug-ins/wmf/wmf_gdi.cpp b/plug-ins/wmf/wmf_gdi.cpp
index ca19eb2..4373110 100644
--- a/plug-ins/wmf/wmf_gdi.cpp
+++ b/plug-ins/wmf/wmf_gdi.cpp
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "wmf_gdi.h"
diff --git a/plug-ins/wpg/wpg.c b/plug-ins/wpg/wpg.c
index b39dced..1d2aab2 100644
--- a/plug-ins/wpg/wpg.c
+++ b/plug-ins/wpg/wpg.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/plug-ins/xfig/xfig-export.c b/plug-ins/xfig/xfig-export.c
index 22d8826..d1334d9 100644
--- a/plug-ins/xfig/xfig-export.c
+++ b/plug-ins/xfig/xfig-export.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */ 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/plug-ins/xfig/xfig-import.c b/plug-ins/xfig/xfig-import.c
index 85784b4..162b29e 100644
--- a/plug-ins/xfig/xfig-import.c
+++ b/plug-ins/xfig/xfig-import.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
  
 #ifdef HAVE_CONFIG_H
diff --git a/plug-ins/xfig/xfig.c b/plug-ins/xfig/xfig.c
index 10d68aa..f36f90f 100644
--- a/plug-ins/xfig/xfig.c
+++ b/plug-ins/xfig/xfig.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/plug-ins/xslt/dia-uml.xsl b/plug-ins/xslt/dia-uml.xsl
index 9414c7d..8f01715 100644
--- a/plug-ins/xslt/dia-uml.xsl
+++ b/plug-ins/xslt/dia-uml.xsl
@@ -16,8 +16,7 @@
      GNU General Public License for more details.
      
      You should have received a copy of the GNU General Public License
-     along with this program; if not, write to the Free Software
-     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+     along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 -->
 
diff --git a/plug-ins/xslt/dia-uml2c++.xsl b/plug-ins/xslt/dia-uml2c++.xsl
index cb83e76..d345358 100644
--- a/plug-ins/xslt/dia-uml2c++.xsl
+++ b/plug-ins/xslt/dia-uml2c++.xsl
@@ -15,8 +15,7 @@
      GNU General Public License for more details.
      
      You should have received a copy of the GNU General Public License
-     along with this program; if not, write to the Free Software
-     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+     along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 -->
 
diff --git a/plug-ins/xslt/dia-uml2componentlist.xsl b/plug-ins/xslt/dia-uml2componentlist.xsl
index 5c88572..e6f92a1 100644
--- a/plug-ins/xslt/dia-uml2componentlist.xsl
+++ b/plug-ins/xslt/dia-uml2componentlist.xsl
@@ -15,8 +15,7 @@
      GNU General Public License for more details.
      
      You should have received a copy of the GNU General Public License
-     along with this program; if not, write to the Free Software
-     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+     along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 -->
 
diff --git a/plug-ins/xslt/dia-uml2cpp.xsl b/plug-ins/xslt/dia-uml2cpp.xsl
index b6e69e5..ffbda5d 100644
--- a/plug-ins/xslt/dia-uml2cpp.xsl
+++ b/plug-ins/xslt/dia-uml2cpp.xsl
@@ -16,482 +16,7 @@
      GNU General Public License for more details.
      
      You should have received a copy of the GNU General Public License
-     along with this program; if not, write to the Free Software
-     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
--->
-<!--
-
-This version is radically different from the c++ translation provided by
-dia-uml2c++.xsl. So different that I did not want to replace the old one so I
-wrote a new one based on the original. This one handles associataions,
-generalization, dependancies, parameterized classes and instantiations of
-paramameterized classes as well as generating header(.h) and source(.cpp)files.
-
-Class diagrams with spaces in the names are translated into somewhat legal c++
-names and more.
-
--->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0">
-       <xsl:output method="text"/>
-       <xsl:param name="directory"/>
-       <xsl:param name="indentation"><xsl:text>  </xsl:text></xsl:param>
-
-       <xsl:template match="dia-uml">
-               <xsl:apply-templates select="class" mode="header"/>
-    <xsl:apply-templates select="class" mode="source"/>
-       </xsl:template>
-
-       <xsl:template match="class" mode="header">
-    <xsl:variable name="CppClass"><xsl:value-of select="translate(@name, ' ','_')"/></xsl:variable>
-    <xsl:variable name="classid"><xsl:value-of select="@id"/></xsl:variable>
-    <xsl:variable name="DepSet"><xsl:value-of select="../Dependency[ classId=$classid and 
@stereotype='bind']/@dependsOn"/></xsl:variable>
-    <xsl:variable name="dtor"><xsl:text>~</xsl:text><xsl:value-of select="@name"/></xsl:variable>
-    <xsl:variable name="ctor"><xsl:value-of select="@name"/></xsl:variable>
-
-               <xsl:document href="{$directory}{$CppClass}.h" method="text">
-       <xsl:variable name="Protect">
-                        <xsl:value-of select="concat('__',translate(@name, ' 
abcdefghijklmnopqrstuvwxyz','_ABCDEFGHIJKLMNOPQRSTUVWXYZ'),'_H__')"/>
-       </xsl:variable>
-       <xsl:call-template name="InterfaceHeader">
-          <xsl:with-param name="ClassName"><xsl:value-of select="$CppClass"/></xsl:with-param>
-          <xsl:with-param name="GuardCode"><xsl:value-of select="$Protect"/></xsl:with-param>
-       </xsl:call-template>
-       <xsl:apply-templates select="comment"/>
-       <xsl:apply-templates select="../Association[ from!=$classid and @to=$classid ]" mode="includes"/>
-       <xsl:apply-templates select="../Generalization[ subclass=$classid]" mode="includes"/>
-       <xsl:apply-templates select="../Dependency[ classId=$classid and @stereotype='bind']" 
mode="includes"/>
-       <xsl:text>&#xa;</xsl:text>
-       <xsl:text>&#xa;</xsl:text>
-       <xsl:choose>
-          <xsl:when test="../class[ id=$DepSet and @template='1']">
-             <xsl:text>typedef </xsl:text>
-             <xsl:value-of select="translate(../class[ id=$DepSet]/@name,' ','_')"/>
-             <xsl:text>&lt;</xsl:text><xsl:value-of select="../Dependency[ classId=$classid]/@name"/>
-             <xsl:text>&gt;    </xsl:text>
-             <xsl:value-of select="$CppClass"/><xsl:text>;&#xa;</xsl:text>
-          </xsl:when>
-          <xsl:when test="@template='1'">
-             <xsl:text>template&lt;</xsl:text>
-             <xsl:apply-templates select="TemplateParameters/formalParameter"/>
-             <xsl:text>&gt; </xsl:text>
-             <xsl:text>class </xsl:text>
-                             <xsl:value-of select="$CppClass"/>
-             <xsl:text>{&#xa;</xsl:text>
-             <xsl:text>public:&#xa;</xsl:text>
-             <xsl:choose>
-                <xsl:when test="operations/operation/name=$ctor"/>
-                <xsl:otherwise>
-                   <xsl:value-of select="$indentation"/>
-                   <xsl:value-of select="$CppClass"/>
-                   <xsl:text>(){};&#xa;</xsl:text>
-                </xsl:otherwise>
-             </xsl:choose>
-             <xsl:choose>
-                <xsl:when test="operations/operation/name=$dtor"/>
-                <xsl:otherwise>
-                   <xsl:text>public:&#xa;</xsl:text>
-                   <xsl:value-of select="$indentation"/>
-                   <xsl:text>virtual ~</xsl:text>
-                   <xsl:value-of select="$CppClass"/>
-                   <xsl:text>(){};&#xa;</xsl:text> 
-                </xsl:otherwise>
-             </xsl:choose>
-                             <xsl:apply-templates select="attributes" mode="header"/>
-                        <xsl:apply-templates select="operations" mode="template"/>
-             <xsl:text>};&#xa;</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-             <xsl:text>class </xsl:text>
-                             <xsl:value-of select="$CppClass"/>
-             <xsl:apply-templates select="../Generalization[ subclass=$classid]" mode="derivations"/>
-             <xsl:text>{&#xa;</xsl:text>
-             <xsl:text>private:&#xa;</xsl:text>
-             <xsl:apply-templates select="../Association[ to=$classid]" mode="attibutes"/>
-             <xsl:choose>
-                <xsl:when test="operations/operation/name=$ctor"/>
-                <xsl:otherwise>
-                   <xsl:text>public:&#xa;</xsl:text>
-                   <xsl:value-of select="$indentation"/>
-                   <xsl:value-of select="$CppClass"/>
-                   <xsl:text>();&#xa;</xsl:text>
-                </xsl:otherwise>
-             </xsl:choose>
-             <xsl:choose>
-                <xsl:when test="operations/operation/name=$dtor"/>
-                <xsl:otherwise>
-                   <xsl:text>public:&#xa;</xsl:text>
-                   <xsl:value-of select="$indentation"/>
-                   <xsl:text>virtual ~</xsl:text>
-                   <xsl:value-of select="$CppClass"/>
-                   <xsl:text>();&#xa;</xsl:text> 
-                </xsl:otherwise>
-             </xsl:choose>
-                             <xsl:apply-templates select="attributes" mode="header"/>
-                             <xsl:apply-templates select="operations" mode="header"/>
-             <xsl:text>};&#xa;</xsl:text>
-          </xsl:otherwise>
-       </xsl:choose>
-       <xsl:text>&#xa;</xsl:text>
-       <xsl:text>#endif // defined </xsl:text>
-                       <xsl:value-of select="$Protect"/>
-       <xsl:text>&#xa;</xsl:text>
-    </xsl:document>
-       </xsl:template>
-
- <xsl:template match="class" mode="source">
-    <xsl:variable name="CppClass"><xsl:value-of select="translate(@name, ' ','_')"/></xsl:variable>
-    <xsl:variable name="dtor"><xsl:text>~</xsl:text><xsl:value-of select="$CppClass"/></xsl:variable>
-    <xsl:variable name="ctor"><xsl:value-of select="$CppClass"/></xsl:variable>
-    <xsl:variable name="classid"><xsl:value-of select="@id"/></xsl:variable>
-    <xsl:variable name="DepSet"><xsl:value-of select="../Dependency[ classId=$classid and 
@stereotype='bind']/@dependsOn"/></xsl:variable>
-
-    <xsl:choose>
-       <xsl:when test="@template='1'">
-       </xsl:when>
-       <xsl:when test="../class[ id=$DepSet and @template='1']">
-       </xsl:when>
-       <xsl:otherwise>
-                     <xsl:document href="{$directory}{$CppClass}.cpp" method="text">
-             <xsl:call-template name="ImplementationHeader">
-                <xsl:with-param name="ClassName"><xsl:value-of select="@name"/></xsl:with-param>
-             </xsl:call-template>
-             <xsl:text>// &#xa;</xsl:text>
-             <xsl:apply-templates select="comment"/>
-                                  <xsl:text>//&#xa;</xsl:text>
-                             <xsl:text>#include "</xsl:text>
-                             <xsl:value-of select="$CppClass"/>
-                             <xsl:text>.h"&#xa;</xsl:text>
-             <xsl:apply-templates select="../Dependency[ classId=$classid]" mode="includes"/>
-             <xsl:text>&#xa;&#xa;</xsl:text>
-                             <xsl:apply-templates select="attributes" mode="source"/>
-             <xsl:choose>
-                <xsl:when test="operations/operation/name=$ctor"/>
-                <xsl:otherwise>
-                <xsl:value-of select="$CppClass"/><xsl:text>::</xsl:text>
-                <xsl:value-of select="$CppClass"/>
-                <xsl:text>()&#xa;{&#xa;}&#xa;</xsl:text>
-                </xsl:otherwise>
-             </xsl:choose>
-             <xsl:choose>
-                <xsl:when test="operations/operation/name=$dtor"/>
-                <xsl:otherwise>
-                <xsl:value-of select="$CppClass"/><xsl:text>::~</xsl:text>
-                <xsl:value-of select="$CppClass"/>
-                <xsl:text>()&#xa;{&#xa;}&#xa;</xsl:text>
-                </xsl:otherwise>
-             </xsl:choose>
-                             <xsl:apply-templates select="operations" mode="source"/>
-                     </xsl:document>
-       </xsl:otherwise>
-    </xsl:choose>
- </xsl:template>
-
-       <xsl:template match="attributes|operations" mode="source">
-               <xsl:apply-templates select="attribute|operation" mode="source"/>
-       </xsl:template>
-
-       <xsl:template match="attribute" mode="source">
-               <xsl:if test="@class_scope">
-                       <xsl:text>static </xsl:text>
-                       <xsl:value-of select="type"/>
-                       <xsl:text>      </xsl:text>
-                       <xsl:value-of select="name"/>
-                       <xsl:text> = </xsl:text>
-                       <xsl:choose>
-                               <xsl:when test="value">
-          <xsl:value-of select="value"/>
-                               </xsl:when>
-                               <xsl:otherwise>
-                                       <xsl:text>0</xsl:text>
-                               </xsl:otherwise>
-                       </xsl:choose>
-       <xsl:text>;</xsl:text>
-       <xsl:text>  </xsl:text>
-       <xsl:apply-templates select="comment"/>
-                  <xsl:text>&#xa;</xsl:text>
-               </xsl:if>
-       </xsl:template> 
-       
-       <xsl:template match="operation" mode="source">
-               <xsl:text>&#xa;</xsl:text>
-               <xsl:text>//  Operation: </xsl:text>
-               <xsl:value-of select="name"/>
-               <xsl:text>&#xa;//&#xa;</xsl:text>
-               <xsl:text>//  Description:&#xa;</xsl:text>
-               <xsl:text>//   </xsl:text>
-    <xsl:apply-templates select="comment"/>
-               <xsl:text>&#xa;</xsl:text>
-               <xsl:text>//  Parameters:&#xa;</xsl:text>
-    <xsl:apply-templates select="parameters/parameter" mode="commentDoc"/>
-               <xsl:text>//&#xa;&#xa;</xsl:text>
-    <xsl:if test="type">
-       <xsl:value-of select="type"/>
-       <xsl:text> </xsl:text>
-    </xsl:if>
-               <xsl:value-of select="translate(../../@name,' ','_')"/>
-               <xsl:text>::</xsl:text>
-               <xsl:value-of select="name"/>
-               <xsl:text>(</xsl:text>
-    <xsl:apply-templates select="parameters/parameter" mode="code"/>
-               <xsl:text>)</xsl:text>
-               <xsl:text>&#xa;{&#xa;</xsl:text>
-               <xsl:if test="type and type!='void'">
-                       <xsl:value-of select="$indentation"/>
-                       <xsl:value-of select="type"/>
-                       <xsl:text>  returnValue = (</xsl:text>
-                       <xsl:value-of select="type"/>
-                       <xsl:text>)0;&#xa;</xsl:text>
-                       <xsl:value-of select="$indentation"/>
-                       <xsl:text>return returnValue;&#xa;</xsl:text>
-               </xsl:if>
-               <xsl:text>}&#xa;</xsl:text>
-       </xsl:template>
-
-
-       <xsl:template match="operation" mode="template">
-               <xsl:text>&#xa;</xsl:text>
-               <xsl:text>//  Operation: </xsl:text>
-               <xsl:value-of select="name"/>
-               <xsl:text>&#xa;//&#xa;</xsl:text>
-               <xsl:text>//  Description:&#xa;</xsl:text>
-    <xsl:apply-templates select="comment"/>
-               <xsl:text>//  Parameters:&#xa;</xsl:text>
-    <xsl:apply-templates select="parameters/parameter" mode="commentDoc"/>
-               <xsl:text>//&#xa;&#xa;</xsl:text>
-               <xsl:value-of select="$indentation"/>
-    <xsl:if test="type">
-       <xsl:value-of select="type"/>
-       <xsl:text> </xsl:text>
-    </xsl:if>
-               <xsl:value-of select="name"/>
-               <xsl:text>(</xsl:text>
-    <xsl:apply-templates select="parameters/parameter" mode="code"/>
-               <xsl:text>)</xsl:text>
-               <xsl:text>{ </xsl:text>
-               <xsl:if test="type and type!='void'">
-                       <xsl:value-of select="type"/>
-                       <xsl:text>  returnValue = (</xsl:text>
-                       <xsl:value-of select="type"/>
-                       <xsl:text>)0;</xsl:text>
-                       <xsl:text>return returnValue;</xsl:text>
-               </xsl:if>
-               <xsl:text>};&#xa;</xsl:text>
-       </xsl:template>
-       
-       
-        <xsl:template match="operations|attributes" mode="header">
-    <xsl:if test="*[ visibility='private']">
-       <xsl:text>private:&#xa;</xsl:text>
-       <xsl:apply-templates select="*[ visibility='private']"/>
-    </xsl:if>
-    <xsl:if test="*[ visibility='protected']">
-       <xsl:text>protected:&#xa;</xsl:text>
-       <xsl:apply-templates select="*[ visibility='protected']"/>
-    </xsl:if>
-    <xsl:if test="*[ visibility='public']">
-       <xsl:text>public:&#xa;</xsl:text>
-       <xsl:apply-templates select="*[ visibility='public']"/>
-       <xsl:text>&#xa;</xsl:text>
-    </xsl:if>
-    <xsl:if test="*[not(@visibility)]">
-       <xsl:apply-templates select="*[not(@visibility)]"/>
-    </xsl:if>
- </xsl:template> 
-
-
- <xsl:template match="attribute">
-    <xsl:value-of select="$indentation"/>
-    <xsl:if test="@class_scope">
-       <xsl:text>static </xsl:text>
-    </xsl:if>
-    <xsl:value-of select="type"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="name"/>
-    <xsl:text>;</xsl:text>
-    <xsl:apply-templates select="comment"/>
-    <xsl:text>&#xa;</xsl:text>
- </xsl:template>
- 
- 
- <xsl:template match="operation">
-    <xsl:apply-templates select="comment"/>
-    <xsl:value-of select="$indentation"/>
-    <xsl:choose>
-       <xsl:when test="@inheritance='polymorphic'">
-          <xsl:text>virtual </xsl:text>
-       </xsl:when>
-       <xsl:when test="@inheritance='abstract'">
-          <xsl:text>virtual </xsl:text>
-       </xsl:when>      
-    </xsl:choose>
-
-    <xsl:if test="@class_scope">
-       <xsl:text>static </xsl:text>
-    </xsl:if>
-    <xsl:if test="type">
-       <xsl:value-of select="type"/>
-    </xsl:if>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="name"/>
-    <xsl:text>(</xsl:text>
-    <xsl:apply-templates select="parameters/parameter" mode="code"/>
-    <xsl:text>)</xsl:text>
-    <xsl:if test="@inheritance='abstract'">
-       <xsl:text> = 0</xsl:text>
-    </xsl:if>
-    <xsl:if test="@query=1">
-       <xsl:text> const</xsl:text>
-    </xsl:if>
-    <xsl:text>;&#xa;</xsl:text>
- </xsl:template>
-
- <xsl:template match="formalParameter">
-    <xsl:value-of select="@class"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="@name"/>
-    <xsl:if test="position() != last()">
-       <xsl:text>, </xsl:text>
-    </xsl:if>
- </xsl:template>
-
- <xsl:template match="Association" mode="includes">
-    <xsl:variable name="from"><xsl:value-of select="@from"/></xsl:variable>
-    <xsl:text>#include "</xsl:text>
-    <xsl:value-of select="translate(../class[ id=$from]/@name, ' ','_')"/>
-    <xsl:text>.h"&#xa;</xsl:text>
- </xsl:template>
-
- <xsl:template match="Dependency" mode="includes">
-    <xsl:variable name="dependsOn"><xsl:value-of select="@dependsOn"/></xsl:variable>
-    <xsl:text>#include "</xsl:text>
-    <xsl:value-of select="translate(../class[ id=$dependsOn]/@name, ' ','_')"/>
-    <xsl:text>.h"&#xa;</xsl:text>
- </xsl:template>
-
- <xsl:template match="Generalization" mode="includes">
-    <xsl:variable name="superclass"><xsl:value-of select="@superclass"/></xsl:variable>
-    <xsl:text>#include "</xsl:text>
-    <xsl:value-of select="translate(../class[ id=$superclass]/@name, ' ','_')"/>
-    <xsl:text>.h"&#xa;</xsl:text>
- </xsl:template>
-
- <xsl:template match="Generalization" mode="derivations">
-    <xsl:text>: public </xsl:text>
-    <xsl:variable name="superclass"><xsl:value-of select="@superclass"/></xsl:variable>
-    <xsl:value-of select="translate(../class[ id=$superclass]/@name,' ','_')"/>
- </xsl:template>
-
- <xsl:template match="Association" mode="attibutes">
-    <xsl:if test="Aggregate[ role='2']/@aggregate!='none' and Aggregate[ role='1']/@name!=''">
-       <xsl:variable name="from"><xsl:value-of select="@from"/></xsl:variable>
-       <xsl:value-of select="$indentation"/>
-       <xsl:value-of select="translate(../class[ id=$from]/@name,' ','_')"/>
-       <xsl:text>  </xsl:text>
-       <xsl:if test="Aggregate[ role='2']/@aggregate='aggregation'">
-          <xsl:text>* </xsl:text>
-       </xsl:if>
-       <xsl:value-of select="translate(Aggregate[ role='1']/@name,' ','_')"/>
-       <xsl:text>;&#xa;</xsl:text>
-    </xsl:if>
- </xsl:template>
-
- <xsl:template match="parameter" mode="commentDoc">
-          <xsl:text>//      </xsl:text>
-          <xsl:value-of select="name"/>
-          <xsl:text>   </xsl:text>
-          <xsl:value-of select="comment"/>
-          <xsl:text>&#xa;</xsl:text>
- </xsl:template>
-
- <xsl:template match="parameter" mode="code">
-          <xsl:choose>
-                  <xsl:when test="@kind='in'">
-                          <xsl:text>const </xsl:text>
-                  </xsl:when>
-          </xsl:choose>
-          <xsl:value-of select="type"/>
-          <xsl:if test="@kind='out'">
-                  <xsl:text>   &amp;</xsl:text>
-          </xsl:if>
-    <xsl:text> </xsl:text>
-          <xsl:value-of select="name"/>
-          <xsl:if test="not(position()=last())">
-                  <xsl:text>, </xsl:text>
-          </xsl:if>
- </xsl:template>
-
-
- <xsl:template match="comment">
-    <xsl:if test=".!=''">
-       <xsl:text>// </xsl:text>
-       <xsl:value-of select="."/>
-       <xsl:text>&#xa;</xsl:text>
-    </xsl:if>
- </xsl:template>
-
-       <xsl:template match="text()">
-       </xsl:template>
-
-       <xsl:template match="node()|@*">
-               <xsl:apply-templates match="node()|@*"/>
-       </xsl:template>
-
- <xsl:template name="InterfaceHeader"><xsl:param name="ClassName"/><xsl:param name="GuardCode"/>
-               <xsl:text>// </xsl:text>
-               <xsl:value-of select="$ClassName"/>
-               <xsl:text>.h
-//
-// This header file defines the interfaces to the class </xsl:text><xsl:value-of select="@name"/><xsl:text>
-//
-// This file was generate from a Dia Diagram using the xslt script file dia-uml2cpp.xsl
-// which is copyright(c) Dave Klotzbach &lt;dklotzbach foxvalley net&gt;
-//
-// The author asserts no additional copyrights on the derived product. Limitations
-// on the uses of this file are the right and responsibility of authors of the source 
-// diagram.
-// 
-// The dia-uml2cpp.xsl script is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-// or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for 
-// more details.
-//
-// A copy of the GNU General Public License is available by writing to the 
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
-// MA 02111-1307, USA.
-//
-
-</xsl:text>
-    <xsl:text>#ifndef </xsl:text>
-               <xsl:value-of select="$GuardCode"/>
-               <xsl:text>&#xa;</xsl:text>
-    <xsl:text>#define </xsl:text>
-               <xsl:value-of select="$GuardCode"/>
-    <xsl:text>&#xa;&#xa;&#xa;</xsl:text>
- </xsl:template>       
-       
- <xsl:template name="ImplementationHeader"><xsl:param name="ClassName"/>
-               <xsl:text>// </xsl:text>
-               <xsl:value-of select="$ClassName"/>
-               <xsl:text>.cpp
-//
-// This header file defines the implementation of the class </xsl:text><xsl:value-of 
select="@name"/><xsl:text>
-//
-// This file was generate from a Dia Diagram using the xslt script file dia-uml2cpp.xsl
-// which is copyright(c) Dave Klotzbach &lt;dklotzbach foxvalley net&gt;
-//
-// The author asserts no additional copyrights on the derived product. Limitations
-// on the uses of this file are the right and responsibility of authors of the source 
-// diagram.
-// 
-// The dia-uml2cpp.xsl script is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-// or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for 
-// more details.
-//
-// A copy of the GNU General Public License is available by writing to the 
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
-// MA 02111-1307, USA.
+     along with this program; if not, see <http://www.gnu.org/licenses/>.
 //
 </xsl:text>
  </xsl:template>       
diff --git a/plug-ins/xslt/dia-uml2idl.xsl b/plug-ins/xslt/dia-uml2idl.xsl
index a3c2bf3..86097e6 100644
--- a/plug-ins/xslt/dia-uml2idl.xsl
+++ b/plug-ins/xslt/dia-uml2idl.xsl
@@ -15,8 +15,7 @@
      GNU General Public License for more details.
      
      You should have received a copy of the GNU General Public License
-     along with this program; if not, write to the Free Software
-     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+     along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 -->
 
diff --git a/plug-ins/xslt/dia-uml2java.xsl b/plug-ins/xslt/dia-uml2java.xsl
index dab2ea1..7fe2e19 100644
--- a/plug-ins/xslt/dia-uml2java.xsl
+++ b/plug-ins/xslt/dia-uml2java.xsl
@@ -15,8 +15,7 @@
      GNU General Public License for more details.
      
      You should have received a copy of the GNU General Public License
-     along with this program; if not, write to the Free Software
-     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+     along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 -->
 
diff --git a/plug-ins/xslt/dia-uml2python.xsl b/plug-ins/xslt/dia-uml2python.xsl
index b8c76a9..88ad40d 100644
--- a/plug-ins/xslt/dia-uml2python.xsl
+++ b/plug-ins/xslt/dia-uml2python.xsl
@@ -17,8 +17,7 @@
      GNU General Public License for more details.
      
      You should have received a copy of the GNU General Public License
-     along with this program; if not, write to the Free Software
-     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+     along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 -->
 
diff --git a/plug-ins/xslt/xslt.c b/plug-ins/xslt/xslt.c
index 892cb42..dde8b01 100644
--- a/plug-ins/xslt/xslt.c
+++ b/plug-ins/xslt/xslt.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/plug-ins/xslt/xslt.h b/plug-ins/xslt/xslt.h
index 18decaf..086061d 100644
--- a/plug-ins/xslt/xslt.h
+++ b/plug-ins/xslt/xslt.h
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 #include "config.h"
diff --git a/plug-ins/xslt/xsltdialog.c b/plug-ins/xslt/xsltdialog.c
index 3b03f30..84f939f 100644
--- a/plug-ins/xslt/xsltdialog.c
+++ b/plug-ins/xslt/xsltdialog.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/po-checktrans.py b/po-checktrans.py
old mode 100755
new mode 100644
index 20d466d..1ae67c6
--- a/po-checktrans.py
+++ b/po-checktrans.py
@@ -16,8 +16,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this quick hack; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this quick hack; if not, see <http://www.gnu.org/licenses/>.
 #
 
 import string,os,sys,math
diff --git a/po/am.po b/po/am.po
index 7bd9315..02096bd 100644
--- a/po/am.po
+++ b/po/am.po
@@ -310,8 +310,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 
 #: ../app/commands.c:637
diff --git a/po/ar.po b/po/ar.po
index 4aa2f6e..8aea301 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -315,8 +315,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 "هذا البرنامج حر، يمكنك توزيعه و/أو تعديله حسب بنود رخصة جنو العمومية كما "
 "نشرتها مؤسسة البرامج الحرة، الإصدار الثاني أو أي إصدار أحدث (حسب رغبتك).\n"
diff --git a/po/ast.po b/po/ast.po
index ef76e38..4fdb714 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -361,23 +361,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-msgstr ""
-"Esti programa ye software llibre, puedes redistribuyilu y/o camudalu\n"
-"baxo los términos de la Llicencia Pública GNU asoleyada por\n"
-"la Free Software Foundation; tanto la versión 2 de la Llicencia o\n"
-"(a escoyeta) cualquier versión posterior.\n"
-"\n"
-"Esti programa distribúyese col envís de que seya útil,\n"
-"pero ENSIN GARANTÍA, nin siquiera la garantía Mercantil\n"
-"o AFAYADIZA PA PROPÓSITU PARTICULAR.\n"
-"Llei la Llicencia Pública GNU pa más detalles.\n"
-"\n"
-"Deberíes de recibir una copia de la Llicencia Pública GNU\n"
-"con esti programa, si nun ye asina, escribi a la Free Software\n"
-"Foundation, Inc., 59 59 Temple Place - Suite 330, Boston, MA 02111-1307, "
-"USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 
 #: ../app/commands.c:750
 msgid "A program for drawing structured diagrams."
diff --git a/po/az.po b/po/az.po
index 9ab4deb..695f57f 100644
--- a/po/az.po
+++ b/po/az.po
@@ -322,8 +322,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 
 #: ../app/commands.c:637
diff --git a/po/be.po b/po/be.po
index 658737c..7924b54 100644
--- a/po/be.po
+++ b/po/be.po
@@ -326,8 +326,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 
 #: ../app/commands.c:637
diff --git a/po/bg.po b/po/bg.po
index 853b38c..0bf8a79 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -360,24 +360,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-msgstr ""
-"Тази програма е свободен софтуер; може да я разпространявате и/или "
-"променяте\n"
-"под условията на Общия публичен лиценз на GNU (GNU General Public License),\n"
-"както е публикуван от Фондацията за свободен софтуер; версия 2 на лиценза\n"
-"или (по избор) всяка по-нова версия.\n"
-"\n"
-"Тази програма се разпространява с надеждата, че ще бъде полезна,\n"
-"но БЕЗ НИКАКВИ ГАРАНЦИИ; дори без косвени гаранции за ГОДНОСТ ЗА\n"
-"ПРОДАЖБА или СЪОТВЕТСТВИЕ С ОПРЕДЕЛЕНА УПОТРЕБА. Вижте Общия\n"
-"публичен лиценз на GNU за повече подробности.\n"
-"\n"
-"Би трябвало да сте получили копие на Общия публичен лиценз на GNU\n"
-"заедно с програмата; ако не сте, пишете до Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, "
-"USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 
 #: ../app/commands.c:637
 msgid "A program for drawing structured diagrams."
diff --git a/po/bs.po b/po/bs.po
index 153f150..5ed57fc 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -338,8 +338,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 
 #: ../app/commands.c:637
diff --git a/po/ca.po b/po/ca.po
index c7b1599..2621010 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -398,24 +398,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-msgstr ""
-"Aquest programa és programari lliure; podeu redistribuir-lo i/o modificar-"
-"lo\n"
-"sota els termes de la Llicència Pública General GNU tal i com ha estat\n"
-"publicada per la Free Software Foundation; ja sigui la versió 2 de la\n"
-"Llicència o (si ho preferiu) qualsevol versió posterior.\n"
-"\n"
-"Aquest programa es distribueix amb l'expectativa de que serà útil,\n"
-"però SENSE CAP GARANTIA; fins i tot sense la garantia implícita de\n"
-"COMERCIALITZACIÓ o ADEQUACIÓ PER A CAP PROPÒSIT EN PARTICULAR. Vegeu la\n"
-"Llicència Pública General GNU per obtenir-ne més detalls.\n"
-"\n"
-"Hauríeu d'haver rebut una còpia de la Llicència Pública General GNU\n"
-"juntament amb aquest programa; en cas contrari, escriviu a la Free\n"
-"Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  "
-"02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 
 #: ../app/commands.c:1040
 msgid "A program for drawing structured diagrams."
diff --git a/po/ca valencia po b/po/ca valencia po
index 0a53a5d..7630a1c 100644
--- a/po/ca valencia po
+++ b/po/ca valencia po
@@ -397,23 +397,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-msgstr ""
-"Este programa és programari lliure; podeu redistribuir-lo i/o modificar-lo\n"
-"sota els termes de la Llicència Pública General GNU tal i com ha estat\n"
-"publicada per la Free Software Foundation; ja siga la versió 2 de la\n"
-"Llicència o (si ho preferiu) qualsevol versió posterior.\n"
-"\n"
-"Este programa es distribueix amb l'expectativa de que serà útil,\n"
-"però SENSE CAP GARANTIA; fins i tot sense la garantia implícita de\n"
-"COMERCIALITZACIÓ o ADEQUACIÓ PER A CAP PROPÒSIT EN PARTICULAR. Vegeu la\n"
-"Llicència Pública General GNU per obtindre'n més detalls.\n"
-"\n"
-"Hauríeu d'haver rebut una còpia de la Llicència Pública General GNU\n"
-"juntament amb este programa; en cas contrari, escriviu a la Free\n"
-"Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  "
-"02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 
 #: ../app/commands.c:1040
 msgid "A program for drawing structured diagrams."
diff --git a/po/cs.po b/po/cs.po
index 35fe946..f6633df 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -401,21 +401,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-msgstr ""
-"Tento program je svobodný software: Můžete jej dále šířit a/nebo upravovat "
-"za podmínek licence GNU General Public License v podobě, v jaké ji vydala "
-"Free Software Foundation, a to buď ve verzi 2 této licence nebo (dle vaší "
-"volby) v libovolné novější verzi.\n"
-"\n"
-"Tento program je šířen ve víře, že bude užitečný, ale BEZ JAKÝCHKOLIV ZÁRUK, "
-"a to i bez předpokládané záruky na PRODEJNOST nebo VHODNOST PRO KONKRÉTNÍ "
-"ÚČEL. Více podrobností najdete přímo v licenci GNU General Public License.\n"
-"\n"
-"Spolu s tímto programem byste měli obdržet kopii licence GNU General Public "
-"License. Pokud se tak nestalo, napište na Free Software Foundation, Inc., 59 "
-"Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 
 #: ../app/commands.c:1039
 msgid "A program for drawing structured diagrams."
diff --git a/po/da.po b/po/da.po
index 0be114f..fe73bfb 100644
--- a/po/da.po
+++ b/po/da.po
@@ -405,8 +405,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 
 #: ../app/commands.c:956
diff --git a/po/de.po b/po/de.po
index 9606902..f762186 100644
--- a/po/de.po
+++ b/po/de.po
@@ -408,23 +408,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-msgstr ""
-"Dieses Programm ist freie Software. Sie können es unter den Bedingungen\n"
-"der GNU General Public License, wie von der Free Software Foundation\n"
-"herausgegeben, weitergeben und/oder modifizieren, entweder unter \n"
-"Version 2 der Lizenz oder (wenn Sie es wünschen) jeder späteren Version.\n"
-"\n"
-"Die Veröffentlichung von Dia erfolgt in der Hoffnung, dass es Ihnen von\n"
-"Nutzen sein wird, aber OHNE JEDE GEWÄHRLEISTUNG - sogar ohne die implizite\n"
-"Gewährleistung der MARKTREIFE oder der EIGNUNG FÜR EINEN BESTIMMTEN ZWECK.\n"
-"Details finden Sie in der GNU General Public License.\n"
-"\n"
-"Sie sollten eine Kopie der GNU General Public License zusammen mit Dia\n"
-"erhalten haben. Falls nicht, schreiben Sie an die Free Software Foundation, "
-"Inc.,\n"
-"59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 
 #: ../app/commands.c:1037
 msgid "A program for drawing structured diagrams."
diff --git a/po/dz.po b/po/dz.po
index f3312a4..37043f3 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -343,8 +343,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 "ལས་རིམ་འདི་ མཉེན་ཆས་རིན་མེད་སྟོང་མ་ཨིནམ་ལས་ རིན་མེད་མཉེན་ཆས་གཞི་ཚོགས་ཀྱིས་ དཔེ་བསྐྲུན་འབད་ཡོད་མི་ \n"
 "ཇི་ཨེན་ཡུ་ ཡོངས་ཁྱབ་མི་མང་ཆོག་ཐམ་གྱི་མངའ་འོག་ ཡང་ན་ ཆོག་ཐམ་གྱི་འཐོན་རིམ་ ༢ པ་ ཡངན་\n"
diff --git a/po/el.po b/po/el.po
index 766342e..cf1596e 100644
--- a/po/el.po
+++ b/po/el.po
@@ -401,22 +401,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-msgstr ""
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 
 #: ../app/commands.c:1039
 msgid "A program for drawing structured diagrams."
diff --git a/po/en_CA.po b/po/en_CA.po
index a61623f..179d75b 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -335,22 +335,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-msgstr ""
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public Licence as published by\n"
-"the Free Software Foundation; either version 2 of the Licence, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public Licence for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public Licence\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 
 #: ../app/commands.c:637
 msgid "A program for drawing structured diagrams."
diff --git a/po/en_GB.po b/po/en_GB.po
index 6b6af81..fbff6bd 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -361,22 +361,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-msgstr ""
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public Licence as published by\n"
-"the Free Software Foundation; either version 2 of the Licence, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public Licence for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public Licence\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 
 #: ../app/commands.c:750
 msgid "A program for drawing structured diagrams."
diff --git a/po/eo.po b/po/eo.po
index 58b24c3..2c5be63 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -353,8 +353,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 "Dia estas libera programaro; vi povas redistribui kaj/aŭ modifi ĝin sub la "
 "kondiĉoj de la Ĝenerala Publika Permesilo de GNU eldonite de la 'Free "
diff --git a/po/es.po b/po/es.po
index 9115818..0e18ef7 100644
--- a/po/es.po
+++ b/po/es.po
@@ -402,8 +402,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 "Este programa es software libre; puede redistribuirlo y/o modificarlo bajo\n"
 "los términos de la Licencia Pública General de GNU tal como se publica por\n"
diff --git a/po/eu.po b/po/eu.po
index 3c16237..dd62795 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -362,21 +362,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-msgstr ""
-"Programa hau software librea da; birbana eta/edo alda dezakezu Software "
-"Foundation-ek argitaratutako GNU Lizentzia Publiko Orokorraren 2. bertsioan, "
-"edo (nahiago baduzu) beste berriago batean, jasotako baldintzak betez gero.\n"
-"\n"
-"Programa hau erabilgarria izango delakoan banatzen da, baina, INOLAKO "
-"BERMERIK GABE; era berean, ez da bermatzen beraren EGOKITASUNA "
-"MERKATURATZEKO edo HELBURU PARTIKULARRETARAKO ERABILTZEKO. Argibide gehiago "
-"nahi izanez gero, ikus GNU Lizentzia Publiko Orokorra.\n"
-"\n"
-"Programa honekin batera GNU Lizentzia Publiko Orokorraren kopia bat jasoko "
-"zenuen; hala ez bada, idatzi hona: Free SoftwareFoundation, Inc., 59 Temple "
-"Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 
 #: ../app/commands.c:750
 msgid "A program for drawing structured diagrams."
diff --git a/po/fi.po b/po/fi.po
index 5a62632..bea364d 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -357,22 +357,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-msgstr ""
-"Tämä ohjelma on vapaa; tätä ohjelmaa on sallittu levittää edelleen ja\n"
-"muuttaa GNU yleisen lisenssin (GPL lisenssin) ehtojen mukaan sellaisina\n"
-"kuin Free Software Foundation on ne julkaissut; joko Lisenssin version 2,\n"
-"tai (valinnan mukaan) minkä tahansa myöhemmän version mukaisesti.\n"
-"\n"
-"Tätä ohjelmaa levitetään siinä toivossa, että se olisi hyödyllinen, \n"
-"mutta ilman mitään takuuta; ilman edes hiljaista takuuta kaupallisesti \n"
-"hyväksyttävästä laadusta tai soveltuvuudesta tiettyyn tarkoitukseen. \n"
-"Katso GPL lisenssistä lisää yksityiskohtia.\n"
-"\n"
-"Tämän ohjelman mukana pitäisi tulla kopio GPL lisenssistä; jos näin ei\n"
-"ole, kirjoita osoitteeseen Free Software Foundation Inc., 59 Temple \n"
-"Place – Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 
 #: ../app/commands.c:745
 msgid "A program for drawing structured diagrams."
diff --git a/po/fr.po b/po/fr.po
index a64c67d..1c2c1a2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -340,8 +340,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 "Ce programme est un logiciel libre ; vous pouvez le diffuser et/ou le "
 "modifier suivant les termes de la Licence Publique Générale GNU telle que "
diff --git a/po/ga.po b/po/ga.po
index ec50021..a8d6ded 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -307,8 +307,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 
 #: ../app/commands.c:637
diff --git a/po/gl.po b/po/gl.po
index e15ddd9..eca512f 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -396,23 +396,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-msgstr ""
-"Este programa é software libre; pode distribuílo e/ou modificalo\n"
-"baixo os termos da Licenza Pública Xeral como\n"
-"publicada pola Free Software Foundation; xa sexa na versión 2 da Licenza, "
-"ou\n"
-"(na súa opinión) en calquera versión posterior.\n"
-"\n"
-"Este programa distribúese coa esperanza de que sexa de utilidade,\n"
-"pero SEN NINGUNHA GARANTÍA; sen incluso a garantía implícita de\n"
-"COMERCIALIZACIÓN ou IDONEIDADE PARA UN PROPÓSITO PARTICULAR. Vexa a\n"
-"Licenza Pública Xeral GNU para máis detalles.\n"
-"\n"
-"Debería ter recibido unha copia da Licenza Pública Xeral GNU\n"
-"con este programa; de non ser así, escriba á Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 
 #: ../app/commands.c:1040
 msgid "A program for drawing structured diagrams."
diff --git a/po/gu.po b/po/gu.po
index 2f61177..8f6cd54 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -324,8 +324,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 
 #: ../app/commands.c:748
diff --git a/po/hr.po b/po/hr.po
index c59b54f..404993f 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -326,8 +326,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 
 #: ../app/commands.c:637
diff --git a/po/hu.po b/po/hu.po
index aaff0cd..e7b867d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -423,21 +423,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-msgstr ""
-"A Dia szabad szoftver, terjesztheti és/vagy módosíthatja a Free\n"
-"Software Foundation által kiadott GNU General Public License második (vagy\n"
-"bármely későbbi) változatában foglaltak alapján\n"
-"\n"
-"A Dia programot abban a reményben terjesztjük, hogy hasznos lesz, de nem\n"
-"vállalunk SEMMIFÉLE GARANCIÁT, még olyan értelemben sem, hogy a program\n"
-"alkalmas-e a KÖZREADÁSRA vagy EGY BIZONYOS FELADAT ELVÉGZÉSÉRE.\n"
-"További részletekért tanulmányozza a GNU GPL licencet.\n"
-"\n"
-"A Dia programhoz a GNU General Public License egy példánya is jár, \n"
-"ha nem kapta meg, írjon a Free Software Foundation Inc.-nek. \n"
-"Levélcímük: 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 
 #: ../app/commands.c:1040
 msgid "A program for drawing structured diagrams."
diff --git a/po/id.po b/po/id.po
index 5cf8f3d..8dcaaa1 100644
--- a/po/id.po
+++ b/po/id.po
@@ -384,8 +384,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 "Program ini adalah perangkat lunak bebas; Anda dapat menyebarluaskannya dan/"
 "atau mengubahnya di bawah syarat GNU General Public License sebagaimana "
diff --git a/po/is.po b/po/is.po
index 2120edd..7575b00 100644
--- a/po/is.po
+++ b/po/is.po
@@ -313,8 +313,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 
 #: ../app/commands.c:637
diff --git a/po/it.po b/po/it.po
index 4f4ccbe..defd3c0 100644
--- a/po/it.po
+++ b/po/it.po
@@ -363,8 +363,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 
 #: ../app/commands.c:745
diff --git a/po/ja.po b/po/ja.po
index 207c0b0..d2d897f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -383,8 +383,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 "このプログラムはフリーソフトウェアです。\n"
 "フリーソフトウェア財団が提供する GNU 一般公衆利用許諾契約書\n"
diff --git a/po/kn.po b/po/kn.po
index 5a915c6..dcd5691 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -337,22 +337,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-msgstr ""
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 
 #: ../app/commands.c:745
 msgid "A program for drawing structured diagrams."
diff --git a/po/ko.po b/po/ko.po
index 3b190f4..15f9761 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -351,22 +351,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-msgstr ""
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 
 #: ../app/commands.c:745
 msgid "A program for drawing structured diagrams."
diff --git a/po/lt.po b/po/lt.po
index 20721c4..d3b30f8 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -387,22 +387,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-msgstr ""
-"Ši programa yra laisva. Jūs galite ją platinti ir/arba modifikuoti\n"
-"remdamiesi Free Software Foundation paskelbtomis GNU Bendrosios\n"
-"Viešosios licenzijos sąlygomis: 2 licenzijos versija, arba (savo\n"
-"nuožiūra) bet kuria vėlesne versija.\n"
-"\n"
-"Ši programa platinama su viltimi, kad ji bus naudinga, bet BE JOKIŲ\n"
-"GARANTIJŲ; be jokios numanomos PERKAMUMO ar TINKAMUMO KONKRETIEMS\n"
-"TIKSLAMS garantijos. Žiūrėkite GNU Bendrąją Viešąją licenziją norėdami\n"
-"sužinoti smulkmenas.\n"
-"\n"
-"Jūs turėjote kartu su šia programa gauti ir GNU Bendrosios Viešosios\n"
-"licenzijos kopija; jei ne - rašykite Free Software Foundation, Inc., 59\n"
-"Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 
 #: ../app/commands.c:1037
 msgid "A program for drawing structured diagrams."
diff --git a/po/lv.po b/po/lv.po
index ab3e93c..ba7aade 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -389,22 +389,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-msgstr ""
-"Šī programma ir brīvās programmatūras produkts; jūs varat izplatīt un/vai\n"
-"modificēt to saskaņā ar GNU Vispārējās Publiskās Licences 2. vai kādas\n"
-"vēlākas versijas noteikumiem.\n"
-"\n"
-"Šī programma tiek izplatīts ar cerību, ka tas būs noderīgs. Tas tiek "
-"izplatīts\n"
-"BEZ jebkādas garantijas vai iekļautas ražotāja atbildības par šo produktu.\n"
-"Sīkāku informāciju meklējiet GNU Vispārējās Publiskās Licences tekstā.\n"
-"\n"
-"GNU Vispārējās Publiskās Licence ir pieejama kopā ar šīs programmas "
-"instalāciju.\n"
-"Ja tā jums nav pieejama, jūs to varat iegūt no Free Software Foundation, \n"
-"Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 
 #: ../app/commands.c:1037
 msgid "A program for drawing structured diagrams."
diff --git a/po/mk.po b/po/mk.po
index 2e5a65d..41d77f0 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -328,8 +328,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 
 #: ../app/commands.c:637
diff --git a/po/ml.po b/po/ml.po
index e360ae8..e8ca940 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -338,8 +338,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 
 #: ../app/commands.c:745
diff --git a/po/mn.po b/po/mn.po
index 1b50b2e..9e63416 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -311,8 +311,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 
 #: ../app/commands.c:637
diff --git a/po/mr.po b/po/mr.po
index 61f61bf..c656b7c 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -324,22 +324,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-msgstr ""
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 
 #: ../app/commands.c:745
 msgid "A program for drawing structured diagrams."
diff --git a/po/ms.po b/po/ms.po
index d89a0b1..c091f2f 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -325,8 +325,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 
 #: ../app/commands.c:637
diff --git a/po/nb.po b/po/nb.po
index a9ecb96..3184521 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -369,8 +369,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 
 #: ../app/commands.c:963
diff --git a/po/ne.po b/po/ne.po
index 7603e8b..7fd9383 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -341,20 +341,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-msgstr ""
-"यो कार्यक्रम स्वतन्त्र सफ्टवेयर हो; तपाईँले यसलाई स्वतन्त्र सफ्टवेयर संस्थाद्वारप्रकाशित; "
-"इजाजतपत्रको संस्करण २, वा (तपाईँको विकल्पमा) कुनै पनि नयाँ संस्करजि एन यु साधारण साझा "
-"इजाजतपत्रको आधारमा पुन:वितरणर/वा परिमार्जन गर्न सक्नुहुन्छ।\n"
-"\n"
-"यो कार्यक्रम उपयोगी हुँनेछ भन्ने आशामा वितरण गरिन्छ, तर कुनै वारेन्टि विना; यद्यपि निश्चित "
-"उद्देश्यका लागि व्यापरीक्षमता वा स्वास्थ्यको सूचित वारेन्टि विना। अरू विवरणका लागि\n"
-"जि एन यु साधारण साझा इजाजतपत्र हेर्नुहोस्।\n"
-"\n"
-"तपाईँँले यस कार्यक्रमसँगै जि एन यु साधारण साझा इजाजतपत्रको प्रति\n"
-"प्राप्त गरेको हुनुपर्दछ; यदि छैन भने, Free Software\n"
-"oundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. "
+"along with this program; if not, see <http://www.gnu.org/licenses/>. "
 "लाई लेख्नुहोस्।\n"
 
 #: ../app/commands.c:682
diff --git a/po/nl.po b/po/nl.po
index fe1bd41..11101ce 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -335,8 +335,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 
 #: ../app/commands.c:637
diff --git a/po/nn.po b/po/nn.po
index 43ea8c4..66d8e81 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -325,8 +325,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 
 #: ../app/commands.c:637
diff --git a/po/oc.po b/po/oc.po
index d1a19b2..ffac07a 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -300,8 +300,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 
 #: ../app/commands.c:748
diff --git a/po/pl.po b/po/pl.po
index 558b2cc..16f554f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -380,24 +380,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-msgstr ""
-"Niniejszy program jest wolnym oprogramowaniem; można go rozprowadzać dalej\n"
-"i/lub modyfikować na warunkach Powszechnej Licencji Publicznej GNU, wydanej\n"
-"przez Fundację Wolnego Oprogramowania (Free Software Foundation) - według\n"
-"wersji drugiej tej Licencji lub którejś z późniejszych wersji.\n"
-"\n"
-"Niniejszy program rozpowszechniany jest z nadzieją, iż będzie on użyteczny\n"
-"- jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji\n"
-"PRZYDATNOŚCI HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ. W celu\n"
-"uzyskania bliższych informacji należy zapoznać się z Powszechną Licencją\n"
-"Publiczną GNU.\n"
-"\n"
-"Z pewnością wraz z niniejszym programem dostarczono także egzemplarz\n"
-"Powszechnej Licencji Publicznej GNU (GNU General Public License); jeśli\n"
-"nie - proszę napisać do Free Software Foundation, Inc., 59 Temple Place -\n"
-"Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 
 #: ../app/commands.c:963
 #, fuzzy
diff --git a/po/pt.po b/po/pt.po
index d451c06..9db4177 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -377,23 +377,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-msgstr ""
-"Este programa é software livre; pode redistribuí-lo e/ou modificá-lo\n"
-"sob os termos da licença GNU General Public License tal como publicada\n"
-"pela Free Software Foundation; a versão 2 da licença ou (se preferir)\n"
-"qualquer outra versão posterior.\n"
-"\n"
-"Este programa é distribuído na esperança que seja útil,\n"
-"mas SEM QUALQUER GARANTIA; sem sequer uma garantia\n"
-"implícita de ser COMERCIÁVEL ou ADEQUADA A NENHUM\n"
-"PROPÓSITO. Ver a licença GNU General Public License para\n"
-"mais detalhes.\n"
-"\n"
-"Deve ter recebido uma cópia da GNU General Public License\n"
-"juntamente com o programa; senão escreva à Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 
 #: ../app/commands.c:807
 msgid "A program for drawing structured diagrams."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 897113a..4bf41bd 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -405,22 +405,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-msgstr ""
-"Este programa é um software livre; você pode redistribuí-lo e/ou\n"
-"modificá-lo sob os termos da Licença Pública Geral GNU (GNU GPL)\n"
-"como publicada pela Free Software Foundation; tanto a versão 2 da\n"
-"Licença ou (a sua escolha) qualquer versão posterior.\n"
-"\n"
-"Este programa é distribuído na esperança de que será útil, mas SEM\n"
-"NENHUMA GARANTIA; até mesmo sem a garantia implícita de\n"
-"COMERCIALIZAÇÃO ou ADEQUAÇÃO A UM PROPÓSITO EM PARTICULAR.\n"
-"Veja a Licença Pública Geral GNU (GNU GPL) para mais detalhes.\n"
-"\n"
-"Você deve ter recebido uma cópia da Licença Pública Geral GNU\n"
-"junto com este programa; se não, escreva para a Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 
 #: ../app/commands.c:1039
 msgid "A program for drawing structured diagrams."
diff --git a/po/ro.po b/po/ro.po
index d81ba7e..35fdcec 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -392,24 +392,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-msgstr ""
-"Acest program este software liber; îl puteți redistribui și/sau modifica\n"
-"în conformitate cu termenii licenței GNU General Public License așa cum "
-"este\n"
-"publicată de către Free Software Foundation; fie versiunea 2 a Licenței, "
-"fie\n"
-"(la latitudinea dumneavoastră) orice versiune ulterioară.\n"
-"\n"
-"Acest program este distribuit cu speranța că va fi folositor, dar\n"
-"FĂRĂ NICIO GARANȚIE; fără nici măcar garanția implicită asociată\n"
-"COMERCIALIZĂRII sau POTRIVIRII PENTRU UN SCOP PARTICULAR.\n"
-"Vedeți licența GNU General Public License pentru detalii.\n"
-"\n"
-"Împreună cu acest program ar trebui să fi primit o copie a licenței\n"
-"GNU General Public License. Dacă nu, scrieți la Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 
 #: ../app/commands.c:1040
 msgid "A program for drawing structured diagrams."
diff --git a/po/ru.po b/po/ru.po
index 6122c57..080770b 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -384,8 +384,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 "Эта программа ― свободное программное обеспечение. Вы можете распространять "
 "или\n"
diff --git a/po/rw.po b/po/rw.po
index a6a38b8..d285456 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -350,8 +350,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 
 #: ../app/commands.c:637
diff --git a/po/sk.po b/po/sk.po
index 4567eb9..ebe465a 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -357,8 +357,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 "Tento program je slobodný softvér; môžete ho redistribuovať a/alebo meniť\n"
 "za podmienok GNU General Public License (GNU GPL), ktorú publikovala\n"
diff --git a/po/sl.po b/po/sl.po
index 68e4588..e474f9f 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -389,22 +389,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-msgstr ""
-"To je prosti program; lahko ga razširjate in/ali spreminjate\n"
-"pod pogoji Splošne javne licence GNU, ki jo je objavila\n"
-"Free Software Foundation; velja za različico licence 2 ali\n"
-"(če želite) katero koli kasnejšo različico.\n"
-"\n"
-"Ta program razširjamo v upanju, da bo uporaben,\n"
-"vendar BREZ KAKRŠNE KOLI GARANCIJE; celo brez implicitne garancije\n"
-"USTREZNOSTI ZA TRŽENJE ali USTREZNOSTI ZA DOLOČEN NAMEN.  Oglejte si\n"
-"Splošno javno licenco GNU za več podrobnosti.\n"
-"\n"
-"Splošno javno licenco GNU bi morali prejeti skupaj\n"
-"s tem programom; če je niste, pišite na naslov: Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 
 #: ../app/commands.c:1037
 msgid "A program for drawing structured diagrams."
diff --git a/po/sq.po b/po/sq.po
index 3c68eb8..1e62479 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -332,8 +332,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 
 #: ../app/commands.c:637
diff --git a/po/sr.po b/po/sr.po
index 3844e06..1911f5b 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -391,8 +391,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 "Овај програм је слободан софтвер; можете га прослеђивати\n"
 "и/или мењати под условима ГНУ Опште јавне лиценце коју је\n"
diff --git a/po/sr Latn po b/po/sr Latn po
index 74590d6..2787fd7 100644
--- a/po/sr Latn po
+++ b/po/sr Latn po
@@ -333,8 +333,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 
 #: ../app/commands.c:637
diff --git a/po/sr latin po b/po/sr latin po
index 4a84534..66d2fb9 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -391,8 +391,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 "Ovaj program je slobodan softver; možete ga prosleđivati\n"
 "i/ili menjati pod uslovima GNU Opšte javne licence koju je\n"
diff --git a/po/sv.po b/po/sv.po
index 2546437..698efed 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -322,8 +322,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 "Detta program är fri programvara. Du kan distribuera det och/eller\n"
 "modifiera det under villkoren i GNU General Public License, publicerad\n"
diff --git a/po/th.po b/po/th.po
index f1e3358..6a90d29 100644
--- a/po/th.po
+++ b/po/th.po
@@ -331,8 +331,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 
 #: ../app/commands.c:637
diff --git a/po/tr.po b/po/tr.po
index 94b8508..991bfad 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -320,8 +320,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 
 #: ../app/commands.c:637
diff --git a/po/uk.po b/po/uk.po
index 837ecee..c0b0838 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -377,22 +377,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-msgstr ""
-"Ця програма є вільною; Ви можете поширювати її та/або змінювати\n"
-"її за умов дотримання GNU General Public License у тому вигляді,\n"
-"що оприлюднено Free Software Foundation; у вигляді версії 2 цієї\n"
-"ліцензії, або (за Вашим бажанням) будь-якої пізнішої версії.\n"
-"\n"
-"Ця програма поширюється у сподіванні, що вона буде корисною,\n"
-"але БЕЗ БУДЬ-ЯКОЇ ГАРАНТІЇ; навіть без очевидної гарантії\n"
-"КОМЕРЦІЙНОЇ ПРИДАТНОСТІ або ПРИДАТНОСТІ ДЛЯ ЯКОЇСЬ МЕТИ.\n"
-"Щоб дізнатися більше ознайомтеся з GNU General Public License.\n"
-"\n"
-"Ви мали отримати копію GNU General Public License разом з цією\n"
-"програмою, якщо це не так, напишіть до Free Software\n"
-"Foundation, Inc., 59 Temple Place — Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 
 #: ../app/commands.c:838
 msgid "A program for drawing structured diagrams."
diff --git a/po/vi.po b/po/vi.po
index 1b7bbbc..5022989 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -361,8 +361,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 "Chương trình này là phần mềm dùng tự do;\n"
 "bạn có thể phân phối lại và/hay sửa đổí nó với điều kiện cua\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index bb47155..f019dc5 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -385,8 +385,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 "这一程序是自由软件;你可以遵照自由软件基金会出版的 \n"
 "GNU 通用公共许可证条款来修改和重新发布这一程序。\n"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 03ab6be..796aa31 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -378,8 +378,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 
 #: ../app/commands.c:1040
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 90896fa..1e2a1ce 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -379,8 +379,7 @@ msgid ""
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"along with this program; if not, see <http://www.gnu.org/licenses/>.\n"
 msgstr ""
 
 #: ../app/commands.c:1040
diff --git a/sheets/checktrans.py b/sheets/checktrans.py
old mode 100755
new mode 100644
index b70070a..e5ddfcc
--- a/sheets/checktrans.py
+++ b/sheets/checktrans.py
@@ -15,8 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this quick hack; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this quick hack; if not, see <http://www.gnu.org/licenses/>.
 #
 
 
diff --git a/tests/test-boundingbox.c b/tests/test-boundingbox.c
index 8b3111d..e079991 100644
--- a/tests/test-boundingbox.c
+++ b/tests/test-boundingbox.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/tests/test-objects.c b/tests/test-objects.c
index c276566..7b66d43 100644
--- a/tests/test-objects.c
+++ b/tests/test-objects.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]