GNOME.org
 

[nautilus-actions: 44/45] Fix erroneous tag when exporting as a schema with descriptions

commit 21616f9667a2fe71f576a1ce49d19696fb5ca93f
Author: Pierre Wieser <pwieser trychlos org>
Date:   Wed Jul 29 23:04:52 2009 +0200

    Fix erroneous tag when exporting as a schema with descriptions

 ...ig_8c4fa203-b5d0-449a-bdc8-61d398febef6.schemas |   60 ++++++++++----------
 src/common/na-xml-names.h                          |    2 +-
 src/common/na-xml-writer.c                         |    2 +-
 3 files changed, 32 insertions(+), 32 deletions(-)
---
diff --git a/exports/config_8c4fa203-b5d0-449a-bdc8-61d398febef6.schemas b/exports/config_8c4fa203-b5d0-449a-bdc8-61d398febef6.schemas
index de8d1b5..e9fad91 100644
--- a/exports/config_8c4fa203-b5d0-449a-bdc8-61d398febef6.schemas
+++ b/exports/config_8c4fa203-b5d0-449a-bdc8-61d398febef6.schemas
@@ -7,7 +7,7 @@
       <type>string</type>
       <locale name="C">
         <short>The version of the configuration format</short>
-        <short>The version of the configuration format that will be used to manage backward compatibility</short>
+        <long>The version of the configuration format that will be used to manage backward compatibility</long>
       </locale>
       <default>2.0</default>
       <owner>nautilus-actions</owner>
@@ -19,7 +19,7 @@
       <locale name="C">
         <default>Import/Export test</default>
         <short>The label of the menu item</short>
-        <short>The label of the menu item that will appear in the Nautilus popup menu when the selection matches the appearance condition settings</short>
+        <long>The label of the menu item that will appear in the Nautilus popup menu when the selection matches the appearance condition settings</long>
       </locale>
       <owner>nautilus-actions</owner>
     </schema>
@@ -30,7 +30,7 @@
       <locale name="C">
         <default>The tooltip for "import/export test" action</default>
         <short>The tooltip of the menu item</short>
-        <short>The tooltip of the menu item that will appear in the Nautilus statusbar when the user points to the Nautilus popup menu item with his/her mouse</short>
+        <long>The tooltip of the menu item that will appear in the Nautilus statusbar when the user points to the Nautilus popup menu item with his/her mouse</long>
       </locale>
       <owner>nautilus-actions</owner>
     </schema>
@@ -40,7 +40,7 @@
       <type>string</type>
       <locale name="C">
         <short>The icon of the menu item</short>
-        <short>The icon of the menu item that will appear next to the label in the Nautilus popup menu when the selection matches the appearance conditions settings</short>
+        <long>The icon of the menu item that will appear next to the label in the Nautilus popup menu when the selection matches the appearance conditions settings</long>
       </locale>
       <default>gtk-justify-center</default>
       <owner>nautilus-actions</owner>
@@ -52,7 +52,7 @@
       <locale name="C">
         <default>Default profile</default>
         <short>A description name of the profile</short>
-        <short>The field is here to give the user a human readable name for a profile in the Nact interface. If not set there will be a default auto generated string set by default</short>
+        <long>The field is here to give the user a human readable name for a profile in the Nact interface. If not set there will be a default auto generated string set by default</long>
       </locale>
       <owner>nautilus-actions</owner>
     </schema>
@@ -62,7 +62,7 @@
       <type>string</type>
       <locale name="C">
         <short>The path of the command</short>
-        <short>The path of the command to start when the user select the menu item in the Nautilus popup menu</short>
+        <long>The path of the command to start when the user select the menu item in the Nautilus popup menu</long>
       </locale>
       <default>/bin/ls</default>
       <owner>nautilus-actions</owner>
@@ -73,19 +73,19 @@
       <type>string</type>
       <locale name="C">
         <short>The parameters of the command</short>
-        <short>The parameters of the command to start when the user selects the menu item in the Nautilus popup menu.
+        <long>The parameters of the command to start when the user selects the menu item in the Nautilus popup menu.
 
 The parameters can contain some special tokens which are replaced by Nautilus information before starting the command:
 
 %d: base folder of the selected file(s)
 %f: the name of the selected file or the first one if many are selected
+%h: hostname of the URI
 %m: space-separated list of the basenames of the selected file(s)/folder(s)
 %M: space-separated list of the selected file(s)/folder(s), with their full paths
-%u: GnomeVFS URI
-%s: scheme of the GnomeVFS URI
-%h: hostname of the GnomeVFS URI
-%U: username of the GnomeVFS URI
-%%: a percent sign</short>
+%s: scheme of the URI
+%u: URI
+%U: username of the URI
+%%: a percent sign</long>
       </locale>
       <default>%h %M</default>
       <owner>nautilus-actions</owner>
@@ -97,9 +97,9 @@ The parameters can contain some special tokens which are replaced by Nautilus in
       <list_type>string</list_type>
       <locale name="C">
         <short>The list of pattern to match the selected file(s)/folder(s)</short>
-        <short>A list of strings with joker '*' or '?' to match the name of the selected file(s)/folder(s). Each selected items must match at least one of the filename patterns for the action to appear</short>
+        <long>A list of strings with joker '*' or '?' to match the name of the selected file(s)/folder(s). Each selected items must match at least one of the filename patterns for the action to appear</long>
       </locale>
-      <default>[*,*.c]</default>
+      <default>[*.c]</default>
       <owner>nautilus-actions</owner>
     </schema>
     <schema>
@@ -108,9 +108,9 @@ The parameters can contain some special tokens which are replaced by Nautilus in
       <type>bool</type>
       <locale name="C">
         <short>'true' if the filename patterns have to be case sensitive, 'false' otherwise</short>
-        <short>If you need to match a filename in a case-sensitive manner, set this key to 'true'. If you also want, for example '*.jpg' to match 'photo.JPG', set 'false'</short>
+        <long>If you need to match a filename in a case-sensitive manner, set this key to 'true'. If you also want, for example '*.jpg' to match 'photo.JPG', set 'false'</long>
       </locale>
-      <default>false</default>
+      <default>true</default>
       <owner>nautilus-actions</owner>
     </schema>
     <schema>
@@ -120,7 +120,7 @@ The parameters can contain some special tokens which are replaced by Nautilus in
       <list_type>string</list_type>
       <locale name="C">
         <short>The list of patterns to match the mimetypes of the selected file(s)</short>
