[nautilus-actions] Set Nautilus-Actions as being the actual official product name



commit 7b96da1eb299e7f4d402f949d63596569b28cf56
Author: Pierre Wieser <pwieser trychlos org>
Date:   Sat Jan 1 13:49:10 2011 +0100

    Set Nautilus-Actions as being the actual official product name

 Makefile.am                                        |    2 +-
 NEWS                                               |    8 ++++----
 TODO                                               |    2 +-
 configure.ac                                       |    2 +-
 data/Makefile.am                                   |    2 +-
 data/actions/Makefile.am                           |    2 +-
 data/exports/Makefile.am                           |    2 +-
 data/gconf-schemas/Makefile.am                     |    2 +-
 .../nautilus-actions-prefs.schemas.in              |   12 ++++++------
 docs/Makefile.am                                   |    2 +-
 docs/nact/C/nact-starting.xml                      |    2 +-
 docs/nact/Makefile.am                              |    2 +-
 docs/nact/de/de.po                                 |    2 +-
 docs/nact/es/es.po                                 |    2 +-
 docs/nact/sl/sl.po                                 |    2 +-
 docs/reference/Makefile.am                         |    2 +-
 icons/16x16/Makefile.am                            |    2 +-
 icons/16x16/nautilus-actions.svg                   |    2 +-
 icons/22x22/Makefile.am                            |    2 +-
 icons/22x22/nautilus-actions.svg                   |    2 +-
 icons/32x32/Makefile.am                            |    2 +-
 icons/32x32/nautilus-actions.svg                   |    2 +-
 icons/48x48/Makefile.am                            |    2 +-
 icons/Makefile.am                                  |    2 +-
 icons/scalable/Makefile.am                         |    2 +-
 icons/scalable/nautilus-actions.svg                |    2 +-
 m4/Makefile.am                                     |    2 +-
 m4/na-check-for-gtk.m4                             |    2 +-
 m4/na-check-module.m4                              |    2 +-
 m4/na-default-io-provider.m4                       |    2 +-
 m4/na-enable-manuals.m4                            |    2 +-
 m4/na-maintainer-mode.m4                           |    2 +-
 m4/na-nautilus-extdir.m4                           |    4 ++--
 src/Makefile.am                                    |    2 +-
 src/api/Makefile.am                                |    2 +-
 src/api/na-core-utils.h                            |    2 +-
 src/api/na-data-boxed.h                            |    2 +-
 src/api/na-data-def.h                              |    2 +-
 src/api/na-data-types.h                            |    2 +-
 src/api/na-dbus.h                                  |    2 +-
 src/api/na-extension.h                             |    2 +-
 src/api/na-gconf-monitor.h                         |    2 +-
 src/api/na-gconf-utils.h                           |    2 +-
 src/api/na-icontext.h                              |    2 +-
 src/api/na-iduplicable.h                           |    2 +-
 src/api/na-iexporter.h                             |    2 +-
 src/api/na-ifactory-object-data.h                  |    2 +-
 src/api/na-ifactory-object.h                       |    2 +-
 src/api/na-ifactory-provider-provider.h            |    2 +-
 src/api/na-ifactory-provider.h                     |    2 +-
 src/api/na-iimporter.h                             |    2 +-
 src/api/na-iio-provider.h                          |    2 +-
 src/api/na-object-action.h                         |    2 +-
 src/api/na-object-api.h                            |    2 +-
 src/api/na-object-id.h                             |    2 +-
 src/api/na-object-item.h                           |    2 +-
 src/api/na-object-menu.h                           |    2 +-
 src/api/na-object-profile.h                        |    2 +-
 src/api/na-object.h                                |    2 +-
 src/core/Makefile.am                               |    2 +-
 src/core/na-core-utils.c                           |    2 +-
 src/core/na-data-boxed.c                           |    2 +-
 src/core/na-data-def.c                             |    2 +-
 src/core/na-data-types.c                           |    2 +-
 src/core/na-export-format.c                        |    2 +-
 src/core/na-export-format.h                        |    2 +-
 src/core/na-exporter.c                             |    2 +-
 src/core/na-exporter.h                             |    2 +-
 src/core/na-factory-object.c                       |    2 +-
 src/core/na-factory-object.h                       |    2 +-
 src/core/na-factory-provider.c                     |    2 +-
 src/core/na-factory-provider.h                     |    2 +-
 src/core/na-gconf-monitor.c                        |    2 +-
 src/core/na-gconf-utils.c                          |    2 +-
 src/core/na-gnome-vfs-uri.c                        |    2 +-
 src/core/na-gnome-vfs-uri.h                        |    2 +-
 src/core/na-gtk-utils.c                            |    2 +-
 src/core/na-gtk-utils.h                            |    2 +-
 src/core/na-iabout.c                               |   10 +++++-----
 src/core/na-iabout.h                               |    4 ++--
 src/core/na-icontext-factory.c                     |    2 +-
 src/core/na-icontext.c                             |    2 +-
 src/core/na-iduplicable.c                          |    2 +-
 src/core/na-iexporter.c                            |    2 +-
 src/core/na-ifactory-object.c                      |    2 +-
 src/core/na-ifactory-provider.c                    |    2 +-
 src/core/na-iimporter.c                            |    2 +-
 src/core/na-iio-provider.c                         |    2 +-
 src/core/na-importer-ask.c                         |    2 +-
 src/core/na-importer-ask.h                         |    2 +-
 src/core/na-importer.c                             |    2 +-
 src/core/na-importer.h                             |    2 +-
 src/core/na-io-provider.c                          |    2 +-
 src/core/na-io-provider.h                          |    2 +-
 src/core/na-ipivot-consumer.c                      |    2 +-
 src/core/na-ipivot-consumer.h                      |    2 +-
 src/core/na-iprefs.c                               |    2 +-
 src/core/na-iprefs.h                               |    8 ++++----
 src/core/na-module.c                               |    2 +-
 src/core/na-module.h                               |    2 +-
 src/core/na-object-action-factory.c                |    2 +-
 src/core/na-object-id-factory.c                    |    2 +-
 src/core/na-object-id.c                            |    2 +-
 src/core/na-object-item-factory.c                  |    2 +-
 src/core/na-object-item.c                          |    2 +-
 src/core/na-object-menu-factory.c                  |    2 +-
 src/core/na-object-menu.c                          |    2 +-
 src/core/na-object-profile-factory.c               |    2 +-
 src/core/na-object-profile.c                       |    2 +-
 src/core/na-object.c                               |    2 +-
 src/core/na-pivot.c                                |    2 +-
 src/core/na-pivot.h                                |    2 +-
 src/core/na-selected-info.c                        |    2 +-
 src/core/na-selected-info.h                        |    2 +-
 src/core/na-tokens.c                               |    2 +-
 src/core/na-tokens.h                               |    2 +-
 src/core/na-updater.c                              |    2 +-
 src/core/na-updater.h                              |    2 +-
 src/io-desktop/Makefile.am                         |    2 +-
 src/io-desktop/nadp-desktop-file.c                 |    2 +-
 src/io-desktop/nadp-desktop-file.h                 |    2 +-
 src/io-desktop/nadp-desktop-provider.c             |    2 +-
 src/io-desktop/nadp-desktop-provider.h             |    2 +-
 src/io-desktop/nadp-formats.c                      |    6 +++---
 src/io-desktop/nadp-formats.h                      |    2 +-
 src/io-desktop/nadp-keys.c                         |    2 +-
 src/io-desktop/nadp-keys.h                         |    2 +-
 src/io-desktop/nadp-module.c                       |    2 +-
 src/io-desktop/nadp-monitor.c                      |    2 +-
 src/io-desktop/nadp-monitor.h                      |    2 +-
 src/io-desktop/nadp-reader.c                       |    2 +-
 src/io-desktop/nadp-reader.h                       |    2 +-
 src/io-desktop/nadp-utils.c                        |    2 +-
 src/io-desktop/nadp-utils.h                        |    2 +-
 src/io-desktop/nadp-writer.c                       |    2 +-
 src/io-desktop/nadp-writer.h                       |    2 +-
 src/io-desktop/nadp-xdg-dirs.c                     |    2 +-
 src/io-desktop/nadp-xdg-dirs.h                     |    2 +-
 src/io-gconf/Makefile.am                           |    2 +-
 src/io-gconf/nagp-gconf-provider.c                 |    2 +-
 src/io-gconf/nagp-gconf-provider.h                 |    2 +-
 src/io-gconf/nagp-keys.c                           |    2 +-
 src/io-gconf/nagp-keys.h                           |    2 +-
 src/io-gconf/nagp-module.c                         |    2 +-
 src/io-gconf/nagp-reader.c                         |    2 +-
 src/io-gconf/nagp-reader.h                         |    2 +-
 src/io-gconf/nagp-writer.c                         |    2 +-
 src/io-gconf/nagp-writer.h                         |    2 +-
 src/io-xml/Makefile.am                             |    2 +-
 src/io-xml/naxml-formats.c                         |   18 +++++++++---------
 src/io-xml/naxml-formats.h                         |    2 +-
 src/io-xml/naxml-keys.c                            |    2 +-
 src/io-xml/naxml-keys.h                            |    2 +-
 src/io-xml/naxml-module.c                          |    2 +-
 src/io-xml/naxml-provider.c                        |    2 +-
 src/io-xml/naxml-provider.h                        |    2 +-
 src/io-xml/naxml-reader.c                          |    2 +-
 src/io-xml/naxml-reader.h                          |    2 +-
 src/io-xml/naxml-writer.c                          |    2 +-
 src/io-xml/naxml-writer.h                          |    2 +-
 src/nact/Makefile.am                               |    2 +-
 src/nact/base-application-class.h                  |    2 +-
 src/nact/base-application.c                        |    2 +-
 src/nact/base-application.h                        |    2 +-
 src/nact/base-assistant.c                          |    2 +-
 src/nact/base-assistant.h                          |    4 ++--
 src/nact/base-builder.c                            |    2 +-
 src/nact/base-builder.h                            |    2 +-
 src/nact/base-dialog.c                             |    2 +-
 src/nact/base-dialog.h                             |    4 ++--
 src/nact/base-iprefs.c                             |    2 +-
 src/nact/base-iprefs.h                             |    2 +-
 src/nact/base-keysyms.h                            |    2 +-
 src/nact/base-window-class.h                       |    2 +-
 src/nact/base-window.c                             |    2 +-
 src/nact/base-window.h                             |    2 +-
 src/nact/egg-tree-multi-dnd.c                      |    2 +-
 src/nact/egg-tree-multi-dnd.h                      |    4 ++--
 src/nact/nact-add-capability-dialog.c              |    2 +-
 src/nact/nact-add-capability-dialog.h              |    2 +-
 src/nact/nact-add-scheme-dialog.c                  |    2 +-
 src/nact/nact-add-scheme-dialog.h                  |    2 +-
 src/nact/nact-application.c                        |    6 +++---
 src/nact/nact-application.h                        |    2 +-
 src/nact/nact-assistant-export.c                   |    2 +-
 src/nact/nact-assistant-export.h                   |    2 +-
 src/nact/nact-assistant-import.c                   |    2 +-
 src/nact/nact-assistant-import.h                   |    2 +-
 src/nact/nact-clipboard.c                          |    2 +-
 src/nact/nact-clipboard.h                          |    2 +-
 src/nact/nact-confirm-logout.c                     |    2 +-
 src/nact/nact-confirm-logout.h                     |    2 +-
 src/nact/nact-export-ask.c                         |    2 +-
 src/nact/nact-export-ask.h                         |    2 +-
 src/nact/nact-export-format.c                      |    2 +-
 src/nact/nact-export-format.h                      |    2 +-
 src/nact/nact-gtk-utils.c                          |    2 +-
 src/nact/nact-gtk-utils.h                          |    2 +-
 src/nact/nact-iaction-tab.c                        |    2 +-
 src/nact/nact-iaction-tab.h                        |    2 +-
 src/nact/nact-iactions-list-bis.c                  |    2 +-
 src/nact/nact-iactions-list-priv.c                 |    2 +-
 src/nact/nact-iactions-list-priv.h                 |    2 +-
 src/nact/nact-iactions-list.c                      |    2 +-
 src/nact/nact-iactions-list.h                      |    2 +-
 src/nact/nact-ibasenames-tab.c                     |    2 +-
 src/nact/nact-ibasenames-tab.h                     |    2 +-
 src/nact/nact-icapabilities-tab.c                  |    2 +-
 src/nact/nact-icapabilities-tab.h                  |    2 +-
 src/nact/nact-icommand-tab.c                       |    2 +-
 src/nact/nact-icommand-tab.h                       |    2 +-
 src/nact/nact-ienvironment-tab.c                   |    2 +-
 src/nact/nact-ienvironment-tab.h                   |    2 +-
 src/nact/nact-iexecution-tab.c                     |    2 +-
 src/nact/nact-iexecution-tab.h                     |    2 +-
 src/nact/nact-ifolders-tab.c                       |    2 +-
 src/nact/nact-ifolders-tab.h                       |    2 +-
 src/nact/nact-imimetypes-tab.c                     |    2 +-
 src/nact/nact-imimetypes-tab.h                     |    2 +-
 src/nact/nact-iprefs.c                             |    2 +-
 src/nact/nact-iprefs.h                             |    2 +-
 src/nact/nact-iproperties-tab.c                    |    2 +-
 src/nact/nact-iproperties-tab.h                    |    2 +-
 src/nact/nact-ischemes-tab.c                       |    2 +-
 src/nact/nact-ischemes-tab.h                       |    2 +-
 src/nact/nact-main-menubar-edit.c                  |    2 +-
 src/nact/nact-main-menubar-edit.h                  |    2 +-
 src/nact/nact-main-menubar-file.c                  |    2 +-
 src/nact/nact-main-menubar-file.h                  |    2 +-
 src/nact/nact-main-menubar-help.c                  |    2 +-
 src/nact/nact-main-menubar-help.h                  |    2 +-
 src/nact/nact-main-menubar-maintainer.c            |    2 +-
 src/nact/nact-main-menubar-maintainer.h            |    2 +-
 src/nact/nact-main-menubar-tools.c                 |    2 +-
 src/nact/nact-main-menubar-tools.h                 |    2 +-
 src/nact/nact-main-menubar-view.c                  |    2 +-
 src/nact/nact-main-menubar-view.h                  |    2 +-
 src/nact/nact-main-menubar.c                       |    2 +-
 src/nact/nact-main-menubar.h                       |    2 +-
 src/nact/nact-main-statusbar.c                     |    2 +-
 src/nact/nact-main-statusbar.h                     |    2 +-
 src/nact/nact-main-tab.c                           |    2 +-
 src/nact/nact-main-tab.h                           |    2 +-
 src/nact/nact-main-toolbar.c                       |    2 +-
 src/nact/nact-main-toolbar.h                       |    2 +-
 src/nact/nact-main-window.c                        |    2 +-
 src/nact/nact-main-window.h                        |    2 +-
 src/nact/nact-main.c                               |    2 +-
 src/nact/nact-match-list.c                         |    2 +-
 src/nact/nact-match-list.h                         |    2 +-
 src/nact/nact-preferences-editor.c                 |    2 +-
 src/nact/nact-preferences-editor.h                 |    2 +-
 src/nact/nact-preferences.ui                       |   12 ++++++------
 src/nact/nact-providers-list.c                     |    2 +-
 src/nact/nact-providers-list.h                     |    2 +-
 src/nact/nact-schemes-list.c                       |    2 +-
 src/nact/nact-schemes-list.h                       |    2 +-
 src/nact/nact-sort-buttons.c                       |    2 +-
 src/nact/nact-sort-buttons.h                       |    2 +-
 src/nact/nact-tree-model-dnd.c                     |    4 ++--
 src/nact/nact-tree-model-dnd.h                     |    2 +-
 src/nact/nact-tree-model-priv.h                    |    2 +-
 src/nact/nact-tree-model.c                         |    2 +-
 src/nact/nact-tree-model.h                         |    2 +-
 src/nact/nact-window.c                             |    2 +-
 src/nact/nact-window.h                             |    4 ++--
 src/nact/nact.desktop.in                           |    4 ++--
 src/plugin-menu/Makefile.am                        |    2 +-
 src/plugin-menu/README                             |    2 +-
 src/plugin-menu/nautilus-actions.c                 |   12 ++++++------
 src/plugin-menu/nautilus-actions.h                 |    2 +-
 src/plugin-menu/nautilus-module.c                  |    2 +-
 src/plugin-tracker/Makefile.am                     |    2 +-
 src/plugin-tracker/na-tracker-dbus.c               |    2 +-
 src/plugin-tracker/na-tracker-dbus.h               |    2 +-
 src/plugin-tracker/na-tracker-plugin.c             |    2 +-
 src/plugin-tracker/na-tracker.c                    |    2 +-
 src/plugin-tracker/na-tracker.h                    |    2 +-
 src/test/Makefile.am                               |    2 +-
 src/test/test-iface-base.c                         |    2 +-
 src/test/test-iface-base.h                         |    2 +-
 src/test/test-iface-derived.c                      |    2 +-
 src/test/test-iface-derived.h                      |    2 +-
 src/test/test-iface-iface.c                        |    2 +-
 src/test/test-iface-iface.h                        |    2 +-
 src/test/test-iface.c                              |    2 +-
 src/test/test-parse-uris.c                         |    2 +-
 src/test/test-reader.c                             |    2 +-
 src/test/test-virtuals-without-test.c              |    2 +-
 src/test/test-virtuals.c                           |    2 +-
 src/utils/Makefile.am                              |    2 +-
 src/utils/console-utils.c                          |    2 +-
 src/utils/console-utils.h                          |    2 +-
 src/utils/nautilus-actions-new.c                   |    2 +-
 src/utils/nautilus-actions-run.c                   |    2 +-
 src/utils/nautilus-actions-schemas.c               |    4 ++--
 296 files changed, 342 insertions(+), 342 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d7ee313..0f4734f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Nautilus Actions
