[nautilus-actions/file-manager-actions] Replace Nautilus by file-manager in the comments

[Pierre Wieser <pwieser src gnome org>]

commit 8f922ebdc3644745e2f521c0c330f5fb15505bed
Author: Pierre Wieser <pwieser trychlos org>
Date:   Wed Sep 9 18:38:01 2015 +0200

    Replace Nautilus by file-manager in the comments

 src/api/fma-icontext.h        |   11 ++++++-----
 src/api/fma-object-item.h     |    4 ++--
 src/core/fma-about.c          |    2 +-
 src/core/fma-icontext.c       |    8 ++++----
 src/core/fma-module.c         |    4 ++--
 src/core/fma-object-action.c  |    6 +++---
 src/core/fma-object-menu.c    |    4 ++--
 src/core/fma-object-profile.c |    4 ++--
 src/core/fma-selected-info.h  |    8 ++++----
 src/core/fma-tokens.h         |    4 ++--
 10 files changed, 28 insertions(+), 27 deletions(-)
---
diff --git a/src/api/fma-icontext.h b/src/api/fma-icontext.h
index 6f9c81f..579d082 100644
--- a/src/api/fma-icontext.h
+++ b/src/api/fma-icontext.h
@@ -37,8 +37,8 @@
  * @include: filemanager-actions/fma-icontext.h
  *
  * This interface is implemented by all #FMAObject -derived objects
- * whose the display in the Nautilus context menu is subject to some
- * conditions.
+ * whose the display in the file manager context menu is subject to
+ * some conditions.
  *
  * Implementors, typically #FMAObjectAction, #FMAObjectProfile and
  * #FMAObjectMenu, host the required data as #FMADataBoxed in a dedicated