-        <short>A list of strings with joker '*' or '?' to match the mimetypes of the selected file(s). Each selected items must match at least one of the mimetype patterns for the action to appear</short>
+        <long>A list of strings with joker '*' or '?' to match the mimetypes of the selected file(s). Each selected items must match at least one of the mimetype patterns for the action to appear</long>
       </locale>
       <default>[*/*]</default>
       <owner>nautilus-actions</owner>
@@ -131,12 +131,12 @@ The parameters can contain some special tokens which are replaced by Nautilus in
       <type>bool</type>
       <locale name="C">
         <short>'true' if the selection can have files, 'false' otherwise</short>
-        <short>This setting is tied in with the 'isdir' setting. The valid combinations are:
+        <long>This setting is tied in with the 'isdir' setting. The valid combinations are:
 
 isfile=TRUE and isdir=FALSE: the selection may hold only files
 isfile=FALSE and isdir=TRUE: the selection may hold only folders
 isfile=TRUE and isdir=TRUE: the selection may hold both files and folders
-isfile=FALSE and isdir=FALSE: this is an invalid combination (your configuration will never appear)</short>
+isfile=FALSE and isdir=FALSE: this is an invalid combination (your configuration will never appear)</long>
       </locale>
       <default>true</default>
       <owner>nautilus-actions</owner>
@@ -147,14 +147,14 @@ isfile=FALSE and isdir=FALSE: this is an invalid combination (your configuration
       <type>bool</type>
       <locale name="C">
         <short>'true' if the selection can have folders, 'false' otherwise</short>
-        <short>This setting is tied in with the 'isfile' setting. The valid combinations are:
+        <long>This setting is tied in with the 'isfile' setting. The valid combinations are:
 
 isfile=TRUE and isdir=FALSE: the selection may hold only files
 isfile=FALSE and isdir=TRUE: the selection may hold only folders
 isfile=TRUE and isdir=TRUE: the selection may hold both files and folders
-isfile=FALSE and isdir=FALSE: this is an invalid combination (your configuration will never appear)</short>
+isfile=FALSE and isdir=FALSE: this is an invalid combination (your configuration will never appear)</long>
       </locale>
-      <default>true</default>
+      <default>false</default>
       <owner>nautilus-actions</owner>
     </schema>
     <schema>
@@ -163,9 +163,9 @@ isfile=FALSE and isdir=FALSE: this is an invalid combination (your configuration
       <type>bool</type>
       <locale name="C">
         <short>'true' if the selection can have several items, 'false' otherwise</short>
-        <short>If you need one or more files or folders to be selected, set this key to 'true'. If you want just one file or folder, set 'false'</short>
+        <long>If you need one or more files or folders to be selected, set this key to 'true'. If you want just one file or folder, set 'false'</long>
       </locale>
-      <default>true</default>
+      <default>false</default>
       <owner>nautilus-actions</owner>
     </schema>
     <schema>
@@ -174,10 +174,10 @@ isfile=FALSE and isdir=FALSE: this is an invalid combination (your configuration
       <type>list</type>
       <list_type>string</list_type>
       <locale name="C">
-        <short>The list of GnomeVFS schemes where the selected files should be located</short>
-        <short>Defines the list of valid GnomeVFS schemes to be matched against the selected items. The GnomeVFS scheme is the protocol used to access the files. The keyword to use is the one used in the GnomeVFS URI.
+        <short>The list of schemes where the selected files should be located</short>
+        <long>Defines the list of valid schemes to be matched against the selected items. The scheme is the protocol used to access the files. The keyword to use is the one used in the URI.
 
-Examples of GnomeVFS URI include: 
+Examples of valid URI include:
 file:///tmp/foo.txt
 sftp:///root test example net/tmp/foo.txt
 
@@ -187,11 +187,11 @@ The most common schemes are:
 'sftp': files accessed via SSH
 'ftp': files accessed via FTP
 'smb': files accessed via Samba (Windows share)
-'dav': files accessed via WebDav
+'dav': files accessed via WebDAV
 
-All GnomeVFS schemes used by Nautilus can be used here.</short>
+All schemes used by Nautilus can be used here.</long>
       </locale>
-      <default>[file,dav,smb]</default>
+      <default>[smb]</default>
       <owner>nautilus-actions</owner>
     </schema>
   </schemalist>
diff --git a/src/common/na-xml-names.h b/src/common/na-xml-names.h
index 36ebe72..e1abc94 100644
--- a/src/common/na-xml-names.h
+++ b/src/common/na-xml-names.h
@@ -123,7 +123,7 @@ enum {
 #define ACTION_MULTIPLE_DESC_SHORT	_("'true' if the selection can have several items, 'false' otherwise")
 #define ACTION_MULTIPLE_DESC_LONG	_("If you need one or more files or folders to be selected, set this key to 'true'. If you want just one file or folder, set 'false'")
 #define ACTION_SCHEMES_DESC_SHORT	_("The list of schemes where the selected files should be located")
-#define ACTION_SCHEMES_DESC_LONG	_("Defines the list of valid schemes to be matched against the selected items. The scheme is the protocol used to access the files. The keyword to use is the one used in the URI.\n\nExamples of URI include: \nfile:///tmp/foo.txt\nsftp:///root test example net/tmp/foo.txt\n\nThe most common schemes are:\n\n'file': local files\n'sftp': files accessed via SSH\n'ftp': files accessed via FTP\n'smb': files accessed via Samba (Windows share)\n'dav': files accessed via WebDAV\n\nAll schemes used by Nautilus can be used here.")
+#define ACTION_SCHEMES_DESC_LONG	_("Defines the list of valid schemes to be matched against the selected items. The scheme is the protocol used to access the files. The keyword to use is the one used in the URI.\n\nExamples of valid URI include:\nfile:///tmp/foo.txt\nsftp:///root test example net/tmp/foo.txt\n\nThe most common schemes are:\n\n'file': local files\n'sftp': files accessed via SSH\n'ftp': files accessed via FTP\n'smb': files accessed via Samba (Windows share)\n'dav': files accessed via WebDAV\n\nAll schemes used by Nautilus can be used here.")
 #define ACTION_VERSION_DESC_SHORT	_("The version of the configuration format")
 #define ACTION_VERSION_DESC_LONG	_("The version of the configuration format that will be used to manage backward compatibility")
 
diff --git a/src/common/na-xml-writer.c b/src/common/na-xml-writer.c
index b04f809..6455bca 100644
--- a/src/common/na-xml-writer.c
+++ b/src/common/na-xml-writer.c
@@ -482,7 +482,7 @@ create_schema_entry( NAXMLWriter *writer,
 
 		xmlNewChild( locale_node, NULL, BAD_CAST( NACT_GCONF_SCHEMA_SHORT ), BAD_CAST( short_desc ));
 
-		xmlNewChild( locale_node, NULL, BAD_CAST( NACT_GCONF_SCHEMA_SHORT ), BAD_CAST( long_desc ));
+		xmlNewChild( locale_node, NULL, BAD_CAST( NACT_GCONF_SCHEMA_LONG ), BAD_CAST( long_desc ));
 	}
 
 	g_free( path );
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]