+# Nautilus-Actions
 # A Nautilus extension which offers configurable context menu actions.
 #
 # Copyright (C) 2005 The GNOME Foundation
diff --git a/NEWS b/NEWS
index a8e8957..2ef58bf 100644
--- a/NEWS
+++ b/NEWS
@@ -83,7 +83,7 @@ Version 3.0.2
 
 	Bug fixes:
 
-		- Fix #616532 - Can't select directory in the Nautilus Actions export
+		- Fix #616532 - Can't select directory in the Nautilus-Actions export
 		  assistant while browsing it with a GtkFileChooserWidget
 		  (reported by Sense Hofstede).
 		- Fix #632992 - Add comment about default value translation
@@ -429,7 +429,7 @@ Version 2.30.1
 		- Fix #614595 reported by Sense Hofstede
 		  (Not all icons displayed in the nautilus-actions-config-tool)
 		- Fix #614596 reported by Sense Hofstede
-		  (Nautilus Actions' actions don't show up in context menus)
+		  (Nautilus-Actions' actions don't show up in context menus)
 		- Do not prevent the export assistant to actually export items
 		- Do not let a user untoggle a sort button
 		- Do not mark the main window modified when first loading an empty set
@@ -471,7 +471,7 @@ Version 2.30.0
 	Bug fixes:
 
 		- Fix #614382 reported by Wolter Hellmund
-		  (Nautilus actions won't open)
+		  (Nautilus-Actions won't open)
 
 	New and updated translations:
 
@@ -687,7 +687,7 @@ Version 2.29.1
 
 	Other enhancements :
 	- items are freely reorderable ;
-	- an 'About Nautilus Actions' item can be added to Nautilus menus ;
+	- an 'About Nautilus-Actions' item can be added to Nautilus menus ;
     - preferences can be edited through the NACT user interface ;
 	- actions can be imported and exported by drag and drop ;
 	- one toolbar is defined for each menu, and can be displayed in NACT ;
diff --git a/TODO b/TODO
index 67dc4c2..7ad126f 100644
--- a/TODO
+++ b/TODO
@@ -139,7 +139,7 @@ OTHER BUGS
 
 NOTES
 =====
-- Note about the schemas in Nautilus Actions:
+- Note about the schemas in Nautilus-Actions:
   a) actions are identified by uuid
   b) so, all GConf keys have a path with the uuid of the action
   c) I'm not willing to write a schema for each and every uuid
diff --git a/configure.ac b/configure.ac
index 4669001..5282a9b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# Nautilus Actions
+# Nautilus-Actions
 # A Nautilus extension which offers configurable context menu actions.
 #
 # Copyright (C) 2005 The GNOME Foundation
diff --git a/data/Makefile.am b/data/Makefile.am
index 212cc14..0809bbb 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,4 @@
-# Nautilus Actions
+# Nautilus-Actions
 # A Nautilus extension which offers configurable context menu actions.
 #
 # Copyright (C) 2005 The GNOME Foundation
diff --git a/data/actions/Makefile.am b/data/actions/Makefile.am
index 44980c4..371c079 100644
--- a/data/actions/Makefile.am
+++ b/data/actions/Makefile.am
@@ -1,4 +1,4 @@
-# Nautilus Actions
+# Nautilus-Actions
 # A Nautilus extension which offers configurable context menu actions.
 #
 # Copyright (C) 2005 The GNOME Foundation
diff --git a/data/exports/Makefile.am b/data/exports/Makefile.am
index fb22177..bc0ef35 100644
--- a/data/exports/Makefile.am
+++ b/data/exports/Makefile.am
@@ -1,4 +1,4 @@
-# Nautilus Actions
+# Nautilus-Actions
 # A Nautilus extension which offers configurable context menu actions.
 #
 # Copyright (C) 2005 The GNOME Foundation
diff --git a/data/gconf-schemas/Makefile.am b/data/gconf-schemas/Makefile.am
index 97384fa..d422837 100644
--- a/data/gconf-schemas/Makefile.am
+++ b/data/gconf-schemas/Makefile.am
@@ -1,4 +1,4 @@
-# Nautilus Actions
+# Nautilus-Actions
 # A Nautilus extension which offers configurable context menu actions.
 #
 # Copyright (C) 2005 The GNOME Foundation
diff --git a/data/gconf-schemas/nautilus-actions-prefs.schemas.in b/data/gconf-schemas/nautilus-actions-prefs.schemas.in
index b12de6e..9946cee 100644
--- a/data/gconf-schemas/nautilus-actions-prefs.schemas.in
+++ b/data/gconf-schemas/nautilus-actions-prefs.schemas.in
@@ -79,9 +79,9 @@
         <short>Preferred export format</short>
         <long>This is the preferred export format, used as a default when exporting items, or dropping them outside of the application.
 Possible values are:
-- "GConfSchemaV1": this used to be the historical export format. The exported file may later be imported via Import assistant of the Nautilus Actions Configuration Tool, or via the gconftool-2 --import-schema-file command-line tool.
-- "GConfSchemaV2": a lighter while still compatible schema. The exported file may later be imported via Import assistant of the Nautilus Actions Configuration Tool, or via the gconftool-2 --import-schema-file command-line tool.
-- "GConfEntry": this should be the preferred format for newly exported actions. The exported file may later be imported via Import assistant of the Nautilus Actions Configuration Tool, or via the gconftool-2 --load command-line tool.
+- "GConfSchemaV1": this used to be the historical export format. The exported file may later be imported via Import assistant of the Nautilus-Actions Configuration Tool, or via the gconftool-2 --import-schema-file command-line tool.
+- "GConfSchemaV2": a lighter while still compatible schema. The exported file may later be imported via Import assistant of the Nautilus-Actions Configuration Tool, or via the gconftool-2 --import-schema-file command-line tool.
+- "GConfEntry": this should be the preferred format for newly exported actions. The exported file may later be imported via Import assistant of the Nautilus-Actions Configuration Tool, or via the gconftool-2 --load command-line tool.
 - "Ask": the user will be asked at runtime for the format he wishes use.</long>
       </locale>
       <default>/tmp</default>
@@ -238,7 +238,7 @@ Possible values are:
       <type>bool</type>
       <locale name="C">
         <short>Add an 'About' item in the Nautilus context menu</short>
-        <long>If TRUE, and if the user has defined a single root menu for its actions, then an 'About Nautilus Actions' will be displayed at end of the first submenu.</long>
+        <long>If TRUE, and if the user has defined a single root menu for its actions, then an 'About Nautilus-Actions' will be displayed at end of the first submenu.</long>
       </locale>
       <default>true</default>
     </schema>
@@ -262,8 +262,8 @@ Possible values are:
       <owner>nautilus-actions</owner>
       <type>bool</type>
       <locale name="C">
-        <short>Define a 'Nautilus Actions' root menu</short>
-        <long>If TRUE, then a 'Nautilus Actions' item will be defined in the Nautilus context menu, and will a root menu of all available actions.</long>
+        <short>Define a 'Nautilus-Actions actions' root menu</short>
+        <long>If TRUE, then a 'Nautilus-Actions actions' item will be defined in the Nautilus context menu, and will be the root menu of all available actions.</long>
       </locale>
       <default>true</default>
     </schema>
diff --git a/docs/Makefile.am b/docs/Makefile.am
index e4b2f7f..94290f8 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,4 +1,4 @@
-# Nautilus Actions
+# Nautilus-Actions
 # A Nautilus extension which offers configurable context menu actions.
 #
 # Copyright (C) 2005 The GNOME Foundation
diff --git a/docs/nact/C/nact-starting.xml b/docs/nact/C/nact-starting.xml
index 52e5a1a..385b422 100644
--- a/docs/nact/C/nact-starting.xml
+++ b/docs/nact/C/nact-starting.xml
@@ -12,7 +12,7 @@
               <menuchoice>
                 <guisubmenu>Preferences</guisubmenu>
                 <guisubmenu>Look and Feel</guisubmenu>
-                <guimenuitem>Nautilus Actions Configuration Tool</guimenuitem>
+                <guimenuitem>Nautilus-Actions Configuration Tool</guimenuitem>
               </menuchoice>.
             </para>
           </listitem>
diff --git a/docs/nact/Makefile.am b/docs/nact/Makefile.am
index 0efeffe..3331586 100644
--- a/docs/nact/Makefile.am
+++ b/docs/nact/Makefile.am
@@ -1,4 +1,4 @@
-# Nautilus Actions
+# Nautilus-Actions
 # A Nautilus extension which offers configurable context menu actions.
 #
 # Copyright (C) 2005 The GNOME Foundation