@@ -60,10 +60,10 @@ typedef struct _FMAIContextInterfacePrivate    FMAIContextInterfacePrivate;
 /**
  * FMAIContextInterface:
  * @is_candidate: determines if the given FMAObject-derived object is
- *                candidate to display in Nautilus.
+ *                candidate to display in the file manager.
  *
  * This interface manages all conditions relevant to a displayable status
- * in Nautilus.
+ * in the file manager.
  */
 typedef struct {
        /*< private >*/
@@ -76,7 +76,8 @@ typedef struct {
         * @object: this FMAIContext object.
         * @target: the initial target which triggered this function's stack.
         *  This target is defined in fma-object-item.h.
-        * @selection: the current selection as a GList of NautilusFileInfo.
+        * @selection: the current selection as a GList of FileManagerFileInfo
+        *  (see fma-fm-defines.h for these definitions).
         *
         * The FMAIContext implementor may take advantage of this
         * virtual function to check for its own specific data. Only if the
diff --git a/src/api/fma-object-item.h b/src/api/fma-object-item.h
index 627851a..77a933c 100644
--- a/src/api/fma-object-item.h
+++ b/src/api/fma-object-item.h
@@ -78,8 +78,8 @@ typedef struct {
  *                         to activate an action from a keyboard shortcut,
  *                         while keeping this same action hidden from the UI.
  *
- * The #FMAItemTarget mode is Nautilus-driven. It determines in which part
- * of the Nautilus UI our actions will be displayed.
+ * The #FMAItemTarget mode is driven by the file manager. It determines
+ * in which part of the file manager UI our actions will be displayed.
  */
 typedef enum {
        ITEM_TARGET_SELECTION = 1,
diff --git a/src/core/fma-about.c b/src/core/fma-about.c
index feaba94..a1c0269 100644
--- a/src/core/fma-about.c
+++ b/src/core/fma-about.c
@@ -127,7 +127,7 @@ fma_about_display( GtkWindow *toplevel )
 gchar *
 fma_about_get_application_name( void )
 {
-       /* i18n: title of the About dialog box, when seen from Nautilus file manager */
+       /* i18n: title of the About dialog box, when seen from the file manager */
        return( g_strdup( _( "FileManager-Actions" )));
 }
 
diff --git a/src/core/fma-icontext.c b/src/core/fma-icontext.c
index 3779585..91f4940 100644
--- a/src/core/fma-icontext.c
+++ b/src/core/fma-icontext.c
@@ -204,16 +204,16 @@ fma_icontext_are_equal( const FMAIContext *a, const FMAIContext *b )
  * @selection: the currently selected items, as a #GList of FMASelectedInfo items.
  *
  * Determines if the given object may be candidate to be displayed in
- * the Nautilus context menu, depending of the list of currently selected
- * items.
+ * the file manager context menu, depending of the list of currently
+ * selected items.
  *
  * This function is called by <methodname>build_nautilus_menus</methodname>
  * plugin function for each item found in FMAPivot items list, and, when this
  * an action, for each profile of this action.
  *
  * Returns: %TRUE if this @context succeeds to all tests and is so a
- * valid candidate to be displayed in Nautilus context menu, %FALSE
- * else.
+ * valid candidate to be displayed in the file manager context menu,
+ * %FALSE else.
  *
  * Since: 2.30
  */
diff --git a/src/core/fma-module.c b/src/core/fma-module.c
index fd14e3d..a0c468f 100644
--- a/src/core/fma-module.c
+++ b/src/core/fma-module.c
@@ -329,11 +329,11 @@ on_module_load( GTypeModule *gmodule )
 
 /*
  * the module has been successfully loaded
- * is it a Nautilus-Action plugin ?
+ * is it a FileManager-Actions plugin ?
  * if ok, we ask the plugin to initialize itself
  *
  * As of API v 1:
- * - fma_extension_startup, na_extension_list_types and na_extension_shutdown
+ * - fma_extension_startup, fma_extension_list_types and fma_extension_shutdown
  *   are mandatory, and MUST be implemented by the plugin
  * - fma_extension_get_version is optional, and defaults to 1.
  */
diff --git a/src/core/fma-object-action.c b/src/core/fma-object-action.c
index fc84639..07d1f00 100644
--- a/src/core/fma-object-action.c
+++ b/src/core/fma-object-action.c
@@ -56,7 +56,7 @@ struct _FMAObjectActionPrivate {
 };
 
 /* i18n: default label for a new action */
-#define NEW_NAUTILUS_ACTION                            N_( "New Nautilus action" )
+#define NEW_FILEMANAGER_ACTION                         N_( "New file-manager action" )
 
 extern FMADataGroup action_data_groups [];             /* defined in fma-object-action-factory.c */
 extern FMADataDef   data_def_action_v1 [];             /* defined in fma-object-action-factory.c */
@@ -651,8 +651,8 @@ fma_object_action_new_with_defaults( void )
 
        action = fma_object_action_new();
        fma_object_set_new_id( action, NULL );
-       fma_object_set_label( action, gettext( NEW_NAUTILUS_ACTION ));
-       fma_object_set_toolbar_label( action, gettext( NEW_NAUTILUS_ACTION ));
+       fma_object_set_label( action, gettext( NEW_FILEMANAGER_ACTION ));
+       fma_object_set_toolbar_label( action, gettext( NEW_FILEMANAGER_ACTION ));
        fma_factory_object_set_defaults( FMA_IFACTORY_OBJECT( action ));
 
        profile = fma_object_profile_new_with_defaults();
diff --git a/src/core/fma-object-menu.c b/src/core/fma-object-menu.c
index 19fbf7b..be2e061 100644
--- a/src/core/fma-object-menu.c
+++ b/src/core/fma-object-menu.c
@@ -54,7 +54,7 @@ struct _FMAObjectMenuPrivate {
 };
 
 /* i18n: default label for a new menu */
-#define NEW_NAUTILUS_MENU                              N_( "New Nautilus menu" )
+#define NEW_FILEMANAGER_MENU                           N_( "New file-manager menu" )
 
 extern FMADataGroup menu_data_groups [];       /* defined in fma-object-menu-factory.c */
 
@@ -370,7 +370,7 @@ fma_object_menu_new_with_defaults( void )
 {
        FMAObjectMenu *menu = fma_object_menu_new();
        fma_object_set_new_id( menu, NULL );
-       fma_object_set_label( menu, gettext( NEW_NAUTILUS_MENU ));
+       fma_object_set_label( menu, gettext( NEW_FILEMANAGER_MENU ));
        fma_factory_object_set_defaults( FMA_IFACTORY_OBJECT( menu ));
 
        return( menu );
diff --git a/src/core/fma-object-profile.c b/src/core/fma-object-profile.c
index 4f23cbe..5f450cc 100644
--- a/src/core/fma-object-profile.c
+++ b/src/core/fma-object-profile.c
@@ -558,8 +558,8 @@ convert_pre_v3_multiple( FMAObjectProfile *profile )
  * we try to replace this with the corresponding mimetype, but only if
  * current mimetype is '*' (or * / * or all/all).
  *
- * note that inode/directory is actually the mimetype provided by Nautilus;
- * contrarily all/allfiles mimetype has to be checked separately.
+ * note that 'inode/directory' is actually the mimetype provided by the
+ * file manager; 'all/allfiles' mimetype has to be checked separately.
  */
 static gboolean
 convert_pre_v3_isfiledir( FMAObjectProfile *profile )
diff --git a/src/core/fma-selected-info.h b/src/core/fma-selected-info.h
index a3f7ba8..4ccbe50 100644
--- a/src/core/fma-selected-info.h
+++ b/src/core/fma-selected-info.h
@@ -34,13 +34,13 @@
  * @short_description: The #FMASelectedInfo Class Definition
  * @include: core/fma-selected-info.h
  *
- * An object is instantiated for each Nautilus/Nemo selected item, in
+ * An object is instantiated for each file manager selected item, in
  * order to gather some common properties for the selected item, mainly
  * its mime type for example.
  *
- * This class should be replaced by Nautilus/NemoFileInfo class, as soon
- * as the required Nautilus/Nemo version will have the
- * nautilus/nemo_file_info_create_for_uri() API (2.28 for Nautilus)
+ * This class should be replaced by FileManagerFileInfo class, as soon
+ * as the required file manager version will have the
+ * file_manager_file_info_create_for_uri() API (2.28 for Nautilus)
  */
 
 #include <glib-object.h>
diff --git a/src/core/fma-tokens.h b/src/core/fma-tokens.h
index 8169990..71a5110 100644
--- a/src/core/fma-tokens.h
+++ b/src/core/fma-tokens.h
@@ -38,11 +38,11 @@
  * elements of the current selection at runtime.
  *
  * Note that until v2.30, tokens were parsed against selection list only
- * when an item was selected in the Nautilus context menu (i.e. at
+ * when an item was selected in the file manager context menu (i.e. at
  * execution time).
  * Starting with unstable v2.99 (stable v3.0), this same parsing may occur
  * for each displayed label (as new specs accept tokens in labels) - we so
- * factorize this parsing one time for each new selection in the Nautilus
+ * factorize this parsing one time for each new selection in the menu
  * plugin, attaching the result to each item in the context menu.
  *
  * Adding a parameter requires updating of: