GNOME.org
 

[nautilus-actions: 35/45] Update the list of translatable files

commit 3db81affb2fc9b3a0c29e2c191dfa227e361c81a
Author: Pierre Wieser <pwieser trychlos org>
Date:   Wed Jul 29 22:04:24 2009 +0200

    Update the list of translatable files

 ChangeLog                                          |   11 ++++++++
 po/POTFILES.in                                     |   28 ++++++++++---------
 src/common/na-action-profile.c                     |    3 +-
 src/common/na-action.c                             |    3 +-
 src/common/na-action.h                             |    5 +++
 src/common/na-gconf.c                              |    3 +-
 src/common/na-iio-provider.c                       |    3 --
 src/common/na-xml-writer.c                         |    3 +-
 src/test/.gitignore                                |    1 +
 src/test/test-parse-uris                           |  Bin 27074 -> 27074 bytes
 src/utils/.gitignore                               |    2 +-
 src/utils/Makefile.am                              |    6 ++--
 ...actions-schema.c => nautilus-actions-schemas.c} |    2 +-
 13 files changed, 41 insertions(+), 29 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a33218a..35f933e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,17 @@
 	* src/nact/nautilus-actions-config-tool.ui:
 	Remove all mentions of GnomeVFS or GVfs.
 
+	* src/common/na-action-profile.c:
+	* src/common/na-action.c:
+	* src/common/na-action.h:
+	* src/common/na-gconf.c:
+	* src/common/na-iio-provider.c:
+	* src/common/na-xml-writer.c:
+	* src/utils/nautilus-actions-schema.c:
+	Factorize the definition of default labels.
+
+	* po/POTFILES.in: Update the list of translatable files.
+
 2009-07-28 Pierre Wieser <pwieser trychlos org>
 
 	* src/common/na-iio-provider.c:
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2dfa4c2..6a1de56 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,15 +1,17 @@
-src/common/nautilus-actions-config.c
-src/common/nautilus-actions-config-gconf-private.h
-src/common/nautilus-actions-config-schema-reader.c
+src/common/na-action.h
+src/common/na-iio-provider.c
+src/common/na-xml-names.h
+src/nact/base-application.c
 src/nact/nact-application.c
+src/nact/nact-assistant.c
+src/nact/nact-assistant-export.c
+src/nact/nact-assistant-import.c
+src/nact/nact-iaction-tab.c
+src/nact/nact-iadvanced-tab.c
+src/nact/nact-icommand-tab.c
+src/nact/nact-imenubar.c
 src/nact/nact-main-window.c
-src/nact/nact.desktop.in
-src/nact/nact-action-editor.c
-src/nact/nact-editor.c
-src/nact/nact-import-export.c
-src/nact/nact-prefs.c
-src/nact/nact-profile-editor.c
-src/nact/nact-utils.c
-src/nact/nautilus-actions-config.ui
-src/utils/nautilus-actions-new-config.c
-src/utils/nautilus-actions-tools-utils.c
+src/nact/nact-window.c
+src/nact/nact-xml-reader.c
+src/test/test-parse-uris.c
+src/utils/nautilus-actions-new.c
diff --git a/src/common/na-action-profile.c b/src/common/na-action-profile.c
index 183c062..911c682 100644
--- a/src/common/na-action-profile.c
+++ b/src/common/na-action-profile.c
@@ -33,7 +33,6 @@
 #endif
 
 #include <string.h>
-#include <glib/gi18n.h>
 
 #include <libnautilus-extension/nautilus-file-info.h>
 
@@ -476,7 +475,7 @@ na_action_profile_new( void )
 	na_action_profile_set_name( profile, ACTION_PROFILE_PREFIX "zero" );
 
 	/* i18n: default label for a new profile */
-	na_action_profile_set_label( profile, _( "Default profile" ));
+	na_action_profile_set_label( profile, NA_ACTION_PROFILE_DEFAULT_LABEL );
 
 	return( profile );
 }
diff --git a/src/common/na-action.c b/src/common/na-action.c
index 91a485b..944c566 100644
--- a/src/common/na-action.c
+++ b/src/common/na-action.c
@@ -32,7 +32,6 @@
 #include <config.h>
 #endif
 
-#include <glib/gi18n.h>
 #include <string.h>
 #include <uuid/uuid.h>
 
@@ -388,7 +387,7 @@ na_action_new( void )
 	na_action_set_new_uuid( action );
 
 	/* i18n: default label for a new action */
-	na_action_set_label( action, _( "New Nautilus action" ));
+	na_action_set_label( action, NA_ACTION_DEFAULT_LABEL );
 
 	return( action );
 }