diff --git a/docs/nact/de/de.po b/docs/nact/de/de.po
index a52fe1b..a5c443f 100644
--- a/docs/nact/de/de.po
+++ b/docs/nact/de/de.po
@@ -551,7 +551,7 @@ msgstr "Menü <guimenu>System</guimenu>"
 #: C/nautilus-actions-config-tool.xml:10(para)
 msgid ""
 "Choose <menuchoice><guisubmenu>Preferences</guisubmenu><guisubmenu>Look and "
-"Feel</guisubmenu><guimenuitem>Nautilus Actions Configuration Tool</"
+"Feel</guisubmenu><guimenuitem>Nautilus-Actions Configuration Tool</"
 "guimenuitem></menuchoice>."
 msgstr ""
 "Wählen Sie <menuchoice><guisubmenu>Einstellungen</"
diff --git a/docs/nact/es/es.po b/docs/nact/es/es.po
index 612e2a6..a061d1f 100644
--- a/docs/nact/es/es.po
+++ b/docs/nact/es/es.po
@@ -568,7 +568,7 @@ msgstr "Menú <guimenu>Sistema</guimenu>"
 #: C/nautilus-actions-config-tool.xml:10(para)
 msgid ""
 "Choose <menuchoice><guisubmenu>Preferences</guisubmenu><guisubmenu>Look and "
-"Feel</guisubmenu><guimenuitem>Nautilus Actions Configuration Tool</"
+"Feel</guisubmenu><guimenuitem>Nautilus-Actions Configuration Tool</"
 "guimenuitem></menuchoice>."
 msgstr ""
 
diff --git a/docs/nact/sl/sl.po b/docs/nact/sl/sl.po
index c82cca7..a1ad6f8 100644
--- a/docs/nact/sl/sl.po
+++ b/docs/nact/sl/sl.po
@@ -349,7 +349,7 @@ msgid "<guimenu>System</guimenu> menu"
 msgstr ""
 
 #: C/nautilus-actions-config-tool.xml:10(para)
-msgid "Choose <menuchoice><guisubmenu>Preferences</guisubmenu><guisubmenu>Look and Feel</guisubmenu><guimenuitem>Nautilus Actions Configuration Tool</guimenuitem></menuchoice>."
+msgid "Choose <menuchoice><guisubmenu>Preferences</guisubmenu><guisubmenu>Look and Feel</guisubmenu><guimenuitem>Nautilus-Actions Configuration Tool</guimenuitem></menuchoice>."
 msgstr ""
 
 #: C/nautilus-actions-config-tool.xml:21(term)
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index c5074cf..78f37bb 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -1,4 +1,4 @@
-# Nautilus Actions
+# Nautilus-Actions
 # A Nautilus extension which offers configurable context menu actions.
 #
 # Copyright (C) 2005 The GNOME Foundation
diff --git a/icons/16x16/Makefile.am b/icons/16x16/Makefile.am
index e402644..f5ed981 100644
--- a/icons/16x16/Makefile.am
+++ b/icons/16x16/Makefile.am
@@ -1,4 +1,4 @@
-# Nautilus Actions
+# Nautilus-Actions
 # A Nautilus extension which offers configurable context menu actions.
 #
 # Copyright (C) 2005 The GNOME Foundation
diff --git a/icons/16x16/nautilus-actions.svg b/icons/16x16/nautilus-actions.svg
index ac09fd8..33c016f 100644
--- a/icons/16x16/nautilus-actions.svg
+++ b/icons/16x16/nautilus-actions.svg
@@ -190,7 +190,7 @@
             <dc:title>Ulisse Perusin</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Nautilus Actions</dc:title>
+        <dc:title>Nautilus-Actions</dc:title>
         <dc:subject>
           <rdf:Bag>
             <rdf:li>Nautilus</rdf:li>
diff --git a/icons/22x22/Makefile.am b/icons/22x22/Makefile.am
index 39a6417..f4699f3 100644
--- a/icons/22x22/Makefile.am
+++ b/icons/22x22/Makefile.am
@@ -1,4 +1,4 @@
-# Nautilus Actions
+# Nautilus-Actions
 # A Nautilus extension which offers configurable context menu actions.
 #
 # Copyright (C) 2005 The GNOME Foundation
diff --git a/icons/22x22/nautilus-actions.svg b/icons/22x22/nautilus-actions.svg
index 5d31279..49631f9 100644
--- a/icons/22x22/nautilus-actions.svg
+++ b/icons/22x22/nautilus-actions.svg
@@ -213,7 +213,7 @@
             <dc:title>Ulisse Perusin</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Nautilus Actions</dc:title>
+        <dc:title>Nautilus-Actions</dc:title>
         <dc:subject>
           <rdf:Bag>
             <rdf:li>Nautilus</rdf:li>
diff --git a/icons/32x32/Makefile.am b/icons/32x32/Makefile.am
index 69993c3..58a015d 100644
--- a/icons/32x32/Makefile.am
+++ b/icons/32x32/Makefile.am
@@ -1,4 +1,4 @@
-# Nautilus Actions
+# Nautilus-Actions
 # A Nautilus extension which offers configurable context menu actions.
 #
 # Copyright (C) 2005 The GNOME Foundation
diff --git a/icons/32x32/nautilus-actions.svg b/icons/32x32/nautilus-actions.svg
index 32fa373..f865c0b 100644
--- a/icons/32x32/nautilus-actions.svg
+++ b/icons/32x32/nautilus-actions.svg
@@ -260,7 +260,7 @@
             <dc:title>Ulisse Perusin</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Nautilus Actions</dc:title>
+        <dc:title>Nautilus-Actions</dc:title>
         <dc:subject>
           <rdf:Bag>
             <rdf:li>Nautilus</rdf:li>
diff --git a/icons/48x48/Makefile.am b/icons/48x48/Makefile.am
index cd53402..212ed8a 100644
--- a/icons/48x48/Makefile.am
+++ b/icons/48x48/Makefile.am
@@ -1,4 +1,4 @@
-# Nautilus Actions
+# Nautilus-Actions
 # A Nautilus extension which offers configurable context menu actions.
 #
 # Copyright (C) 2005 The GNOME Foundation
diff --git a/icons/Makefile.am b/icons/Makefile.am
index 6a667fe..4e23847 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -1,4 +1,4 @@
-# Nautilus Actions
+# Nautilus-Actions
 # A Nautilus extension which offers configurable context menu actions.
 #
 # Copyright (C) 2005 The GNOME Foundation
diff --git a/icons/scalable/Makefile.am b/icons/scalable/Makefile.am
index 9fdae0c..0e135ec 100644
--- a/icons/scalable/Makefile.am
+++ b/icons/scalable/Makefile.am
@@ -1,4 +1,4 @@
-# Nautilus Actions
+# Nautilus-Actions
 # A Nautilus extension which offers configurable context menu actions.
 #
 # Copyright (C) 2005 The GNOME Foundation
diff --git a/icons/scalable/nautilus-actions.svg b/icons/scalable/nautilus-actions.svg
index c6a4c74..eba9f25 100644
--- a/icons/scalable/nautilus-actions.svg
+++ b/icons/scalable/nautilus-actions.svg
@@ -232,7 +232,7 @@
             <dc:title>Ulisse Perusin</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Nautilus Actions</dc:title>
+        <dc:title>Nautilus-Actions</dc:title>
         <dc:subject>
           <rdf:Bag>
             <rdf:li>Nautilus</rdf:li>
diff --git a/m4/Makefile.am b/m4/Makefile.am
index fb22177..bc0ef35 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,4 +1,4 @@
-# Nautilus Actions
+# Nautilus-Actions
 # A Nautilus extension which offers configurable context menu actions.
 #
 # Copyright (C) 2005 The GNOME Foundation
diff --git a/m4/na-check-for-gtk.m4 b/m4/na-check-for-gtk.m4
index a8f390f..4560f8d 100644
--- a/m4/na-check-for-gtk.m4
+++ b/m4/na-check-for-gtk.m4
@@ -1,4 +1,4 @@
-# Nautilus Actions
+# Nautilus-Actions
 # A Nautilus extension which offers configurable context menu actions.
 #
 # Copyright (C) 2005 The GNOME Foundation
diff --git a/m4/na-check-module.m4 b/m4/na-check-module.m4
index d2b0f90..49a2733 100644
--- a/m4/na-check-module.m4
+++ b/m4/na-check-module.m4
@@ -1,4 +1,4 @@
-# Nautilus Actions
+# Nautilus-Actions
 # A Nautilus extension which offers configurable context menu actions.
 #
 # Copyright (C) 2005 The GNOME Foundation
diff --git a/m4/na-default-io-provider.m4 b/m4/na-default-io-provider.m4
index 3fdb55f..ef5eb30 100644
--- a/m4/na-default-io-provider.m4
+++ b/m4/na-default-io-provider.m4
@@ -1,4 +1,4 @@
-# Nautilus Actions
+# Nautilus-Actions
 # A Nautilus extension which offers configurable context menu actions.
 #
 # Copyright (C) 2005 The GNOME Foundation
diff --git a/m4/na-enable-manuals.m4 b/m4/na-enable-manuals.m4
index 9d3e03e..979911d 100644
--- a/m4/na-enable-manuals.m4
+++ b/m4/na-enable-manuals.m4
@@ -1,4 +1,4 @@
-# Nautilus Actions
+# Nautilus-Actions
 # A Nautilus extension which offers configurable context menu actions.
 #
 # Copyright (C) 2005 The GNOME Foundation
diff --git a/m4/na-maintainer-mode.m4 b/m4/na-maintainer-mode.m4
index 7a7d5bd..d989ea5 100644
--- a/m4/na-maintainer-mode.m4
+++ b/m4/na-maintainer-mode.m4
@@ -1,4 +1,4 @@
-# Nautilus Actions
+# Nautilus-Actions
 # A Nautilus extension which offers configurable context menu actions.
 #
 # Copyright (C) 2005 The GNOME Foundation
diff --git a/m4/na-nautilus-extdir.m4 b/m4/na-nautilus-extdir.m4
index ce45b25..6f8328f 100644
--- a/m4/na-nautilus-extdir.m4
+++ b/m4/na-nautilus-extdir.m4
@@ -1,4 +1,4 @@
-# Nautilus Actions
+# Nautilus-Actions
 # A Nautilus extension which offers configurable context menu actions.
 #
 # Copyright (C) 2005 The GNOME Foundation
@@ -26,7 +26,7 @@
 #   Pierre Wieser <pwieser trychlos org>
 #   ... and many others (see AUTHORS)
 
-# serial 2 change NACT_ prefix to NA_ (Nautilus Actions)
+# serial 2 change NACT_ prefix to NA_ (Nautilus-Actions)
 
 # let the user specify an alternate nautilus-extension dir
 # --with-nautilus-extdir=<dir>
diff --git a/src/Makefile.am b/src/Makefile.am
index 9797dbd..ed3de79 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-# Nautilus Actions
+# Nautilus-Actions
 # A Nautilus extension which offers configurable context menu actions.
 #
 # Copyright (C) 2005 The GNOME Foundation
diff --git a/src/api/Makefile.am b/src/api/Makefile.am
index 6f482d7..f3daab7 100644
--- a/src/api/Makefile.am
+++ b/src/api/Makefile.am
@@ -1,4 +1,4 @@
-# Nautilus Actions
+# Nautilus-Actions
 # A Nautilus extension which offers configurable context menu actions.
 #
 # Copyright (C) 2005 The GNOME Foundation
diff --git a/src/api/na-core-utils.h b/src/api/na-core-utils.h
index 9dcbe7c..c01d070 100644
--- a/src/api/na-core-utils.h
+++ b/src/api/na-core-utils.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/api/na-data-boxed.h b/src/api/na-data-boxed.h
index 819cb42..d2067c8 100644
--- a/src/api/na-data-boxed.h
+++ b/src/api/na-data-boxed.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/api/na-data-def.h b/src/api/na-data-def.h
index 45dc73c..8a760c4 100644
--- a/src/api/na-data-def.h
+++ b/src/api/na-data-def.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/api/na-data-types.h b/src/api/na-data-types.h
index 5d9e9a6..69d80e0 100644
--- a/src/api/na-data-types.h
+++ b/src/api/na-data-types.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/api/na-dbus.h b/src/api/na-dbus.h
index b89d692..09bc770 100644
--- a/src/api/na-dbus.h
+++ b/src/api/na-dbus.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/api/na-extension.h b/src/api/na-extension.h
index f90c1b9..1fe580d 100644
--- a/src/api/na-extension.h
+++ b/src/api/na-extension.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/api/na-gconf-monitor.h b/src/api/na-gconf-monitor.h
index 50962d9..3c3d6bb 100644
--- a/src/api/na-gconf-monitor.h
+++ b/src/api/na-gconf-monitor.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/api/na-gconf-utils.h b/src/api/na-gconf-utils.h
index fb04c15..0d7f1d5 100644
--- a/src/api/na-gconf-utils.h
+++ b/src/api/na-gconf-utils.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/api/na-icontext.h b/src/api/na-icontext.h
index ac225cb..4064958 100644
--- a/src/api/na-icontext.h
+++ b/src/api/na-icontext.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/api/na-iduplicable.h b/src/api/na-iduplicable.h
index 88cd02a..6e37f05 100644
--- a/src/api/na-iduplicable.h
+++ b/src/api/na-iduplicable.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/api/na-iexporter.h b/src/api/na-iexporter.h
index 6c6f955..10983e5 100644
--- a/src/api/na-iexporter.h
+++ b/src/api/na-iexporter.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/api/na-ifactory-object-data.h b/src/api/na-ifactory-object-data.h
index 8f986c9..946f6a6 100644
--- a/src/api/na-ifactory-object-data.h
+++ b/src/api/na-ifactory-object-data.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/api/na-ifactory-object.h b/src/api/na-ifactory-object.h
index 6c0345a..4f7af81 100644
--- a/src/api/na-ifactory-object.h
+++ b/src/api/na-ifactory-object.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/api/na-ifactory-provider-provider.h b/src/api/na-ifactory-provider-provider.h
index 892da20..8037086 100644
--- a/src/api/na-ifactory-provider-provider.h
+++ b/src/api/na-ifactory-provider-provider.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/api/na-ifactory-provider.h b/src/api/na-ifactory-provider.h
index c9cf8be..740dd5b 100644
--- a/src/api/na-ifactory-provider.h
+++ b/src/api/na-ifactory-provider.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/api/na-iimporter.h b/src/api/na-iimporter.h
index 77cea6c..1b972cf 100644
--- a/src/api/na-iimporter.h
+++ b/src/api/na-iimporter.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/api/na-iio-provider.h b/src/api/na-iio-provider.h
index 11678a7..b9621a9 100644
--- a/src/api/na-iio-provider.h
+++ b/src/api/na-iio-provider.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/api/na-object-action.h b/src/api/na-object-action.h
index 11f85fd..f45a6b6 100644
--- a/src/api/na-object-action.h
+++ b/src/api/na-object-action.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/api/na-object-api.h b/src/api/na-object-api.h
index c25fd20..db2fef9 100644
--- a/src/api/na-object-api.h
+++ b/src/api/na-object-api.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/api/na-object-id.h b/src/api/na-object-id.h
index b8d5820..7ffc4bd 100644
--- a/src/api/na-object-id.h
+++ b/src/api/na-object-id.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/api/na-object-item.h b/src/api/na-object-item.h
index fadce1c..4b5b8b4 100644
--- a/src/api/na-object-item.h
+++ b/src/api/na-object-item.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/api/na-object-menu.h b/src/api/na-object-menu.h
index c259741..d788e7d 100644
--- a/src/api/na-object-menu.h
+++ b/src/api/na-object-menu.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/api/na-object-profile.h b/src/api/na-object-profile.h
index 917f01a..875f67a 100644
--- a/src/api/na-object-profile.h
+++ b/src/api/na-object-profile.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/api/na-object.h b/src/api/na-object.h
index a905666..cacbefd 100644
--- a/src/api/na-object.h
+++ b/src/api/na-object.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 8aaba43..c83d289 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -1,4 +1,4 @@
-# Nautilus Actions
+# Nautilus-Actions
 # A Nautilus extension which offers configurable context menu actions.
 #
 # Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-core-utils.c b/src/core/na-core-utils.c
