Commit c042ecc4 authored by Christian Kirbach's avatar Christian Kirbach Committed by Pierre Wieser

Fix string errors reported by Christian Kirbach

Apply patch provided by Christian himself.
Fix #640216.
parent 696adf5a
2011-01-24 Pierre Wieser <pwieser@trychlos.org>
* data/gconf-schemas/nautilus-actions-prefs.schemas.in:
* docs/des-ema/des-ema-0.15:
* docs/nact/C/nact-conditions.xml:
* docs/nact/C/nact-menus.xml:
* src/api/na-extension.h:
* src/api/na-ifactory-provider.h:
* src/api/na-iio-provider.h:
* src/api/na-object.h:
* src/core/na-core-utils.c:
* src/core/na-factory-object.c:
* src/core/na-gconf-utils.c:
* src/core/na-icontext-factory.c:
* src/core/na-icontext.c:
* src/core/na-ifactory-provider.c:
* src/core/na-io-provider.c:
* src/core/na-io-provider.h:
* src/core/na-iprefs.c:
* src/core/na-object-action.c:
* src/core/na-object-id-factory.c:
* src/core/na-object-id.c:
* src/core/na-object-item-factory.c:
* src/core/na-object-item.c:
* src/core/na-pivot.h:
* src/core/na-settings.c:
* src/core/na-settings.h:
* src/core/na-tokens.h:
* src/io-desktop/nadp-desktop-file.c:
* src/io-desktop/nadp-reader.c:
* src/io-desktop/nadp-utils.c:
* src/io-gconf/nagp-reader.c:
* src/io-xml/naxml-reader.c:
* src/nact/nact-gtk-utils.c:
* src/nact/nautilus-actions-config-tool.ui:
* src/plugin-menu/nautilus-actions.c:
* src/utils/nautilus-actions-new.c:
* src/utils/nautilus-actions-run.c:
* tools/check-headers.sh:
* tools/init-finalize-diff.sh:
Apply patch provided by Christian Kirbach. Fix #640216.
* src/nact/nautilus-actions-config-tool.ui:
* src/utils/na-delete-xmltree.c:
* src/utils/nautilus-actions-print.c:
......
......@@ -428,7 +428,7 @@ As the order of items is also locked, the level zero itself cannot be modified,
<type>bool</type>
<locale name="C">
<short>Whether the GConf I/O provider is locked</short>
<long>When set to true (most probably as a mandatory key), this prevents all items, menus and actions, readen from GConf to being modified in NACT.</long>
<long>When set to true (most probably as a mandatory key), this prevents all items, menus and actions, read from GConf to being modified in NACT.</long>
</locale>
<default>false</default>
</schema>
......@@ -439,7 +439,7 @@ As the order of items is also locked, the level zero itself cannot be modified,
<type>bool</type>
<locale name="C">
<short>Whether the Desktop I/O provider is locked</short>
<long>When set to true (most probably as a mandatory key), this prevents all items, menus and actions, readen from .desktop files to being modified in NACT.</long>
<long>When set to true (most probably as a mandatory key), this prevents all items, menus and actions, read from .desktop files to being modified in NACT.</long>
</locale>
<default>false</default>
</schema>
......
......@@ -541,9 +541,9 @@ When an element of the string list is negated, it must be considered as an AND c
<p>Example:</p>
<blockquote>
<p>
The line &laquo;&nbsp;<?php code( "MimeTypes = image/*; video/*;" ); ?>&nbsp;&raquo; must be readen as &laquo;&nbsp;condition is met if each file in the current selection has a mimetype of "<?php code( "image/*" ); ?>" or of "<?php code( "video/*" ); ?>"&nbsp;&raquo;
The line &laquo;&nbsp;<?php code( "MimeTypes = image/*; video/*;" ); ?>&nbsp;&raquo; must be read as &laquo;&nbsp;condition is met if each file in the current selection has a mimetype of "<?php code( "image/*" ); ?>" or of "<?php code( "video/*" ); ?>"&nbsp;&raquo;
</p>
<p>And the line &laquo;&nbsp;<?php code( "MimeTypes = image/*; video/*; !image/bmp" ); ?>&nbsp;&raquo; must be readen as &laquo;&nbsp;condition is met if each file in the current selection has a mimetype of "<?php code( "image/*" ); ?>" or of "<?php code( "video/*" ); ?>", but must not have the "<?php code( "image/bmp" ); ?>" mimetype&nbsp;&raquo;.
<p>And the line &laquo;&nbsp;<?php code( "MimeTypes = image/*; video/*; !image/bmp" ); ?>&nbsp;&raquo; must be read as &laquo;&nbsp;condition is met if each file in the current selection has a mimetype of "<?php code( "image/*" ); ?>" or of "<?php code( "video/*" ); ?>", but must not have the "<?php code( "image/bmp" ); ?>" mimetype&nbsp;&raquo;.
</p>
</blockquote>
......@@ -729,7 +729,7 @@ Capabilities may be negated.<br />
Please note that each element of the specified list must be considered as ANDed, i.e. if we have "<?php code( "Capabilities=Readable;Writable;!Local" ); ?>", then each element of the selection must be both readable AND writable AND not local.<br />
Capabilities have to be choosen between following predefined ones:
<ul>
<li>"<?php code( "Owner" ); ?>": current user is the owner of selected items</li>
<li>"<?php code( "Owner" ); ?>": current user is the owner of the selected items</li>
<li>"<?php code( "Readable" ); ?>": selected items are readable by user (probably more usefull when negated)</li>
<li>"<?php code( "Writable" ); ?>": selected items are writable by user</li>
<li>"<?php code( "Executable" ); ?>": selected items are executable by user</li>
......@@ -827,10 +827,10 @@ Example:
<p>
If the <?php code( "Exec" ); ?> key is "<?php code( "echo %B %b" ); ?>", then the following commands will be run:<br />
"<?php code( "echo pierre paul jacques pierre" ); ?>"<br />
The basename used is those of the first item of the selected items list as provided by the file manager. There is only a small chance that it would be those of the first visually selected item, and there is contrarily great chances that it would not be predictable at all.
The basename used is the one of the first item of the selected items list as provided by the file manager. There is only a small chance that it would be those of the first visually selected item, and there is contrarily great chances that it would not be predictable at all.
</p>
<p>
Even if the choosen parameter is the same for all selected items, the behavior is the identical.<br />
Even if the chosen parameter is the same for all selected items, the behavior is identical.<br />
If the <?php code( "Exec" ); ?> key is "<?php code( "echo %d %B" ); ?>", then the following commands will be run:<br />
"<?php code( "echo /data pierre paul jacques" ); ?>"<br />
"<?php code( "echo /data pierre paul jacques" ); ?>"<br />
......@@ -1128,7 +1128,7 @@ The <?php code( "[Desktop Entry]" ); ?> section of this <?php code( "level-zero.
The <?php code( "level-zero.directory" ); ?> file may be searched for in <?php code( "XDG_DATA_DIRS/file-manager/actions" ); ?>. The first one found would be used.
</p>
<p>
Not finding a <?php code( "level-zero.directory" ); ?> file should not prevent actions or menus to be displayed. Instead, they just would be displayed in an unspecified, implementation-dependant, order.
Not finding a <?php code( "level-zero.directory" ); ?> file should not prevent actions or menus to be displayed. Instead, they just would be displayed in an unspecified, implementation-dependent, order.
</p>
<p>
The name "<?php code( "level-zero.directory" ); ?>" is choosen to not risk any collision with regular <?php desktop(); ?> files.
......
......@@ -2,7 +2,7 @@
<title>Defining the conditions</title>
<para>
Whether your action will eventually be displayed in &nautilus; file manager
context menus or in its toolbar depends of the conditions you will have
context menus or in its toolbar depends on the conditions you will have
defined for it.
</para>
<para>
......@@ -121,7 +121,7 @@
</listitem>
<listitem>
<para>
When disactivated, filters are considered as case insensitive,
When deactivated, filters are considered as case insensitive,
which means that <filename>/my/file</filename> and
<filename>/My/File</filename> filenames are considered the same
name.
......@@ -384,7 +384,7 @@
<listitem>
<para>
Or click on
<guibutton>Browse</guibutton> to select a folder on the filesystem.
<guibutton>Browse</guibutton> to select a folder on the file system.
</para>
</listitem>
</itemizedlist>
......@@ -404,7 +404,7 @@
<para>
By default, the folder-based condition is just one
&laquosp;<literal>must match one of /</literal>&spraquo; condition.
As <literal>/</literal> is always the top of an Unix-like filesystem,
As <literal>/</literal> is always the top of an Unix-like file system,
then all selected items always match this condition.
</para>
<note>
......@@ -508,7 +508,7 @@
<imagedata fileref="figures/nact-new-scheme.png" format="PNG"/>
</imageobject>
<textobject>
<phrase>Show the list of predefined schemess.</phrase>
<phrase>Show the list of predefined schemes.</phrase>
</textobject>
<caption>
<para>Selecting a scheme among predefined defaults</para>
......@@ -551,7 +551,7 @@
Capabilities are some properties that a file may exhibit to the user.
</para>
<para>
But the <literal>Local</literal> capability, all others are dependant
But the <literal>Local</literal> capability, all others are dependent
of the user who executes the command.
</para>
<para>
......
......@@ -17,7 +17,7 @@
</para>
<para>
As an action, the exact place where a new menu will be inserted
depends of the current sort order:
depends on the current sort order:
</para>
<variablelist>
<varlistentry>
......
......@@ -198,7 +198,7 @@ G_BEGIN_DECLS
* </programlisting>
* </example>
*
* Returns: %TRUE if the initialization is successfull, %FALSE else.
* Returns: %TRUE if the initialization is successful, %FALSE else.
* In this later case, the library is unloaded and no more considered.
*
* Since: 2.30
......@@ -279,7 +279,7 @@ guint na_extension_list_types ( const GType **types );
* This function is called by Nautilus-Actions when it is about to
* shutdown itself.
*
* The dynamicaly loaded library may take advantage of this call to
* The dynamically loaded library may take advantage of this call to
* release any resource, handle, and so on, it may have previously
* allocated.
*
......
......@@ -89,7 +89,7 @@
*
* Without this interface, each and every I/O provider must,
* for example when reading an item, have the list of data to be
* readen for each item, then read each individual data, then
* read for each item, then read each individual data, then
* organize them in a I/O structure..
* Each time a new data is added to an object, as e.g. a new condition,
* then all available I/O providers must be updated: read the data,
......@@ -183,7 +183,7 @@ typedef struct {
* @reader: this #NAIFactoryProvider instance.
* @reader_data: the data associated to this instance, as provided
* when na_ifactory_provider_read_item() was called.
* @object: the #NAIFactoryObject object which comes to be readen.
* @object: the #NAIFactoryObject object which comes to be read.
* @messages: a pointer to a #GSList list of strings; the provider
* may append messages to this list, but shouldn't reinitialize it.
*
......@@ -205,7 +205,7 @@ typedef struct {
*
* This method must be implemented in order any data be read.
*
* Returns: a newly allocated NADataBoxed which contains the readen value.
* Returns: a newly allocated NADataBoxed which contains the read value.
* Should return %NULL if data is not found.
*
* Since: 2.30
......@@ -217,11 +217,11 @@ typedef struct {
* @reader: this #NAIFactoryProvider instance.
* @reader_data: the data associated to this instance, as provided
* when na_ifactory_provider_read_item() was called.
* @object: the #NAIFactoryObject object which comes to be readen.
* @object: the #NAIFactoryObject object which comes to be read.
* @messages: a pointer to a #GSList list of strings; the provider
* may append messages to this list, but shouldn't reinitialize it.
*
* API called by #NAIFactoryObject when all data have been readen.
* API called by #NAIFactoryObject when all data have been read.
* Implementor may take advantage of this to do some cleanup.
*
* Since: 2.30
......
......@@ -229,18 +229,18 @@ typedef struct {
*
* The 'able_to_write' property is a runtime one.
* When returning %TRUE, the I/O provider insures that it has
* sucessfully checked that it was able to write some things
* successfully checked that it was able to write some things
* down to its storage subsystems.
*
* The 'able_to_write' property is independant of the
* The 'able_to_write' property is independent of the
* 'willing_to_write' above, though it is only checked if the
* I/O provider is actually willing to write.
*
* This condition is only relevant when trying to define new items,
* to see if a willing_to provider is actually able to do write
* operations. It it not relevant for updating/deleting already
* existings items as they have already checked their own runtime
* writability status when readen from the storage subsystems.
* existing items as they have already checked their own runtime
* writability status when read from the storage subsystems.
*
* Note that even if this property is %TRUE, there is yet many
* reasons for not being able to update/delete existing items or
......@@ -264,7 +264,7 @@ typedef struct {
*
* Writes a new @item.
*
* There is no update_item function ; it is the responsability
* There is no update_item function ; it is the responsibility
* of the provider to delete the previous version of an item before
* actually writing the new one.
*
......@@ -272,7 +272,7 @@ typedef struct {
* %FALSE in is_willing_to_write() method above.
*
* Returns: %NA_IIO_PROVIDER_CODE_OK if the write operation
* was successfull, or another code depending of the detected error.
* was successful, or another code depending of the detected error.
*
* Since: 2.30
*/
......@@ -291,7 +291,7 @@ typedef struct {
* %FALSE in is_willing_to_write() method above.
*
* Returns: %NA_IIO_PROVIDER_CODE_OK if the delete operation was
* successfull, or another code depending of the detected error.
* successful, or another code depending of the detected error.
*
* Since: 2.30
*/
......@@ -312,7 +312,7 @@ typedef struct {
* data which may have been attached to a #NAObjectItem -derived object.
*
* Returns: %NA_IIO_PROVIDER_CODE_OK if the duplicate operation was
* successfull, or another code depending of the detected error.
* successful, or another code depending of the detected error.
*
* Since: 2.30
*/
......@@ -334,7 +334,7 @@ void na_iio_provider_item_changed ( const NAIIOProvider *instance );
*/
/**
* NAIIOProviderWritabilityStatus:
* @NA_IIO_PROVIDER_STATUS_UNDETERMINED: undertermined.
* @NA_IIO_PROVIDER_STATUS_UNDETERMINED: undetermined.
* @NA_IIO_PROVIDER_STATUS_WRITABLE: the item is writable.
* @NA_IIO_PROVIDER_STATUS_ITEM_READONLY: the item is read-only.
* @NA_IIO_PROVIDER_STATUS_PROVIDER_NOT_WILLING_TO: the provider is not willing to write this item,
......
......@@ -139,7 +139,7 @@ typedef struct {
*
* Checks @object for validity.
*
* A NAObject is valid if its internal identifiant is set.
* A NAObject is valid if its internal identifier is set.
*
* Each derived class should take care of implementing this function
* when relevant. NAObject class will take care of calling this
......
......@@ -970,10 +970,10 @@ na_core_utils_file_exists( const gchar *uri )
/**
* na_core_utils_file_load_from_uri:
* @uri: the URI the file must be loaded from.
* @length: a pointer to the length of the readen content.
* @length: a pointer to the length of the read content.
*
* Loads the file into a newly allocated buffer, and set up the length of the
* readen content if not %NULL.
* read content if not %NULL.
*
* Returns: the newly allocated buffer which contains the file content, or %NULL.
* This buffer should be g_free() by the caller.
......
......@@ -740,7 +740,7 @@ write_data_iter( const NAIFactoryObject *object, NADataBoxed *boxed, NafoWriteIt
* Set the @value with the current content of the #NADataBoxed attached
* to @name.
*
* This is to be readen as "set value from data element".
* This is to be read as "set value from data element".
*/
void
na_factory_object_get_as_value( const NAIFactoryObject *object, const gchar *name, GValue *value )
......
......@@ -44,7 +44,7 @@ static gboolean sync_gconf( GConfClient *gconf, gchar **message );
/**
* na_gconf_utils_get_subdirs:
* @gconf: a GConfClient instance.
* @path: a full path to be readen.
* @path: a full path to be read.
*
* Returns: a list of full path subdirectories.
*
......@@ -120,7 +120,7 @@ na_gconf_utils_has_entry( GSList *entries, const gchar *entry )
/**
* na_gconf_utils_get_entries:
* @gconf: a GConfClient instance.
* @path: a full path to be readen.
* @path: a full path to be read.
*
* Loads all the key=value pairs of the specified key.
*
......@@ -533,7 +533,7 @@ na_gconf_utils_read_string_list( GConfClient *gconf, const gchar *path )
*
* Writes a boolean at the given @path.
*
* Returns: %TRUE if the writing has been successfull, %FALSE else.
* Returns: %TRUE if the writing has been successful, %FALSE else.
*
* If returned not NULL, the @message contains an error message.
* It should be g_free() by the caller.
......@@ -572,7 +572,7 @@ na_gconf_utils_write_bool( GConfClient *gconf, const gchar *path, gboolean value
*
* Writes an integer at the given @path.
*
* Returns: %TRUE if the writing has been successfull, %FALSE else.
* Returns: %TRUE if the writing has been successful, %FALSE else.
*
* If returned not NULL, the @message contains an error message.
* It should be g_free() by the caller.
......@@ -611,7 +611,7 @@ na_gconf_utils_write_int( GConfClient *gconf, const gchar *path, gint value, gch
*
* Writes a string at the given @path.
*
* Returns: %TRUE if the writing has been successfull, %FALSE else.
* Returns: %TRUE if the writing has been successful, %FALSE else.
*
* If returned not NULL, the @message contains an error message.
* It should be g_free() by the caller.
......@@ -650,7 +650,7 @@ na_gconf_utils_write_string( GConfClient *gconf, const gchar *path, const gchar
*
* Writes a list of strings at the given @path.
*
* Returns: %TRUE if the writing has been successfull, %FALSE else.
* Returns: %TRUE if the writing has been successful, %FALSE else.
*
* If returned not NULL, the @message contains an error message.
* It should be g_free() by the caller.
......@@ -693,7 +693,7 @@ na_gconf_utils_write_string_list( GConfClient *gconf, const gchar *path, GSList
*
* Removes an entry from user preferences.
*
* Returns: %TRUE if the operation was successfull, %FALSE else.
* Returns: %TRUE if the operation was successful, %FALSE else.
*
* Since: 2.30
*
......
......@@ -48,7 +48,7 @@ NADataDef data_def_conditions [] = {
/* i18n: wildcard characters '*' and '?' should be considered as literalls,
* and not be translated */
N_( "A list of strings with joker '*' or '?' to be matched against the name(s) " \
"of the selected file(s)/folder(s). Each selected items must match at least " \
"of the selected file(s)/folder(s). Each selected item must match at least " \
"one of the filename patterns for the action or the menu be candidate to " \
"display.\n" \
"This obviously only applies when there is a selection.\n" \
......@@ -110,7 +110,7 @@ NADataDef data_def_conditions [] = {
N_( "List of patterns to be matched against the mimetypes of the selected file(s)/folder(s)" ),
/* i18n: wildcard character '*' is taken literally, and should not be translated */
N_( "A list of strings with joker '*' to be matched against the mimetypes of the " \
"selected file(s)/folder(s). Each selected items must match at least one of " \
"selected file(s)/folder(s). Each selected item must match at least one of " \
"the mimetype patterns for the action to appear.\n" \
"This obviously only applies when there is a selection.\n" \
"Defaults to '*/*'." ),
......@@ -502,7 +502,7 @@ NADataDef data_def_conditions [] = {
N_( "Capabilities" ),
/* i18n: 'Owner', 'Readable', 'Writable', 'Executable' and 'Local' are all keywords
* of the specification, they are not translatable */
N_( "A list of capabilities each item of the selection must satisfy in order the item be candidate.\n" \
N_( "A list of capabilities each item of the selection must satisfy in order for the item to be candidate.\n" \
"Capabilities may be negated.\n" \
"Capabilities have to be choosen between following predefined ones:\n" \
"- 'Owner': current user is the owner of selected items\n" \
......
......@@ -295,7 +295,7 @@ na_icontext_is_all_mimetypes( const NAIContext *context )
* na_icontext_read_done:
* @context: the #NAIContext to be prepared.
*
* Prepares the specified #NAIContext just after it has been readen.
* Prepares the specified #NAIContext just after it has been read.
*
* <itemizedlist>
* <listitem>
......
......@@ -166,7 +166,7 @@ ifactory_provider_get_version( const NAIFactoryProvider *instance )
* <example>
* <programlisting>
* &lcomment;
* * allocate the object to be readen
* * allocate the object to be read
* &rcomment;
* NAObjectItem *item = NA_OBJECT_ITEM( na_object_action_new());
* &lcomment;
......
......@@ -1006,7 +1006,7 @@ load_items_filter_unwanted_items_rec( GList *hierarchy, guint loadable_set )
}
/*
* returns a concatened flat list of readen actions / menus
* returns a concatened flat list of read actions / menus
* we take care here of:
* - i/o providers which appear unavailable at runtime
* - i/o providers marked as unreadable
......
......@@ -45,7 +45,7 @@
* corresponding NAIOProvider class method.
*
* Two preferences are used for each i/o provider:
* 'readable': means that the i/o provider should be readen when building
* 'readable': means that the i/o provider should be read when building
* the items hierarchy
* 'writable': means that the i/o provider is candidate when writing a
* new item; this also means that existing items are deletable.
......
......@@ -82,7 +82,7 @@ static guint enum_map_id_from_string( const EnumMap *map, const gchar *st
/*
* na_iprefs_get_import_mode:
* @pivot: the #NAPivot application object.
* @pref: name of the import key to be readen.
* @pref: name of the import key to be read.
* @mandatory: if not %NULL, a pointer to a boolean which will receive the
* mandatory property.
*
......@@ -171,7 +171,7 @@ na_iprefs_set_order_mode( const NAPivot *pivot, guint mode )
/**
* na_iprefs_get_export_format:
* @pivot: the #NAPivot application object.
* @name: name of the export format key to be readen
* @name: name of the export format key to be read
* @mandatory: if not %NULL, a pointer to a boolean which will receive the
* mandatory property.
*
......@@ -224,7 +224,7 @@ na_iprefs_set_export_format( const NAPivot *pivot, const gchar *name, GQuark for
* This does not mean in any way that the i/o provider is active,
* available or so, but just that is mentioned here.
*
* I/o provider identifers returned in the list are not supposed
* I/o provider identifiers returned in the list are not supposed
* to be unique, nor sorted.
*
* Returns: a list of i/o provider identifiers found in preferences
......
......@@ -327,7 +327,7 @@ ifactory_object_is_valid( const NAIFactoryObject *object )
}
/*
* at this time, we don't yet have readen the profiles as this will be
* at this time, we don't yet have read the profiles as this will be
* done in ifactory_provider_read_done - we so just be able to deal with
* action-specific properties (not check for profiles consistency)
*/
......@@ -406,7 +406,7 @@ icontext_is_candidate( NAIContext *object, guint target, GList *selection )
* any data found in data_def_action_v1 (defined in na-object-action-factory.c)
* is obsoleted and moved to a new profile
*
* actions readen from .desktop already have iversion=3 (cf. desktop_read_start)
* actions read from .desktop already have iversion=3 (cf. desktop_read_start)
* and v1 actions may only come from xml or gconf
*
* returns TRUE if this actually was a v1 action which has been converted to v2
......
......@@ -38,15 +38,15 @@
NADataDef data_def_id [] = {
/* this data is marked non readable / non writable as it has to be readen
* written specifically when serializing / unserializing items
/* this data is marked non readable / non writable as it has to be read
* written specifically when serializing / deserializing items
*/
{ NAFO_DATA_ID,
FALSE,
FALSE,
TRUE,
"NAObjectId identifiant",
"Internal identifiant of the NAObjectId object. " \
"NAObjectId identifier",
"Internal identifier of the NAObjectId object. " \
"Historically a UUID used as a GConf directory (thus ASCII, case insensitive), " \
"it is also the basename of the .desktop file (thus UTF-8, case sensitive).",
NAFD_TYPE_STRING,
......
......@@ -371,7 +371,7 @@ na_object_id_set_copy_of_label( NAObjectId *object )
/**
* na_object_id_set_new_id:
* @object: the #NAObjectId object whose internal identifiant is to be
* @object: the #NAObjectId object whose internal identifier is to be
* set.
* @new_parent: if @object is a #NAObjectProfile, then @new_parent
* should be set to the #NAObjectAction new parent. Else, it would not
......
......@@ -40,7 +40,7 @@
NADataDef data_def_item [] = {
/* this data is marked as non readable as it has to be readen specifically
/* this data is marked as non readable as it has to be read specifically
* in order to be able to create the corresponding NAObjectItem-derived
* object
* it is not writable as different I/O providers may have different values
......
......@@ -716,12 +716,12 @@ na_object_item_unref_items_rec( GList *items )
* na_object_item_deals_with_version:
* @item: this #NAObjectItem -derived object.
*
* Just after the @item has been readen from NAIFactoryProvider, setup
* Just after the @item has been read from NAIFactoryProvider, setup
* the version. This is needed because some conversions may occur in
* this object.
*
* Note that there is only some 2.x versions where the version string
* was not systematically written. If @item has been readen from a
* was not systematically written. If @item has been read from a
* .desktop file, then iversion is already set to (at least) 3.
*
* Since: 2.30
......
......@@ -48,7 +48,7 @@
*
* Each I/O storage provider should monitor modifications/deletions of
* actions, and advertize this #NAPivot, which itself will then
* advertize any registered consumers.
* advertise any registered consumers.
*
* This notification system is so a double-stage one :
*
......@@ -71,7 +71,7 @@
* updates.
*
* 2. When #NAPivot has successfully updated its list of actions, it
* notifies its consumers in order they update themselves.
* notifies its consumers so they update themselves.
*
* Note that #NAPivot tries to factorize notification messages, and
* to notify its consumers only once even if it has itself received
......@@ -120,7 +120,7 @@ GType na_pivot_get_type( void );
/* signals
*
* NAPivot acts as a 'sumarrizing' proxy for signals emitted by the NAIIOProvider
* NAPivot acts as a 'summarizing' proxy for signals emitted by the NAIIOProvider
* providers when they detect a modification of their underlying items storage
* subsystems.
* As several to many signals may be emitted when such a modification occurs,
......
......@@ -423,7 +423,7 @@ na_settings_register_global_callback( NASettings *settings, GCallback callback,
* whether the searched @key has been found (%TRUE), or if the returned
* value comes from default (%FALSE).
* @mandatory: if not %NULL, a pointer to a gboolean in which we will store
* whether the returned value has been readen from mandatory preferences
* whether the returned value has been read from mandatory preferences
* (%TRUE), or from the user preferences (%FALSE). When the @key has not
* been found, @mandatory is set to %FALSE.
*
......@@ -449,7 +449,7 @@ na_settings_get_boolean( NASettings *settings, const gchar *key, gboolean *found
* whether the searched @key has been found (%TRUE), or if the returned
* value comes from default (%FALSE).
* @mandatory: if not %NULL, a pointer to a gboolean in which we will store
* whether the returned value has been readen from mandatory preferences
* whether the returned value has been read from mandatory preferences
* (%TRUE), or from the user preferences (%FALSE). When the @key has not
* been found, @mandatory is set to %FALSE.
*
......@@ -489,7 +489,7 @@ na_settings_get_boolean_ex( NASettings *settings, const gchar *group, const gcha
* whether the searched @key has been found (%TRUE), or if the returned
* value comes from default (%FALSE).
* @mandatory: if not %NULL, a pointer to a gboolean in which we will store
* whether the returned value has been readen from mandatory preferences
* whether the returned value has been read from mandatory preferences
* (%TRUE), or from the user preferences (%FALSE). When the @key has not
* been found, @mandatory is set to %FALSE.
*
......@@ -533,7 +533,7 @@ na_settings_get_string( NASettings *settings, const gchar *key, gboolean *found,
* whether the searched @key has been found (%TRUE), or if the returned
* value comes from default (%FALSE).
* @mandatory: if not %NULL, a pointer to a gboolean in which we will store
* whether the returned value has been readen from mandatory preferences
* whether the returned value has been read from mandatory preferences
* (%TRUE), or from the user preferences (%FALSE). When the @key has not
* been found, @mandatory is set to %FALSE.
*
......@@ -577,7 +577,7 @@ na_settings_get_string_list( NASettings *settings, const gchar *key, gboolean *f
* whether the searched @key has been found (%TRUE), or if the returned
* value comes from default (%FALSE).
* @mandatory: if not %NULL, a pointer to a gboolean in which we will store
* whether the returned value has been readen from mandatory preferences
* whether the returned value has been read from mandatory preferences
* (%TRUE), or from the user preferences (%FALSE). When the @key has not
* been found, @mandatory is set to %FALSE.
*
......@@ -620,7 +620,7 @@ na_settings_get_uint( NASettings *settings, const gchar *key, gboolean *found, g
* whether the searched @key has been found (%TRUE), or if the returned
* value comes from default (%FALSE).
* @mandatory: if not %NULL, a pointer to a gboolean in which we will store
* whether the returned value has been readen from mandatory preferences
* whether the returned value has been read from mandatory preferences
* (%TRUE), or from the user preferences (%FALSE). When the @key has not
* been found, @mandatory is set to %FALSE.
*
......
......@@ -47,7 +47,7 @@
* - per-user configuration is HOME/.config/nautilus-actions.conf
*
* Each setting has so its own read-only attribute, whether it
* has been readen from the global configuration or from the
* has been read from the global configuration or from the
* per-user one.
*/
......
......@@ -60,7 +60,7 @@
* %B: space-separated list of basenames
* %c: count of selected items
* %d: (first) base directory
* %D: space-separated list of base directory of each selected items
* %D: space-separated list of base directory of each selected item
* %f: (first) file name
* %F: space-separated list of selected file names
* %h: hostname of the (first) URI
......
......@@ -662,7 +662,7 @@ nadp_desktop_file_remove_profile( const NadpDesktopFile *ndf, const gchar *profi
* @key_found: set to %TRUE if the key has been found, to %FALSE else.
* @default_value: value to be set if key has not been found.
*
* Returns: the readen value, or the default value if the entry has not
* Returns: the read value, or the default value if the entry has not
* been found in the given group.
*/
gboolean
......@@ -711,7 +711,7 @@ nadp_desktop_file_get_boolean( const NadpDesktopFile *ndf, const gchar *group, c
* @key_found: set to %TRUE if the key has been found, to %FALSE else.
* @default_value: value to be set if key has not been found.
*
* Returns: the readen value, or the default value if the entry has not
* Returns: the read value, or the default value if the entry has not
* been found in the given group.
*/
gchar *
......@@ -757,7 +757,7 @@ nadp_desktop_file_get_locale_string( const NadpDesktopFile *ndf, const gchar *gr
* @key_found: set to %TRUE if the key has been found, to %FALSE else.
* @default_value: value to be set if key has not been found.
*
* Returns: the readen value, or the default value if the entry has not
* Returns: the read value, or the default value if the entry has not
* been found in the given group.
*/
gchar *
......@@ -808,7 +808,7 @@ nadp_desktop_file_get_string( const NadpDesktopFile *ndf, const gchar *group, co
* @key_found: set to %TRUE if the key has been found, to %FALSE else.
* @default_value: value to be set if key has not been found.
*
* Returns: the readen value, or the default value if the entry has not
* Returns: the read value, or the default value if the entry has not
* been found in the given group.
*/
GSList *
......@@ -860,7 +860,7 @@ nadp_desktop_file_get_string_list( const NadpDesktopFile *ndf, const gchar *grou
* @key_found: set to %TRUE if the key has been found, to %FALSE else.
* @default_value: value to be set if key has not been found.
*
* Returns: the readen value, or the default value if the entry has not
* Returns: the read value, or the default value if the entry has not
* been found in the given group.
*/
guint
......
......@@ -584,7 +584,7 @@ nadp_reader_ifactory_provider_read_data( const NAIFactoryProvider *reader, void
}
/*
* called when each NAIFactoryObject object has been readen
* called when each NAIFactoryObject object has been read
*/
void
nadp_reader_ifactory_provider_read_done( const NAIFactoryProvider *reader, void *reader_data, const NAIFactoryObject *serializable, GSList **messages )
......
......@@ -100,7 +100,7 @@ nadp_utils_uri_delete( const gchar *uri )
* Returns: %TRUE if the file is writable, %FALSE else.
*
* Please note that this type of test is subject to race conditions,
* as the file may become unwritable after a successfull test,
* as the file may become unwritable after a successful test,
* but before the caller has been able to actually write into it.
*
* There is no "super-test". Just try...
......
......@@ -67,7 +67,7 @@ static gboolean is_key_writable( NagpGConfProvider *gconf, const gchar *key
/*
* nagp_iio_provider_read_items:
*
* Note that whatever be the version of the readen action, it will be
* Note that whatever be the version of the read action, it will be
* stored as a #NAObjectAction and its set of #NAObjectProfile of the same,
* latest, version of these classes.
*/
......
......@@ -608,7 +608,7 @@ read_start_profile_attach_profile( NAXMLReader *reader, NAObjectProfile *profile
* this callback function is called by NAIFactoryObject once for each
* serializable data for the object
*
* Note that some nodes may be readen twice because of multiple definition
* Note that some nodes may be read twice because of multiple definition
* of the same data (e.g. icon which exists in localized and unlocalized
* versions). So do not remove dealt-with nodes here
*/
......@@ -737,7 +737,7 @@ read_data_boxed_from_node( NAXMLReader *reader, xmlChar *path, xmlNode *parent,
}
/*
* all serializable data of the object has been readen
* all serializable data of the object has been read
*/
void
naxml_reader_read_done( const NAIFactoryProvider *provider, void *reader_data, const NAIFactoryObject *object, GSList **messages )
......@@ -770,7 +770,7 @@ naxml_reader_read_done( const NAIFactoryProvider *provider, void *reader_data, c
}
/*
* just having readen this NAObjectItem
* just having read this NAObjectItem
* so deals with unlocalized/localized icon name/path
*/
static void
......@@ -890,7 +890,7 @@ read_done_action_load_profile( NAXMLReader *reader, const gchar *profile_id )
}
/*
* just having readen this NAObjectProfile
* just having read this NAObjectProfile
* so deals wit