diff --git a/src/common/na-action.h b/src/common/na-action.h
index 08c01a1..7a90c08 100644
--- a/src/common/na-action.h
+++ b/src/common/na-action.h
@@ -40,12 +40,17 @@
  * action.
  */
 
+#include <glib/gi18n.h>
+
 #include "na-action-class.h"
 #include "na-action-profile-class.h"
 #include "na-iio-provider.h"
 
 G_BEGIN_DECLS
 
+#define NA_ACTION_DEFAULT_LABEL			_( "New Nautilus action" )
+#define NA_ACTION_PROFILE_DEFAULT_LABEL	_( "Default profile" )
+
 NAAction        *na_action_new( void );
 NAAction        *na_action_new_with_profile( void );
 
diff --git a/src/common/na-gconf.c b/src/common/na-gconf.c
index 39e524d..5a1a3fc 100644
--- a/src/common/na-gconf.c
+++ b/src/common/na-gconf.c
@@ -34,7 +34,6 @@
 
 #include <gconf/gconf.h>
 #include <gconf/gconf-client.h>
-#include <glib/gi18n.h>
 #include <string.h>
 
 #include "na-action.h"
@@ -608,7 +607,7 @@ fill_profile_properties( NAGConf *gconf, NAActionProfile *profile, GSList *notif
 	gchar *label;
 	if( !search_for_str( notifies, NULL, ACTION_PROFILE_LABEL_ENTRY, &label )){
 		/* i18n: default profile label */
-		label = g_strdup( _( "Default profile" ));
+		label = g_strdup( NA_ACTION_PROFILE_DEFAULT_LABEL );
 	}
 	na_action_profile_set_label( profile, label );
 	g_free( label );
diff --git a/src/common/na-iio-provider.c b/src/common/na-iio-provider.c
index 0c15fe7..9fb4f4c 100644
--- a/src/common/na-iio-provider.c
+++ b/src/common/na-iio-provider.c
@@ -32,9 +32,6 @@
 #include <config.h>
 #endif
 
-#include <glib.h>
-#include <glib/gi18n.h>
-
 #include "na-action.h"
 #include "na-iio-provider.h"
 
diff --git a/src/common/na-xml-writer.c b/src/common/na-xml-writer.c
index 12523a6..b04f809 100644
--- a/src/common/na-xml-writer.c
+++ b/src/common/na-xml-writer.c
@@ -32,7 +32,6 @@
 #include <config.h>
 #endif
 
-#include <glib/gi18n.h>
 #include <libxml/tree.h>
 
 #include "na-action-profile.h"
@@ -644,7 +643,7 @@ create_gconf_schema( NAXMLWriter *writer )
 	create_gconf_schema_entry( writer, ACTION_LABEL_ENTRY         , doc, list_node, "string", ACTION_LABEL_DESC_SHORT       , ACTION_LABEL_DESC_LONG, "", TRUE );
 	create_gconf_schema_entry( writer, ACTION_TOOLTIP_ENTRY       , doc, list_node, "string", ACTION_TOOLTIP_DESC_SHORT     , ACTION_TOOLTIP_DESC_LONG, "", TRUE );
 	create_gconf_schema_entry( writer, ACTION_ICON_ENTRY          , doc, list_node, "string", ACTION_ICON_DESC_SHORT        , ACTION_ICON_DESC_LONG, "", FALSE );
-	create_gconf_schema_entry( writer, ACTION_PROFILE_LABEL_ENTRY , doc, list_node, "string", ACTION_PROFILE_NAME_DESC_SHORT, ACTION_PROFILE_NAME_DESC_LONG, _( "Default profile" ), TRUE );
+	create_gconf_schema_entry( writer, ACTION_PROFILE_LABEL_ENTRY , doc, list_node, "string", ACTION_PROFILE_NAME_DESC_SHORT, ACTION_PROFILE_NAME_DESC_LONG, NA_ACTION_PROFILE_DEFAULT_LABEL, TRUE );
 	create_gconf_schema_entry( writer, ACTION_PATH_ENTRY          , doc, list_node, "string", ACTION_PATH_DESC_SHORT        , ACTION_PATH_DESC_LONG, "", FALSE );
 	create_gconf_schema_entry( writer, ACTION_PARAMETERS_ENTRY    , doc, list_node, "string", ACTION_PARAMETERS_DESC_SHORT  , ACTION_PARAMETERS_DESC_LONG, "", FALSE );
 	create_gconf_schema_entry( writer, ACTION_BASENAMES_ENTRY     , doc, list_node, "list"  , ACTION_BASENAMES_DESC_SHORT   , ACTION_BASENAMES_DESC_LONG, "[*]", FALSE );
diff --git a/src/test/.gitignore b/src/test/.gitignore
new file mode 100644
index 0000000..1b89f0a
--- /dev/null
+++ b/src/test/.gitignore
@@ -0,0 +1 @@
+test-parse-uris
diff --git a/src/test/test-parse-uris b/src/test/test-parse-uris
index 87c0c22..2e439ea 100755
Binary files a/src/test/test-parse-uris and b/src/test/test-parse-uris differ
diff --git a/src/utils/.gitignore b/src/utils/.gitignore
index 02b3e53..9789155 100644
--- a/src/utils/.gitignore
+++ b/src/utils/.gitignore
@@ -1,4 +1,4 @@
 nautilus-actions-check-actions-change
 nautilus-actions-new-config
 nautilus-actions-new
-nautilus-actions-schema
+nautilus-actions-schemas
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index 2a40a07..391db84 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -28,7 +28,7 @@
 
 bin_PROGRAMS = \
 	nautilus-actions-new							\
-	nautilus-actions-schema							\
+	nautilus-actions-schemas						\
 	$(NULL)
 
 AM_CPPFLAGS += \
@@ -47,11 +47,11 @@ nautilus_actions_new_LDADD = \
 	$(NAUTILUS_ACTIONS_UTILS_LIBS)					\
 	$(NULL)
 
-nautilus_actions_schema_SOURCES = \
+nautilus_actions_schemas_SOURCES = \
 	nautilus-actions-schema.c						\
 	$(NULL)
 
-nautilus_actions_schema_LDADD = \
+nautilus_actions_schemas_LDADD = \
 	$(top_builddir)/src/common/libnact.la			\
 	$(NAUTILUS_ACTIONS_UTILS_LIBS)					\
 	$(NULL)
diff --git a/src/utils/nautilus-actions-schema.c b/src/utils/nautilus-actions-schemas.c
similarity index 99%
rename from src/utils/nautilus-actions-schema.c
rename to src/utils/nautilus-actions-schemas.c
index 0f862dd..39dce2a 100644
--- a/src/utils/nautilus-actions-schema.c
+++ b/src/utils/nautilus-actions-schemas.c
@@ -163,7 +163,7 @@ write_to_gconf( gchar **msg )
 		write_schema( gconf, prefix_config, GCONF_VALUE_STRING, ACTION_LABEL_ENTRY, ACTION_LABEL_DESC_SHORT, ACTION_LABEL_DESC_LONG, "", msg ) &&
 		write_schema( gconf, prefix_config, GCONF_VALUE_STRING, ACTION_TOOLTIP_ENTRY, ACTION_TOOLTIP_DESC_SHORT, ACTION_TOOLTIP_DESC_LONG, "", msg ) &&
 		write_schema( gconf, prefix_config, GCONF_VALUE_STRING, ACTION_ICON_ENTRY, ACTION_ICON_DESC_SHORT, ACTION_ICON_DESC_LONG, "", msg ) &&
-		write_schema( gconf, prefix_config, GCONF_VALUE_STRING, ACTION_PROFILE_LABEL_ENTRY, ACTION_PROFILE_NAME_DESC_SHORT, ACTION_PROFILE_NAME_DESC_LONG, _( "Default profile" ), msg ) &&
+		write_schema( gconf, prefix_config, GCONF_VALUE_STRING, ACTION_PROFILE_LABEL_ENTRY, ACTION_PROFILE_NAME_DESC_SHORT, ACTION_PROFILE_NAME_DESC_LONG, NA_ACTION_PROFILE_DEFAULT_LABEL, msg ) &&
 		write_schema( gconf, prefix_config, GCONF_VALUE_STRING, ACTION_PATH_ENTRY, ACTION_PATH_DESC_SHORT, ACTION_PATH_DESC_LONG, "", msg ) &&
 		write_schema( gconf, prefix_config, GCONF_VALUE_STRING, ACTION_PARAMETERS_ENTRY, ACTION_PARAMETERS_DESC_SHORT, ACTION_PARAMETERS_DESC_LONG, "", msg ) &&
 		write_schema( gconf, prefix_config, GCONF_VALUE_LIST, ACTION_BASENAMES_ENTRY, ACTION_BASENAMES_DESC_SHORT, ACTION_BASENAMES_DESC_LONG, "*", msg ) &&
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]