index 955172a..7113a37 100644
--- a/src/core/na-core-utils.c
+++ b/src/core/na-core-utils.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-data-boxed.c b/src/core/na-data-boxed.c
index a570a8e..54f604d 100644
--- a/src/core/na-data-boxed.c
+++ b/src/core/na-data-boxed.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-data-def.c b/src/core/na-data-def.c
index 36f0382..e5cb527 100644
--- a/src/core/na-data-def.c
+++ b/src/core/na-data-def.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-data-types.c b/src/core/na-data-types.c
index 0faf7de..a5a8f21 100644
--- a/src/core/na-data-types.c
+++ b/src/core/na-data-types.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-export-format.c b/src/core/na-export-format.c
index 9b49d85..4313f6b 100644
--- a/src/core/na-export-format.c
+++ b/src/core/na-export-format.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-export-format.h b/src/core/na-export-format.h
index af76ae8..a9a9e05 100644
--- a/src/core/na-export-format.h
+++ b/src/core/na-export-format.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-exporter.c b/src/core/na-exporter.c
index 3bfd026..5c3b22c 100644
--- a/src/core/na-exporter.c
+++ b/src/core/na-exporter.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-exporter.h b/src/core/na-exporter.h
index 2c5bcf7..3a858b5 100644
--- a/src/core/na-exporter.h
+++ b/src/core/na-exporter.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-factory-object.c b/src/core/na-factory-object.c
index c10d7db..c62116a 100644
--- a/src/core/na-factory-object.c
+++ b/src/core/na-factory-object.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-factory-object.h b/src/core/na-factory-object.h
index f5b9ae5..1ce88d1 100644
--- a/src/core/na-factory-object.h
+++ b/src/core/na-factory-object.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-factory-provider.c b/src/core/na-factory-provider.c
index a7a5efa..6318748 100644
--- a/src/core/na-factory-provider.c
+++ b/src/core/na-factory-provider.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-factory-provider.h b/src/core/na-factory-provider.h
index 05fdce5..5a1a31b 100644
--- a/src/core/na-factory-provider.h
+++ b/src/core/na-factory-provider.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-gconf-monitor.c b/src/core/na-gconf-monitor.c
index f5879b1..bbf5683 100644
--- a/src/core/na-gconf-monitor.c
+++ b/src/core/na-gconf-monitor.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-gconf-utils.c b/src/core/na-gconf-utils.c
index 08377af..acda50c 100644
--- a/src/core/na-gconf-utils.c
+++ b/src/core/na-gconf-utils.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-gnome-vfs-uri.c b/src/core/na-gnome-vfs-uri.c
index ca04321..dba4e08 100644
--- a/src/core/na-gnome-vfs-uri.c
+++ b/src/core/na-gnome-vfs-uri.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-gnome-vfs-uri.h b/src/core/na-gnome-vfs-uri.h
index 79c07c2..f45900b 100644
--- a/src/core/na-gnome-vfs-uri.h
+++ b/src/core/na-gnome-vfs-uri.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-gtk-utils.c b/src/core/na-gtk-utils.c
index b094fe8..3e5e5f4 100644
--- a/src/core/na-gtk-utils.c
+++ b/src/core/na-gtk-utils.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-gtk-utils.h b/src/core/na-gtk-utils.h
index 0699dbb..a0d0e35 100644
--- a/src/core/na-gtk-utils.h
+++ b/src/core/na-gtk-utils.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-iabout.c b/src/core/na-iabout.c
index 9eb4cf6..b1f294e 100644
--- a/src/core/na-iabout.c
+++ b/src/core/na-iabout.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
@@ -173,16 +173,16 @@ na_iabout_display( NAIAbout *instance )
 	};
 
 	static gchar *license[] = {
-		N_( "Nautilus Actions Configuration Tool is free software; you can "
+		N_( "Nautilus-Actions Configuration Tool 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." ),
-		N_( "Nautilus Actions Configuration Tool is distributed in the hope that it "
+		N_( "Nautilus-Actions Configuration Tool 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." ),
 		N_( "You should have received a copy of the GNU General Public License along "
-			"with Nautilus Actions Configuration Tool ; if not, write to the Free "
+			"with Nautilus-Actions Configuration Tool ; if not, write to the Free "
 			"Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, "
 			"MA 02110-1301, USA." ),
 		NULL
@@ -203,7 +203,7 @@ na_iabout_display( NAIAbout *instance )
 		gtk_show_about_dialog( toplevel,
 				"artists", artists,
 				"authors", authors,
-				"comments", _( "A graphical interface to create and edit your Nautilus actions." ),
+				"comments", _( "A graphical interface to create and edit your Nautilus-Actions." ),
 				"copyright", copyright,
 				"documenters", documenters,
 				"license", license_i18n,
diff --git a/src/core/na-iabout.h b/src/core/na-iabout.h
index 81f3ea1..db19f10 100644
--- a/src/core/na-iabout.h
+++ b/src/core/na-iabout.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
@@ -35,7 +35,7 @@
  * @short_description: The #NAIAbout Interface Definition
  * @include: runtime/na-iabout.h
  *
- * This interface displays the 'About Nautilus Actions' dialog box.
+ * This interface displays the 'About Nautilus-Actions' dialog box.
  * The application name may be provided by the implementor ; else,
  * the name of the application will be displayed.
  */
diff --git a/src/core/na-icontext-factory.c b/src/core/na-icontext-factory.c
index 53ce2b2..10bd2c5 100644
--- a/src/core/na-icontext-factory.c
+++ b/src/core/na-icontext-factory.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-icontext.c b/src/core/na-icontext.c
index 7d2323b..f1e852a 100644
--- a/src/core/na-icontext.c
+++ b/src/core/na-icontext.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-iduplicable.c b/src/core/na-iduplicable.c
index 53167a1..11fc494 100644
--- a/src/core/na-iduplicable.c
+++ b/src/core/na-iduplicable.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-iexporter.c b/src/core/na-iexporter.c
index fc7e052..774462f 100644
--- a/src/core/na-iexporter.c
+++ b/src/core/na-iexporter.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-ifactory-object.c b/src/core/na-ifactory-object.c
index 6087572..91833d6 100644
--- a/src/core/na-ifactory-object.c
+++ b/src/core/na-ifactory-object.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-ifactory-provider.c b/src/core/na-ifactory-provider.c
index d298d56..660bf95 100644
--- a/src/core/na-ifactory-provider.c
+++ b/src/core/na-ifactory-provider.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-iimporter.c b/src/core/na-iimporter.c
index 3045349..7ce08a0 100644
--- a/src/core/na-iimporter.c
+++ b/src/core/na-iimporter.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-iio-provider.c b/src/core/na-iio-provider.c
index 347ece0..982d6d8 100644
--- a/src/core/na-iio-provider.c
+++ b/src/core/na-iio-provider.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-importer-ask.c b/src/core/na-importer-ask.c
index 8b7ee73..21c57ac 100644
--- a/src/core/na-importer-ask.c
+++ b/src/core/na-importer-ask.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-importer-ask.h b/src/core/na-importer-ask.h
index 4807b9d..61a8dc0 100644
--- a/src/core/na-importer-ask.h
+++ b/src/core/na-importer-ask.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-importer.c b/src/core/na-importer.c
index 384ca0e..a6ca2ab 100644
--- a/src/core/na-importer.c
+++ b/src/core/na-importer.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-importer.h b/src/core/na-importer.h
index fe4e02d..f6589be 100644
--- a/src/core/na-importer.h
+++ b/src/core/na-importer.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-io-provider.c b/src/core/na-io-provider.c
index 7362cd1..b35202f 100644
--- a/src/core/na-io-provider.c
+++ b/src/core/na-io-provider.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-io-provider.h b/src/core/na-io-provider.h
index 06f30c8..c61d36f 100644
--- a/src/core/na-io-provider.h
+++ b/src/core/na-io-provider.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-ipivot-consumer.c b/src/core/na-ipivot-consumer.c
index 1a56df6..dc29608 100644
--- a/src/core/na-ipivot-consumer.c
+++ b/src/core/na-ipivot-consumer.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-ipivot-consumer.h b/src/core/na-ipivot-consumer.h
index 50dc7f7..75a232e 100644
--- a/src/core/na-ipivot-consumer.h
+++ b/src/core/na-ipivot-consumer.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-iprefs.c b/src/core/na-iprefs.c
index 5b7e279..2e650d3 100644
--- a/src/core/na-iprefs.c
+++ b/src/core/na-iprefs.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-iprefs.h b/src/core/na-iprefs.h
index 9c9c436..ca72949 100644
--- a/src/core/na-iprefs.h
+++ b/src/core/na-iprefs.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
@@ -56,10 +56,10 @@
  *   - descending alphabetical order,
  *   - manual ordering.
  *
- * - adding a 'About Nautilus Actions' item at end of actions: yes/no
+ * - adding a 'About Nautilus-Actions' item at end of actions: yes/no
  *
- *   When checked, an 'About Nautilus Actions' is displayed as the last
- *   item of the root submenu of Nautilus Actions actions.
+ *   When checked, an 'About Nautilus-Actions' is displayed as the last
+ *   item of the root submenu of Nautilus-Actions actions.
  *
  *   It the user didn't have defined a root submenu, whether in the NACT
  *   user interface or by choosing the ad-hoc preference, the plugin
diff --git a/src/core/na-module.c b/src/core/na-module.c
index 7580f10..4566565 100644
--- a/src/core/na-module.c
+++ b/src/core/na-module.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-module.h b/src/core/na-module.h
index 9b028bc..884d392 100644
--- a/src/core/na-module.h
+++ b/src/core/na-module.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu modules.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-object-action-factory.c b/src/core/na-object-action-factory.c
index 40e9ec7..1db71e2 100644
--- a/src/core/na-object-action-factory.c
+++ b/src/core/na-object-action-factory.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-object-id-factory.c b/src/core/na-object-id-factory.c
index ca1b9ce..1872c49 100644
--- a/src/core/na-object-id-factory.c
+++ b/src/core/na-object-id-factory.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-object-id.c b/src/core/na-object-id.c
index a62fd33..15bd9e7 100644
--- a/src/core/na-object-id.c
+++ b/src/core/na-object-id.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-object-item-factory.c b/src/core/na-object-item-factory.c
index 8fadb88..16bc35c 100644
--- a/src/core/na-object-item-factory.c
+++ b/src/core/na-object-item-factory.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-object-item.c b/src/core/na-object-item.c
index a985cd4..7e6ad85 100644
--- a/src/core/na-object-item.c
+++ b/src/core/na-object-item.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-object-menu-factory.c b/src/core/na-object-menu-factory.c
index 688a3f0..1f5dc45 100644
--- a/src/core/na-object-menu-factory.c
+++ b/src/core/na-object-menu-factory.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-object-menu.c b/src/core/na-object-menu.c
index e2a6cc5..ac6d30c 100644
--- a/src/core/na-object-menu.c
+++ b/src/core/na-object-menu.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-object-profile-factory.c b/src/core/na-object-profile-factory.c
index 6b311d5..994a8ae 100644
--- a/src/core/na-object-profile-factory.c
+++ b/src/core/na-object-profile-factory.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-object-profile.c b/src/core/na-object-profile.c
index 3bdd155..618f775 100644
--- a/src/core/na-object-profile.c
+++ b/src/core/na-object-profile.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-object.c b/src/core/na-object.c
index d14a3d2..1e61045 100644
--- a/src/core/na-object.c
+++ b/src/core/na-object.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-pivot.c b/src/core/na-pivot.c
index 94f2156..5d193d8 100644
--- a/src/core/na-pivot.c
+++ b/src/core/na-pivot.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-pivot.h b/src/core/na-pivot.h
index 5b5154a..e82abd6 100644
--- a/src/core/na-pivot.h
+++ b/src/core/na-pivot.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu pivots.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-selected-info.c b/src/core/na-selected-info.c
index cb2b3a6..8f0b7f9 100644
--- a/src/core/na-selected-info.c
+++ b/src/core/na-selected-info.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-selected-info.h b/src/core/na-selected-info.h
index 69bcefc..06c1790 100644
--- a/src/core/na-selected-info.h
+++ b/src/core/na-selected-info.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu selected_infos.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-tokens.c b/src/core/na-tokens.c
index ab6f549..fba6bbc 100644
--- a/src/core/na-tokens.c
+++ b/src/core/na-tokens.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-tokens.h b/src/core/na-tokens.h
index f54424a..7f498f5 100644
--- a/src/core/na-tokens.h
+++ b/src/core/na-tokens.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu modules.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-updater.c b/src/core/na-updater.c
index 11b35cd..37d2f81 100644
--- a/src/core/na-updater.c
+++ b/src/core/na-updater.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/core/na-updater.h b/src/core/na-updater.h
index f455f87..c48b475 100644
--- a/src/core/na-updater.h
+++ b/src/core/na-updater.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu pivots.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-desktop/Makefile.am b/src/io-desktop/Makefile.am
index 63a5014..e3ac424 100644
--- a/src/io-desktop/Makefile.am
+++ b/src/io-desktop/Makefile.am
@@ -1,4 +1,4 @@
-# Nautilus Actions
+# Nautilus-Actions
 # A Nautilus extension which offers configurable context menu actions.
 #
 # Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-desktop/nadp-desktop-file.c b/src/io-desktop/nadp-desktop-file.c
index 58def40..4316896 100644
--- a/src/io-desktop/nadp-desktop-file.c
+++ b/src/io-desktop/nadp-desktop-file.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-desktop/nadp-desktop-file.h b/src/io-desktop/nadp-desktop-file.h
index a987b77..1fdda01 100644
--- a/src/io-desktop/nadp-desktop-file.h
+++ b/src/io-desktop/nadp-desktop-file.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-desktop/nadp-desktop-provider.c b/src/io-desktop/nadp-desktop-provider.c
index 181945c..b680d19 100644
--- a/src/io-desktop/nadp-desktop-provider.c
+++ b/src/io-desktop/nadp-desktop-provider.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-desktop/nadp-desktop-provider.h b/src/io-desktop/nadp-desktop-provider.h
index 0d7b777..ffaff35 100644
--- a/src/io-desktop/nadp-desktop-provider.h
+++ b/src/io-desktop/nadp-desktop-provider.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-desktop/nadp-formats.c b/src/io-desktop/nadp-formats.c
index a104cc4..628c990 100644
--- a/src/io-desktop/nadp-formats.c
+++ b/src/io-desktop/nadp-formats.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
@@ -47,8 +47,8 @@ NAIExporterFormat nadp_formats[] = {
 			N_( "Export as a ._desktop file" ),
 			N_( "This format let you easily share your actions with others, including other desktop environments.\n" \
 				"The exported .desktop file may later be imported via :\n" \
-				"- Import assistant of the Nautilus Actions Configuration Tool,\n" \
-				"- drag-n-drop into the Nautilus Actions Configuration Tool,\n" \
+				"- Import assistant of the Nautilus-Actions Configuration Tool,\n" \
+				"- drag-n-drop into the Nautilus-Actions Configuration Tool,\n" \
 				"- or by copying it into a XDG_DATA_DIRS/file-manager/actions directory." ) },
 
 	{ NULL }
diff --git a/src/io-desktop/nadp-formats.h b/src/io-desktop/nadp-formats.h
index e47be80..a1458ba 100644
--- a/src/io-desktop/nadp-formats.h
+++ b/src/io-desktop/nadp-formats.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-desktop/nadp-keys.c b/src/io-desktop/nadp-keys.c
index e866c69..8a37776 100644
--- a/src/io-desktop/nadp-keys.c
+++ b/src/io-desktop/nadp-keys.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-desktop/nadp-keys.h b/src/io-desktop/nadp-keys.h
index 2ac5535..c060713 100644
--- a/src/io-desktop/nadp-keys.h
+++ b/src/io-desktop/nadp-keys.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-desktop/nadp-module.c b/src/io-desktop/nadp-module.c
index 53b6134..49036a0 100644
--- a/src/io-desktop/nadp-module.c
+++ b/src/io-desktop/nadp-module.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-desktop/nadp-monitor.c b/src/io-desktop/nadp-monitor.c
index ce081b9..bc28f8d 100644
--- a/src/io-desktop/nadp-monitor.c
+++ b/src/io-desktop/nadp-monitor.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-desktop/nadp-monitor.h b/src/io-desktop/nadp-monitor.h
index 2108dcf..3aca044 100644
--- a/src/io-desktop/nadp-monitor.h
+++ b/src/io-desktop/nadp-monitor.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-desktop/nadp-reader.c b/src/io-desktop/nadp-reader.c
index 77313c4..e8c50e5 100644
--- a/src/io-desktop/nadp-reader.c
+++ b/src/io-desktop/nadp-reader.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-desktop/nadp-reader.h b/src/io-desktop/nadp-reader.h
index b6bf7d6..f2ce071 100644
--- a/src/io-desktop/nadp-reader.h
+++ b/src/io-desktop/nadp-reader.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-desktop/nadp-utils.c b/src/io-desktop/nadp-utils.c
index 3d22e03..68465b6 100644
--- a/src/io-desktop/nadp-utils.c
+++ b/src/io-desktop/nadp-utils.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-desktop/nadp-utils.h b/src/io-desktop/nadp-utils.h
index e1232c8..17fe794 100644
--- a/src/io-desktop/nadp-utils.h
+++ b/src/io-desktop/nadp-utils.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-desktop/nadp-writer.c b/src/io-desktop/nadp-writer.c
index 6f3e83f..e21ce51 100644
--- a/src/io-desktop/nadp-writer.c
+++ b/src/io-desktop/nadp-writer.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-desktop/nadp-writer.h b/src/io-desktop/nadp-writer.h
index 1bbd751..6f677f0 100644
--- a/src/io-desktop/nadp-writer.h
+++ b/src/io-desktop/nadp-writer.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-desktop/nadp-xdg-dirs.c b/src/io-desktop/nadp-xdg-dirs.c
index 53f0913..d44130d 100644
--- a/src/io-desktop/nadp-xdg-dirs.c
+++ b/src/io-desktop/nadp-xdg-dirs.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-desktop/nadp-xdg-dirs.h b/src/io-desktop/nadp-xdg-dirs.h
index c002dc6..33e2a99 100644
--- a/src/io-desktop/nadp-xdg-dirs.h
+++ b/src/io-desktop/nadp-xdg-dirs.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-gconf/Makefile.am b/src/io-gconf/Makefile.am
index e547d92..5c9caf5 100644
--- a/src/io-gconf/Makefile.am
+++ b/src/io-gconf/Makefile.am
@@ -1,4 +1,4 @@
-# Nautilus Actions
+# Nautilus-Actions
 # A Nautilus extension which offers configurable context menu actions.
 #
 # Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-gconf/nagp-gconf-provider.c b/src/io-gconf/nagp-gconf-provider.c
index 84a2bdb..8cb80a7 100644
--- a/src/io-gconf/nagp-gconf-provider.c
+++ b/src/io-gconf/nagp-gconf-provider.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-gconf/nagp-gconf-provider.h b/src/io-gconf/nagp-gconf-provider.h
index 8514e12..be37b2d 100644
--- a/src/io-gconf/nagp-gconf-provider.h
+++ b/src/io-gconf/nagp-gconf-provider.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-gconf/nagp-keys.c b/src/io-gconf/nagp-keys.c
index 086b2a4..93c63b5 100644
--- a/src/io-gconf/nagp-keys.c
+++ b/src/io-gconf/nagp-keys.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-gconf/nagp-keys.h b/src/io-gconf/nagp-keys.h
index 921181b..53308a8 100644
--- a/src/io-gconf/nagp-keys.h
+++ b/src/io-gconf/nagp-keys.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-gconf/nagp-module.c b/src/io-gconf/nagp-module.c
index 5c5bc58..0b4b8b1 100644
--- a/src/io-gconf/nagp-module.c
+++ b/src/io-gconf/nagp-module.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-gconf/nagp-reader.c b/src/io-gconf/nagp-reader.c
index d8c1813..c984e29 100644
--- a/src/io-gconf/nagp-reader.c
+++ b/src/io-gconf/nagp-reader.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-gconf/nagp-reader.h b/src/io-gconf/nagp-reader.h
index 7cdbba8..b18ae34 100644
--- a/src/io-gconf/nagp-reader.h
+++ b/src/io-gconf/nagp-reader.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-gconf/nagp-writer.c b/src/io-gconf/nagp-writer.c
index 3b99679..1ba07ff 100644
--- a/src/io-gconf/nagp-writer.c
+++ b/src/io-gconf/nagp-writer.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-gconf/nagp-writer.h b/src/io-gconf/nagp-writer.h
index 261bf30..e1b6872 100644
--- a/src/io-gconf/nagp-writer.h
+++ b/src/io-gconf/nagp-writer.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-xml/Makefile.am b/src/io-xml/Makefile.am
index ae74c03..e389c1d 100644
--- a/src/io-xml/Makefile.am
+++ b/src/io-xml/Makefile.am
@@ -1,4 +1,4 @@
-# Nautilus Actions
+# Nautilus-Actions
 # A Nautilus extension which offers configurable context menu actions.
 #
 # Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-xml/naxml-formats.c b/src/io-xml/naxml-formats.c
index db192f0..025be37 100644
--- a/src/io-xml/naxml-formats.c
+++ b/src/io-xml/naxml-formats.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
@@ -48,8 +48,8 @@ NAIExporterFormat naxml_formats[] = {
 			N_( "Export as a _full GConf schema file" ),
 			N_( "This used to be the historical export format.\n" \
 				"The exported schema file may later be imported via :\n" \
-				"- Import assistant of the Nautilus Actions Configuration Tool,\n" \
-				"- drag-n-drop into the Nautilus Actions Configuration Tool,\n" \
+				"- Import assistant of the Nautilus-Actions Configuration Tool,\n" \
+				"- drag-n-drop into the Nautilus-Actions Configuration Tool,\n" \
 				"- or via the gconftool-2 --import-schema-file command-line tool." ) },
 
 	/* GCONF_SCHEMA_V2: the lightest schema still compatible with gconftool-2 --install-schema-file
@@ -59,11 +59,11 @@ NAIExporterFormat naxml_formats[] = {
 			N_( "Export as a _light GConf schema (v2) file" ),
 			N_( "This format has been introduced in v 1.11 serie.\n" \
 				"This is the lightest schema still compatible with GConf command-line tools,\n" \
-				"while keeping backward compatibility with older Nautilus Actions Configuration " \
+				"while keeping backward compatibility with older Nautilus-Actions Configuration " \
 				"Tool versions.\n"
 				"The exported schema file may later be imported via :\n" \
-				"- Import assistant of the Nautilus Actions Configuration Tool,\n" \
-				"- drag-n-drop into the Nautilus Actions Configuration Tool,\n" \
+				"- Import assistant of the Nautilus-Actions Configuration Tool,\n" \
+				"- drag-n-drop into the Nautilus-Actions Configuration Tool,\n" \
 				"- or via the gconftool-2 --import-schema-file command-line tool." ) },
 
 	/* GCONF_ENTRY: not a schema, but a dump of the GConf entry
@@ -73,12 +73,12 @@ NAIExporterFormat naxml_formats[] = {
 			N_( "Export as a GConf _dump file" ),
 			N_( "This format has been introduced in v 1.11 serie, " \
 				"and should be the preferred format for newly exported items.\n" \
-				"It is not backward compatible with previous Nautilus Actions " \
+				"It is not backward compatible with previous Nautilus-Actions " \
 				"Configuration Tool versions,\n" \
 				"though it may still be imported via standard GConf command-line tools.\n" \
 				"The exported dump file may later be imported via :\n" \
-				"- Import assistant of a compatible Nautilus Actions Configuration Tool,\n" \
-				"- drag-n-drop into the Nautilus Actions Configuration Tool,\n" \
+				"- Import assistant of a compatible Nautilus-Actions Configuration Tool,\n" \
+				"- drag-n-drop into the Nautilus-Actions Configuration Tool,\n" \
 				"- or via the gconftool-2 --load command-line tool." ) },
 
 	{ NULL }
diff --git a/src/io-xml/naxml-formats.h b/src/io-xml/naxml-formats.h
index b48a914..5c4d0a1 100644
--- a/src/io-xml/naxml-formats.h
+++ b/src/io-xml/naxml-formats.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-xml/naxml-keys.c b/src/io-xml/naxml-keys.c
index 69f1ee6..c7780cc 100644
--- a/src/io-xml/naxml-keys.c
+++ b/src/io-xml/naxml-keys.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-xml/naxml-keys.h b/src/io-xml/naxml-keys.h
index 1f7266b..5d0b78d 100644
--- a/src/io-xml/naxml-keys.h
+++ b/src/io-xml/naxml-keys.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-xml/naxml-module.c b/src/io-xml/naxml-module.c
index 4de7a2c..8503f3c 100644
--- a/src/io-xml/naxml-module.c
+++ b/src/io-xml/naxml-module.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-xml/naxml-provider.c b/src/io-xml/naxml-provider.c
index 0a424dd..b85b51b 100644
--- a/src/io-xml/naxml-provider.c
+++ b/src/io-xml/naxml-provider.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-xml/naxml-provider.h b/src/io-xml/naxml-provider.h
index 65fee42..53fccc4 100644
--- a/src/io-xml/naxml-provider.h
+++ b/src/io-xml/naxml-provider.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-xml/naxml-reader.c b/src/io-xml/naxml-reader.c
index c8dba5a..8064a53 100644
--- a/src/io-xml/naxml-reader.c
+++ b/src/io-xml/naxml-reader.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-xml/naxml-reader.h b/src/io-xml/naxml-reader.h
index c8aa3eb..e537f5f 100644
--- a/src/io-xml/naxml-reader.h
+++ b/src/io-xml/naxml-reader.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-xml/naxml-writer.c b/src/io-xml/naxml-writer.c
index 98925d0..08a131d 100644
--- a/src/io-xml/naxml-writer.c
+++ b/src/io-xml/naxml-writer.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/io-xml/naxml-writer.h b/src/io-xml/naxml-writer.h
index ddd28c9..a808684 100644
--- a/src/io-xml/naxml-writer.h
+++ b/src/io-xml/naxml-writer.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/Makefile.am b/src/nact/Makefile.am
index 2ab073c..c675510 100644
--- a/src/nact/Makefile.am
+++ b/src/nact/Makefile.am
@@ -1,4 +1,4 @@
-# Nautilus Actions
+# Nautilus-Actions
 # A Nautilus extension which offers configurable context menu actions.
 #
 # Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/base-application-class.h b/src/nact/base-application-class.h
index 4948c1e..784afb0 100644
--- a/src/nact/base-application-class.h
+++ b/src/nact/base-application-class.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/base-application.c b/src/nact/base-application.c
index 78ff5c9..2e22949 100644
--- a/src/nact/base-application.c
+++ b/src/nact/base-application.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/base-application.h b/src/nact/base-application.h
index 4579784..554a839 100644
--- a/src/nact/base-application.h
+++ b/src/nact/base-application.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/base-assistant.c b/src/nact/base-assistant.c
index a4dc4a3..f9523d6 100644
--- a/src/nact/base-assistant.c
+++ b/src/nact/base-assistant.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/base-assistant.h b/src/nact/base-assistant.h
index 2beaaac..e59c2de 100644
--- a/src/nact/base-assistant.h
+++ b/src/nact/base-assistant.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
@@ -37,7 +37,7 @@
  * @include: nact/base-assistant.h
  *
  * This class is derived from BaseWindow class, and serves as a base
- * class for all Nautilus Actions assistants.
+ * class for all Nautilus-Actions assistants.
  *
  * Note: as a work-around to #589745 (Apply message in GtkAssistant),
  * we may trigger "on_assistant_apply" function from the
diff --git a/src/nact/base-builder.c b/src/nact/base-builder.c
index 6e9e9c0..3953243 100644
--- a/src/nact/base-builder.c
+++ b/src/nact/base-builder.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/base-builder.h b/src/nact/base-builder.h
index eb04e41..17b8172 100644
--- a/src/nact/base-builder.h
+++ b/src/nact/base-builder.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/base-dialog.c b/src/nact/base-dialog.c
index 85d856c..79c7844 100644
--- a/src/nact/base-dialog.c
+++ b/src/nact/base-dialog.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/base-dialog.h b/src/nact/base-dialog.h
index ea36b78..6e8578d 100644
--- a/src/nact/base-dialog.h
+++ b/src/nact/base-dialog.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
@@ -37,7 +37,7 @@
  * @include: nact/base-dialog.h
  *
  * This class is derived from BaseWindow class, and serves as a base
- * class for all Nautilus Actions dialogs.
+ * class for all Nautilus-Actions dialogs.
  */
 
 #include "base-window.h"
diff --git a/src/nact/base-iprefs.c b/src/nact/base-iprefs.c
index 1a8934b..7f7a955 100644
--- a/src/nact/base-iprefs.c
+++ b/src/nact/base-iprefs.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/base-iprefs.h b/src/nact/base-iprefs.h
index 8c6f5a6..08d5e9f 100644
--- a/src/nact/base-iprefs.h
+++ b/src/nact/base-iprefs.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/base-keysyms.h b/src/nact/base-keysyms.h
index 43c03cf..7aa52f2 100644
--- a/src/nact/base-keysyms.h
+++ b/src/nact/base-keysyms.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/base-window-class.h b/src/nact/base-window-class.h
index 2e91f69..1b8a45c 100644
--- a/src/nact/base-window-class.h
+++ b/src/nact/base-window-class.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/base-window.c b/src/nact/base-window.c
index 3fd3699..06b2e46 100644
--- a/src/nact/base-window.c
+++ b/src/nact/base-window.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/base-window.h b/src/nact/base-window.h
index cdbf9c5..e9641aa 100644
--- a/src/nact/base-window.h
+++ b/src/nact/base-window.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/egg-tree-multi-dnd.c b/src/nact/egg-tree-multi-dnd.c
index a7d8c14..3533c37 100644
--- a/src/nact/egg-tree-multi-dnd.c
+++ b/src/nact/egg-tree-multi-dnd.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/egg-tree-multi-dnd.h b/src/nact/egg-tree-multi-dnd.h
index 6f42f31..d9366b3 100644
--- a/src/nact/egg-tree-multi-dnd.h
+++ b/src/nact/egg-tree-multi-dnd.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
@@ -46,7 +46,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  *
- * Adapted by Pierre Wieser for the needs of Nautilus Actions
+ * Adapted by Pierre Wieser for the needs of Nautilus-Actions
  */
 
 #ifndef __EGG_TREE_MULTI_DND_H__
diff --git a/src/nact/nact-add-capability-dialog.c b/src/nact/nact-add-capability-dialog.c
index 75f0147..bca510d 100644
--- a/src/nact/nact-add-capability-dialog.c
+++ b/src/nact/nact-add-capability-dialog.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-add-capability-dialog.h b/src/nact/nact-add-capability-dialog.h
index 2c7309f..e38edf1 100644
--- a/src/nact/nact-add-capability-dialog.h
+++ b/src/nact/nact-add-capability-dialog.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-add-scheme-dialog.c b/src/nact/nact-add-scheme-dialog.c
index 3d12612..ca76a01 100644
--- a/src/nact/nact-add-scheme-dialog.c
+++ b/src/nact/nact-add-scheme-dialog.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-add-scheme-dialog.h b/src/nact/nact-add-scheme-dialog.h
index 0fee45a..a19d77f 100644
--- a/src/nact/nact-add-scheme-dialog.h
+++ b/src/nact/nact-add-scheme-dialog.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-application.c b/src/nact/nact-application.c
index 38152bf..9e62ac0 100644
--- a/src/nact/nact-application.c
+++ b/src/nact/nact-application.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
@@ -350,7 +350,7 @@ appli_initialize_unique_app( BaseApplication *application )
 	ok = BASE_APPLICATION_CLASS( st_parent_class )->initialize_unique_app( application );
 
 	if( !ok ){
-		msg1 = g_strdup( _( "Another instance of Nautilus Actions Configuration Tool is already running." ));
+		msg1 = g_strdup( _( "Another instance of Nautilus-Actions Configuration Tool is already running." ));
 		/* i18n: another instance is already running: second line of error message */
 		msg2 = g_strdup( _( "Please switch back to it." ));
 
@@ -410,7 +410,7 @@ appli_get_application_name( BaseApplication *application )
 	/*g_debug( "%s: application=%p", thisfn, ( void * ) application );*/
 
 	/* i18n: this is the application name, used in window title */
-	return( g_strdup( _( "Nautilus Actions Configuration Tool" )));
+	return( g_strdup( _( "Nautilus-Actions Configuration Tool" )));
 }
 
 static gchar *
diff --git a/src/nact/nact-application.h b/src/nact/nact-application.h
index 3cfc4a5..b42c43f 100644
--- a/src/nact/nact-application.h
+++ b/src/nact/nact-application.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-assistant-export.c b/src/nact/nact-assistant-export.c
index 3b7eb2d..78d3b7c 100644
--- a/src/nact/nact-assistant-export.c
+++ b/src/nact/nact-assistant-export.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-assistant-export.h b/src/nact/nact-assistant-export.h
index 9e2efda..9cd10a2 100644
--- a/src/nact/nact-assistant-export.h
+++ b/src/nact/nact-assistant-export.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-assistant-import.c b/src/nact/nact-assistant-import.c
index c63e97b..78a0ff8 100644
--- a/src/nact/nact-assistant-import.c
+++ b/src/nact/nact-assistant-import.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-assistant-import.h b/src/nact/nact-assistant-import.h
index efe291c..1ca4466 100644
--- a/src/nact/nact-assistant-import.h
+++ b/src/nact/nact-assistant-import.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-clipboard.c b/src/nact/nact-clipboard.c
index ba17997..8ac70bd 100644
--- a/src/nact/nact-clipboard.c
+++ b/src/nact/nact-clipboard.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-clipboard.h b/src/nact/nact-clipboard.h
index 2cf9867..acf7476 100644
--- a/src/nact/nact-clipboard.h
+++ b/src/nact/nact-clipboard.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-confirm-logout.c b/src/nact/nact-confirm-logout.c
index aa8fef7..c3453ec 100644
--- a/src/nact/nact-confirm-logout.c
+++ b/src/nact/nact-confirm-logout.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-confirm-logout.h b/src/nact/nact-confirm-logout.h
index 4d55510..df9d1d0 100644
--- a/src/nact/nact-confirm-logout.h
+++ b/src/nact/nact-confirm-logout.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-export-ask.c b/src/nact/nact-export-ask.c
index b89fb3f..71b4bb6 100644
--- a/src/nact/nact-export-ask.c
+++ b/src/nact/nact-export-ask.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-export-ask.h b/src/nact/nact-export-ask.h
index 51e468d..5e6f80d 100644
--- a/src/nact/nact-export-ask.h
+++ b/src/nact/nact-export-ask.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-export-format.c b/src/nact/nact-export-format.c
index 97116c7..5b0cbc6 100644
--- a/src/nact/nact-export-format.c
+++ b/src/nact/nact-export-format.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-export-format.h b/src/nact/nact-export-format.h
index 210253c..521360a 100644
--- a/src/nact/nact-export-format.h
+++ b/src/nact/nact-export-format.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-gtk-utils.c b/src/nact/nact-gtk-utils.c
index 91a1049..7990f87 100644
--- a/src/nact/nact-gtk-utils.c
+++ b/src/nact/nact-gtk-utils.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-gtk-utils.h b/src/nact/nact-gtk-utils.h
index 5693e36..614886e 100644
--- a/src/nact/nact-gtk-utils.h
+++ b/src/nact/nact-gtk-utils.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-iaction-tab.c b/src/nact/nact-iaction-tab.c
index 92af4a0..3bce923 100644
--- a/src/nact/nact-iaction-tab.c
+++ b/src/nact/nact-iaction-tab.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-iaction-tab.h b/src/nact/nact-iaction-tab.h
index 4a6f845..ebeca88 100644
--- a/src/nact/nact-iaction-tab.h
+++ b/src/nact/nact-iaction-tab.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-iactions-list-bis.c b/src/nact/nact-iactions-list-bis.c
index 8d0b0ec..3dcc90e 100644
--- a/src/nact/nact-iactions-list-bis.c
+++ b/src/nact/nact-iactions-list-bis.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-iactions-list-priv.c b/src/nact/nact-iactions-list-priv.c
index d1bad93..eaadabf 100644
--- a/src/nact/nact-iactions-list-priv.c
+++ b/src/nact/nact-iactions-list-priv.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-iactions-list-priv.h b/src/nact/nact-iactions-list-priv.h
index 894b5b0..dc2228f 100644
--- a/src/nact/nact-iactions-list-priv.h
+++ b/src/nact/nact-iactions-list-priv.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-iactions-list.c b/src/nact/nact-iactions-list.c
index 0c2a74e..04ac116 100644
--- a/src/nact/nact-iactions-list.c
+++ b/src/nact/nact-iactions-list.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-iactions-list.h b/src/nact/nact-iactions-list.h
index 5e9bd48..40f5894 100644
--- a/src/nact/nact-iactions-list.h
+++ b/src/nact/nact-iactions-list.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-ibasenames-tab.c b/src/nact/nact-ibasenames-tab.c
index 18dd743..157de18 100644
--- a/src/nact/nact-ibasenames-tab.c
+++ b/src/nact/nact-ibasenames-tab.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-ibasenames-tab.h b/src/nact/nact-ibasenames-tab.h
index d3a98fe..7ccfea0 100644
--- a/src/nact/nact-ibasenames-tab.h
+++ b/src/nact/nact-ibasenames-tab.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-icapabilities-tab.c b/src/nact/nact-icapabilities-tab.c
index 4a798ca..c72b02e 100644
--- a/src/nact/nact-icapabilities-tab.c
+++ b/src/nact/nact-icapabilities-tab.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-icapabilities-tab.h b/src/nact/nact-icapabilities-tab.h
index 73c8567..f553893 100644
--- a/src/nact/nact-icapabilities-tab.h
+++ b/src/nact/nact-icapabilities-tab.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-icommand-tab.c b/src/nact/nact-icommand-tab.c
index 8874fd3..acf1d26 100644
--- a/src/nact/nact-icommand-tab.c
+++ b/src/nact/nact-icommand-tab.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-icommand-tab.h b/src/nact/nact-icommand-tab.h
index 41a80f2..1ae0d2e 100644
--- a/src/nact/nact-icommand-tab.h
+++ b/src/nact/nact-icommand-tab.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-ienvironment-tab.c b/src/nact/nact-ienvironment-tab.c
index a8c9a4f..8a620ac 100644
--- a/src/nact/nact-ienvironment-tab.c
+++ b/src/nact/nact-ienvironment-tab.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-ienvironment-tab.h b/src/nact/nact-ienvironment-tab.h
index 4cf1719..be5657d 100644
--- a/src/nact/nact-ienvironment-tab.h
+++ b/src/nact/nact-ienvironment-tab.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-iexecution-tab.c b/src/nact/nact-iexecution-tab.c
index 3e61b12..e282cb0 100644
--- a/src/nact/nact-iexecution-tab.c
+++ b/src/nact/nact-iexecution-tab.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-iexecution-tab.h b/src/nact/nact-iexecution-tab.h
index 4257d75..4bfe1b6 100644
--- a/src/nact/nact-iexecution-tab.h
+++ b/src/nact/nact-iexecution-tab.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-ifolders-tab.c b/src/nact/nact-ifolders-tab.c
index b9de0f7..0daa9f3 100644
--- a/src/nact/nact-ifolders-tab.c
+++ b/src/nact/nact-ifolders-tab.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-ifolders-tab.h b/src/nact/nact-ifolders-tab.h
index d7dad52..63d453d 100644
--- a/src/nact/nact-ifolders-tab.h
+++ b/src/nact/nact-ifolders-tab.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-imimetypes-tab.c b/src/nact/nact-imimetypes-tab.c
index ae919e2..cd314e9 100644
--- a/src/nact/nact-imimetypes-tab.c
+++ b/src/nact/nact-imimetypes-tab.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-imimetypes-tab.h b/src/nact/nact-imimetypes-tab.h
index 65f4914..9c5b25d 100644
--- a/src/nact/nact-imimetypes-tab.h
+++ b/src/nact/nact-imimetypes-tab.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-iprefs.c b/src/nact/nact-iprefs.c
index fc61bf3..c5f4016 100644
--- a/src/nact/nact-iprefs.c
+++ b/src/nact/nact-iprefs.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-iprefs.h b/src/nact/nact-iprefs.h
index c89da20..939e880 100644
--- a/src/nact/nact-iprefs.h
+++ b/src/nact/nact-iprefs.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-iproperties-tab.c b/src/nact/nact-iproperties-tab.c
index 0ca0e64..ac9da7d 100644
--- a/src/nact/nact-iproperties-tab.c
+++ b/src/nact/nact-iproperties-tab.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-iproperties-tab.h b/src/nact/nact-iproperties-tab.h
index 6f7751c..ca4932d 100644
--- a/src/nact/nact-iproperties-tab.h
+++ b/src/nact/nact-iproperties-tab.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-ischemes-tab.c b/src/nact/nact-ischemes-tab.c
index ecafa35..fbac6c1 100644
--- a/src/nact/nact-ischemes-tab.c
+++ b/src/nact/nact-ischemes-tab.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-ischemes-tab.h b/src/nact/nact-ischemes-tab.h
index 8a8fac3..b3a59c5 100644
--- a/src/nact/nact-ischemes-tab.h
+++ b/src/nact/nact-ischemes-tab.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-main-menubar-edit.c b/src/nact/nact-main-menubar-edit.c
index b85c4e2..e3497a3 100644
--- a/src/nact/nact-main-menubar-edit.c
+++ b/src/nact/nact-main-menubar-edit.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-main-menubar-edit.h b/src/nact/nact-main-menubar-edit.h
index 8c40b32..3e84440 100644
--- a/src/nact/nact-main-menubar-edit.h
+++ b/src/nact/nact-main-menubar-edit.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-main-menubar-file.c b/src/nact/nact-main-menubar-file.c
index 808e69e..4dea860 100644
--- a/src/nact/nact-main-menubar-file.c
+++ b/src/nact/nact-main-menubar-file.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-main-menubar-file.h b/src/nact/nact-main-menubar-file.h
index b759143..610bc2c 100644
--- a/src/nact/nact-main-menubar-file.h
+++ b/src/nact/nact-main-menubar-file.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-main-menubar-help.c b/src/nact/nact-main-menubar-help.c
index 38a9c72..13f7357 100644
--- a/src/nact/nact-main-menubar-help.c
+++ b/src/nact/nact-main-menubar-help.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-main-menubar-help.h b/src/nact/nact-main-menubar-help.h
index 4dcf110..4d5dbba 100644
--- a/src/nact/nact-main-menubar-help.h
+++ b/src/nact/nact-main-menubar-help.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-main-menubar-maintainer.c b/src/nact/nact-main-menubar-maintainer.c
index 180f102..bfa8909 100644
--- a/src/nact/nact-main-menubar-maintainer.c
+++ b/src/nact/nact-main-menubar-maintainer.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-main-menubar-maintainer.h b/src/nact/nact-main-menubar-maintainer.h
index 2ffd9f7..b4abac2 100644
--- a/src/nact/nact-main-menubar-maintainer.h
+++ b/src/nact/nact-main-menubar-maintainer.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-main-menubar-tools.c b/src/nact/nact-main-menubar-tools.c
index c6f803c..a951c08 100644
--- a/src/nact/nact-main-menubar-tools.c
+++ b/src/nact/nact-main-menubar-tools.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-main-menubar-tools.h b/src/nact/nact-main-menubar-tools.h
index 9e4425f..2e32248 100644
--- a/src/nact/nact-main-menubar-tools.h
+++ b/src/nact/nact-main-menubar-tools.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-main-menubar-view.c b/src/nact/nact-main-menubar-view.c
index 15a443d..1dd3cbd 100644
--- a/src/nact/nact-main-menubar-view.c
+++ b/src/nact/nact-main-menubar-view.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-main-menubar-view.h b/src/nact/nact-main-menubar-view.h
index 5811438..ef0d1eb 100644
--- a/src/nact/nact-main-menubar-view.h
+++ b/src/nact/nact-main-menubar-view.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-main-menubar.c b/src/nact/nact-main-menubar.c
index 3e3d25e..26541cf 100644
--- a/src/nact/nact-main-menubar.c
+++ b/src/nact/nact-main-menubar.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-main-menubar.h b/src/nact/nact-main-menubar.h
index 86b3c07..cfbc87e 100644
--- a/src/nact/nact-main-menubar.h
+++ b/src/nact/nact-main-menubar.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-main-statusbar.c b/src/nact/nact-main-statusbar.c
index bc63f15..0b39068 100644
--- a/src/nact/nact-main-statusbar.c
+++ b/src/nact/nact-main-statusbar.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-main-statusbar.h b/src/nact/nact-main-statusbar.h
index 6257573..56b20df 100644
--- a/src/nact/nact-main-statusbar.h
+++ b/src/nact/nact-main-statusbar.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-main-tab.c b/src/nact/nact-main-tab.c
index 3958b4a..acd3d85 100644
--- a/src/nact/nact-main-tab.c
+++ b/src/nact/nact-main-tab.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-main-tab.h b/src/nact/nact-main-tab.h
index e047f76..1713a3d 100644
--- a/src/nact/nact-main-tab.h
+++ b/src/nact/nact-main-tab.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-main-toolbar.c b/src/nact/nact-main-toolbar.c
index cf22145..48bd5af 100644
--- a/src/nact/nact-main-toolbar.c
+++ b/src/nact/nact-main-toolbar.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-main-toolbar.h b/src/nact/nact-main-toolbar.h
index 18142bb..ebafaf9 100644
--- a/src/nact/nact-main-toolbar.h
+++ b/src/nact/nact-main-toolbar.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-main-window.c b/src/nact/nact-main-window.c
index 62b26cf..259c75d 100644
--- a/src/nact/nact-main-window.c
+++ b/src/nact/nact-main-window.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-main-window.h b/src/nact/nact-main-window.h
index f68a0d9..9b1c124 100644
--- a/src/nact/nact-main-window.h
+++ b/src/nact/nact-main-window.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-main.c b/src/nact/nact-main.c
index 0ad8c48..1c4cc64 100644
--- a/src/nact/nact-main.c
+++ b/src/nact/nact-main.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-match-list.c b/src/nact/nact-match-list.c
index c9bf1b8..36ee5bb 100644
--- a/src/nact/nact-match-list.c
+++ b/src/nact/nact-match-list.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-match-list.h b/src/nact/nact-match-list.h
index 74cf9d9..1aee25e 100644
--- a/src/nact/nact-match-list.h
+++ b/src/nact/nact-match-list.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-preferences-editor.c b/src/nact/nact-preferences-editor.c
index d1753b1..c6c2159 100644
--- a/src/nact/nact-preferences-editor.c
+++ b/src/nact/nact-preferences-editor.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-preferences-editor.h b/src/nact/nact-preferences-editor.h
index 771bf16..73b31b5 100644
--- a/src/nact/nact-preferences-editor.h
+++ b/src/nact/nact-preferences-editor.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-preferences.ui b/src/nact/nact-preferences.ui
index c9c1072..9f72552 100644
--- a/src/nact/nact-preferences.ui
+++ b/src/nact/nact-preferences.ui
@@ -17,7 +17,7 @@
   </object>
   <object class="GtkDialog" id="PreferencesDialog">
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">Nautilus Actions Preferences</property>
+    <property name="title" translatable="yes">Nautilus-Actions Preferences</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -126,11 +126,11 @@
                             <property name="homogeneous">True</property>
                             <child>
                               <object class="GtkCheckButton" id="CreateRootMenuButton">
-                                <property name="label" translatable="yes">_Create a root 'Nautilus Actions' menu</property>
+                                <property name="label" translatable="yes">_Create a root 'Nautilus-Actions' menu</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
-                                <property name="tooltip_text" translatable="yes">When this option is checked, menus and actions will actually be displayed as sub-items of a root 'Nautilus Actions' menu in the Nautilus context menu.</property>
+                                <property name="tooltip_text" translatable="yes">When this option is checked, menus and actions will actually be displayed as sub-items of a root 'Nautilus-Actions' menu in the Nautilus context menu.</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
                               </object>
@@ -140,12 +140,12 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="AddAboutButton">
-                                <property name="label" translatable="yes">Add an 'A_bout Nautilus Actions' item in the Nautilus context menus</property>
+                                <property name="label" translatable="yes">Add an 'A_bout Nautilus-Actions' item in the Nautilus context menus</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
-                                <property name="tooltip_text" translatable="yes">When this option is checked, an 'About Nautilus Actions' item will be added to the root Nautilus Actions menu in the Nautilus context menu.
-Note that this item will be displayed only if a unique menu is defined in the Nautilus context menu (e.g. when having checked the root 'Nautilus Actions' menu option above).</property>
+                                <property name="tooltip_text" translatable="yes">When this option is checked, an 'About Nautilus-Actions' item will be added to the root Nautilus-Actions menu in the Nautilus context menu.
+Note that this item will be displayed only if a unique menu is defined in the Nautilus context menu (e.g. when having checked the root 'Nautilus-Actions' menu option above).</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
                               </object>
diff --git a/src/nact/nact-providers-list.c b/src/nact/nact-providers-list.c
index ae347ce..e384918 100644
--- a/src/nact/nact-providers-list.c
+++ b/src/nact/nact-providers-list.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-providers-list.h b/src/nact/nact-providers-list.h
index f4fd397..b2d0615 100644
--- a/src/nact/nact-providers-list.h
+++ b/src/nact/nact-providers-list.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-schemes-list.c b/src/nact/nact-schemes-list.c
index 2fa830c..07b12f5 100644
--- a/src/nact/nact-schemes-list.c
+++ b/src/nact/nact-schemes-list.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-schemes-list.h b/src/nact/nact-schemes-list.h
index 36d8182..e58428f 100644
--- a/src/nact/nact-schemes-list.h
+++ b/src/nact/nact-schemes-list.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-sort-buttons.c b/src/nact/nact-sort-buttons.c
index c4ced1e..fe3f266 100644
--- a/src/nact/nact-sort-buttons.c
+++ b/src/nact/nact-sort-buttons.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-sort-buttons.h b/src/nact/nact-sort-buttons.h
index 05db4e0..b7145c2 100644
--- a/src/nact/nact-sort-buttons.h
+++ b/src/nact/nact-sort-buttons.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-tree-model-dnd.c b/src/nact/nact-tree-model-dnd.c
index 358f2ca..f2337f8 100644
--- a/src/nact/nact-tree-model-dnd.c
+++ b/src/nact/nact-tree-model-dnd.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
@@ -73,7 +73,7 @@
  *   call once nact_tree_model_idrag_dest_drag_data_received
  *   call once nact_clipboard_on_drag_end( treeview, context, main_window )
  *
- * when we drop in Nautilus Actions
+ * when we drop in Nautilus-Actions
  *   call once egg_tree_multi_dnd_on_drag_data_get( treeview, context, selection_data, info=0, time )
  *   call once nact_tree_model_imulti_drag_source_drag_data_get( drag_source, context, selection_data, path_list, atom=XdndNautilusActions )
  *   call once nact_clipboard_get_data_for_intern_use
diff --git a/src/nact/nact-tree-model-dnd.h b/src/nact/nact-tree-model-dnd.h
index bd5b05a..5e1d852 100644
--- a/src/nact/nact-tree-model-dnd.h
+++ b/src/nact/nact-tree-model-dnd.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-tree-model-priv.h b/src/nact/nact-tree-model-priv.h
index 49e8e76..1960b49 100644
--- a/src/nact/nact-tree-model-priv.h
+++ b/src/nact/nact-tree-model-priv.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-tree-model.c b/src/nact/nact-tree-model.c
index 3df8e31..dfde87e 100644
--- a/src/nact/nact-tree-model.c
+++ b/src/nact/nact-tree-model.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-tree-model.h b/src/nact/nact-tree-model.h
index d6e8022..4ab35b4 100644
--- a/src/nact/nact-tree-model.h
+++ b/src/nact/nact-tree-model.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-window.c b/src/nact/nact-window.c
index 3e4cf10..3795c9e 100644
--- a/src/nact/nact-window.c
+++ b/src/nact/nact-window.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/nact/nact-window.h b/src/nact/nact-window.h
index 96c49d2..b09cdd4 100644
--- a/src/nact/nact-window.h
+++ b/src/nact/nact-window.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
@@ -37,7 +37,7 @@
  * @include: nact/nact-window.h
  *
  * This class is derived from BaseWindow class.
- * It is a common base class for all Nautilus Actions window documents.
+ * It is a common base class for all Nautilus-Actions window documents.
  */
 
 #include <api/na-object-item.h>
diff --git a/src/nact/nact.desktop.in b/src/nact/nact.desktop.in
index 1330bcf..d6080f8 100644
--- a/src/nact/nact.desktop.in
+++ b/src/nact/nact.desktop.in
@@ -2,8 +2,8 @@
 Version=1.0
 Type=Application
 Encoding=UTF-8
-_Name=Nautilus Actions Configuration
-_Comment=Add items to the Nautilus popup menu
+_Name=Nautilus-Actions Configuration
+_Comment=Configure items to be added to the Nautilus context menus
 Exec=nautilus-actions-config-tool
 Icon=nautilus-actions
 Categories=Application;FileManager;DesktopSettings;Settings;AdvancedSettings;
diff --git a/src/plugin-menu/Makefile.am b/src/plugin-menu/Makefile.am
index 83246f1..c3b1d64 100644
--- a/src/plugin-menu/Makefile.am
+++ b/src/plugin-menu/Makefile.am
@@ -1,4 +1,4 @@
-# Nautilus Actions
+# Nautilus-Actions
 # A Nautilus extension which offers configurable context menu actions.
 #
 # Copyright (C) 2005 The GNOME Foundation
diff --git a/src/plugin-menu/README b/src/plugin-menu/README
index 5fa9732..0b12d7c 100644
--- a/src/plugin-menu/README
+++ b/src/plugin-menu/README
@@ -1,4 +1,4 @@
-This is the Nautilus Actions plugin.
+This is the Nautilus-Actions plugin.
 
 The plugin is dynamically loaded by the Nautilus file manager.
 
diff --git a/src/plugin-menu/nautilus-actions.c b/src/plugin-menu/nautilus-actions.c
index a9524d6..1029394 100644
--- a/src/plugin-menu/nautilus-actions.c
+++ b/src/plugin-menu/nautilus-actions.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
@@ -297,7 +297,7 @@ static gchar *
 iabout_get_application_name( NAIAbout *instance )
 {
 	/* i18n: title of the About dialog box, when seen from Nautilus file manager */
-	return( g_strdup( _( "Nautilus Actions" )));
+	return( g_strdup( _( "Nautilus-Actions" )));
 }
 
 static void
@@ -972,9 +972,9 @@ create_root_menu( NautilusActions *plugin, GList *menu )
 	icon = na_iabout_get_icon_name();
 	root_item = nautilus_menu_item_new( "NautilusActionsExtensions",
 				/* i18n: label of an automagic root submenu */
-				_( "Nautilus Actions" ),
+				_( "Nautilus-Actions" ),
 				/* i18n: tooltip of an automagic root submenu */
-				_( "A submenu which embeds the currently available Nautilus Actions extensions" ),
+				_( "A submenu which embeds the currently available Nautilus-Actions extensions" ),
 				icon );
 	attach_submenu_to_item( root_item, menu );
 	nautilus_menu = g_list_append( NULL, root_item );
@@ -1021,8 +1021,8 @@ add_about_item( NautilusActions *plugin, GList *menu )
 		icon = na_iabout_get_icon_name();
 
 		about_item = nautilus_menu_item_new( "AboutNautilusActions",
-					_( "About Nautilus Actions" ),
-					_( "Display information about Nautilus Actions" ),
+					_( "About Nautilus-Actions" ),
+					_( "Display information about Nautilus-Actions" ),
 					icon );
 
 		g_signal_connect_data( about_item,
diff --git a/src/plugin-menu/nautilus-actions.h b/src/plugin-menu/nautilus-actions.h
index 9f65489..f93ca65 100644
--- a/src/plugin-menu/nautilus-actions.h
+++ b/src/plugin-menu/nautilus-actions.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/plugin-menu/nautilus-module.c b/src/plugin-menu/nautilus-module.c
index d98aa70..db0461a 100644
--- a/src/plugin-menu/nautilus-module.c
+++ b/src/plugin-menu/nautilus-module.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/plugin-tracker/Makefile.am b/src/plugin-tracker/Makefile.am
index bf2b2d3..c0cbe34 100644
--- a/src/plugin-tracker/Makefile.am
+++ b/src/plugin-tracker/Makefile.am
@@ -1,4 +1,4 @@
-# Nautilus Actions
+# Nautilus-Actions
 # A Nautilus extension which offers configurable context menu actions.
 #
 # Copyright (C) 2005 The GNOME Foundation
diff --git a/src/plugin-tracker/na-tracker-dbus.c b/src/plugin-tracker/na-tracker-dbus.c
index ee4ba6e..0661ec0 100644
--- a/src/plugin-tracker/na-tracker-dbus.c
+++ b/src/plugin-tracker/na-tracker-dbus.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/plugin-tracker/na-tracker-dbus.h b/src/plugin-tracker/na-tracker-dbus.h
index 83d2e9f..96d57ea 100644
--- a/src/plugin-tracker/na-tracker-dbus.h
+++ b/src/plugin-tracker/na-tracker-dbus.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/plugin-tracker/na-tracker-plugin.c b/src/plugin-tracker/na-tracker-plugin.c
index a5962fb..fdfc1b7 100644
--- a/src/plugin-tracker/na-tracker-plugin.c
+++ b/src/plugin-tracker/na-tracker-plugin.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/plugin-tracker/na-tracker.c b/src/plugin-tracker/na-tracker.c
index 5a89045..2a0efe4 100644
--- a/src/plugin-tracker/na-tracker.c
+++ b/src/plugin-tracker/na-tracker.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/plugin-tracker/na-tracker.h b/src/plugin-tracker/na-tracker.h
index c699e01..5cade57 100644
--- a/src/plugin-tracker/na-tracker.h
+++ b/src/plugin-tracker/na-tracker.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index c1bba4b..8766762 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -1,4 +1,4 @@
-# Nautilus Actions
+# Nautilus-Actions
 # A Nautilus extension which offers configurable context menu actions.
 #
 # Copyright (C) 2005 The GNOME Foundation
diff --git a/src/test/test-iface-base.c b/src/test/test-iface-base.c
index 8e048fc..8c7041c 100644
--- a/src/test/test-iface-base.c
+++ b/src/test/test-iface-base.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/test/test-iface-base.h b/src/test/test-iface-base.h
index 2f4045c..dd3b1ab 100644
--- a/src/test/test-iface-base.h
+++ b/src/test/test-iface-base.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/test/test-iface-derived.c b/src/test/test-iface-derived.c
index ad56f66..6ca5a59 100644
--- a/src/test/test-iface-derived.c
+++ b/src/test/test-iface-derived.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/test/test-iface-derived.h b/src/test/test-iface-derived.h
index 6f948ba..a845575 100644
--- a/src/test/test-iface-derived.h
+++ b/src/test/test-iface-derived.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/test/test-iface-iface.c b/src/test/test-iface-iface.c
index bcb5f46..4dd5707 100644
--- a/src/test/test-iface-iface.c
+++ b/src/test/test-iface-iface.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/test/test-iface-iface.h b/src/test/test-iface-iface.h
index 27b15df..3c6c420 100644
--- a/src/test/test-iface-iface.h
+++ b/src/test/test-iface-iface.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/test/test-iface.c b/src/test/test-iface.c
index 7f60b1e..353d38f 100755
--- a/src/test/test-iface.c
+++ b/src/test/test-iface.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/test/test-parse-uris.c b/src/test/test-parse-uris.c
index 6e24b35..d3643fa 100644
--- a/src/test/test-parse-uris.c
+++ b/src/test/test-parse-uris.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/test/test-reader.c b/src/test/test-reader.c
index a84f83b..7f3d7ec 100755
--- a/src/test/test-reader.c
+++ b/src/test/test-reader.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/test/test-virtuals-without-test.c b/src/test/test-virtuals-without-test.c
index 751751f..de2861d 100755
--- a/src/test/test-virtuals-without-test.c
+++ b/src/test/test-virtuals-without-test.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/test/test-virtuals.c b/src/test/test-virtuals.c
index c0c1722..b271f7b 100755
--- a/src/test/test-virtuals.c
+++ b/src/test/test-virtuals.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index 2f81aff..b10a3d0 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -1,4 +1,4 @@
-# Nautilus Actions
+# Nautilus-Actions
 # A Nautilus extension which offers configurable context menu actions.
 #
 # Copyright (C) 2005 The GNOME Foundation
diff --git a/src/utils/console-utils.c b/src/utils/console-utils.c
index 6fb13ea..f5ac964 100644
--- a/src/utils/console-utils.c
+++ b/src/utils/console-utils.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/utils/console-utils.h b/src/utils/console-utils.h
index cf1da03..cc36190 100644
--- a/src/utils/console-utils.h
+++ b/src/utils/console-utils.h
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/utils/nautilus-actions-new.c b/src/utils/nautilus-actions-new.c
index 9f72415..0f78043 100644
--- a/src/utils/nautilus-actions-new.c
+++ b/src/utils/nautilus-actions-new.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/utils/nautilus-actions-run.c b/src/utils/nautilus-actions-run.c
index d540506..14d6ed1 100644
--- a/src/utils/nautilus-actions-run.c
+++ b/src/utils/nautilus-actions-run.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
diff --git a/src/utils/nautilus-actions-schemas.c b/src/utils/nautilus-actions-schemas.c
index 9154874..389cd2e 100644
--- a/src/utils/nautilus-actions-schemas.c
+++ b/src/utils/nautilus-actions-schemas.c
@@ -1,5 +1,5 @@
 /*
- * Nautilus Actions
+ * Nautilus-Actions
  * A Nautilus extension which offers configurable context menu actions.
  *
  * Copyright (C) 2005 The GNOME Foundation
@@ -159,7 +159,7 @@ init_options( void )
 	gchar *description;
 	GOptionGroup *misc_group;
 
-	context = g_option_context_new( _( "Output the Nautilus Actions GConf schema on stdout." ));
+	context = g_option_context_new( _( "Output the Nautilus-Actions GConf schema on stdout." ));
 
 #ifdef ENABLE_NLS
 	bindtextdomain( GETTEXT_PACKAGE, GNOMELOCALEDIR );



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