Re: Translation of preferences contents

"nshmyrev" <[email protected]>
Newsgroups gmane.editors.conglomerate.devel
Message-ID <[email protected]> 
Hello.

Yes, we have conglomerate bug here with translation of xds files. The problem is that intltool looks at xds extension and doesn't understand that it is the xml file it should translate. The attached patch fixies the problem. It would better to apply it.

After applying the patch you should regenerate po files with ../intltool-update <Language>

Also I've attached updated fr.po for you, Michele, so you should'n run any scripts :)
fr.po (application/octet-stream, 96 KB) - not displayed
patch.diff (application/octet-stream, 10.8 KB) 
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/conglomerate/ChangeLog,v
retrieving revision 1.142
diff -u -r1.142 ChangeLog
--- ChangeLog	15 Aug 2004 10:21:14 -0000	1.142
+++ ChangeLog	15 Oct 2004 14:26:46 -0000
@@ -1,3 +1,10 @@
+2004-10-15  Nickolay V. Shmyrev <[email protected]>
+
+	* configure.in: 
+	
+	disable generation of data files, since they are created by
+	intltool
+
 2004-08-13  Geert Stappers <[email protected]>
 
 	* conglomerate.spec.in: sync with Dag Wiers
Index: configure.in
===================================================================
RCS file: /cvs/gnome/conglomerate/configure.in,v
retrieving revision 1.109
diff -u -r1.109 configure.in
--- configure.in	1 Aug 2004 01:12:35 -0000	1.109
+++ configure.in	15 Oct 2004 14:26:54 -0000
@@ -324,25 +324,25 @@
 
 dnl --- Output ---
 
-AC_OUTPUT(Makefile 
-	  conglomerate.spec
-          po/Makefile.in
-	  data/conglomerate.keys
-	  data/conglomerate.schemas
-	  data/Makefile
-	  debian/Makefile
-	  debian/patches/Makefile
-	  dispspecs/Makefile
-	  doc/Makefile
-	  doc/devel/Makefile
-	  doc/C/Makefile
-	  doc/reference/Makefile
-	  doc/reference/version.xml
-	  glade/Makefile
-	  pixmaps/Makefile
-	  examples/Makefile 
-	  templates/Makefile 
-          src/Makefile)
+AC_CONFIG_FILES(Makefile 
+	        conglomerate.spec
+                po/Makefile.in
+                data/Makefile
+	        debian/Makefile
+	        debian/patches/Makefile
+	        dispspecs/Makefile
+	        doc/Makefile
+	        doc/devel/Makefile
+	        doc/C/Makefile
+	        doc/reference/Makefile
+	        doc/reference/version.xml
+	        glade/Makefile
+	        pixmaps/Makefile
+	        examples/Makefile 
+	        templates/Makefile 
+                src/Makefile)
+
+AC_OUTPUT
 
 if test x$enable_gconf = xno; then
         echo "*** WARNING WARNING WARNING WARNING WARNING"
Index: data/ChangeLog
===================================================================
RCS file: /cvs/gnome/conglomerate/data/ChangeLog,v
retrieving revision 1.16
diff -u -r1.16 ChangeLog
--- data/ChangeLog	7 Sep 2004 21:33:21 -0000	1.16
+++ data/ChangeLog	15 Oct 2004 14:26:55 -0000
@@ -1,3 +1,7 @@
+2004-10-15  Nickolay V. Shmyrev <nshmyrev.yandex.ru>
+
+	* Makefile.am: Use common rule to translate schemas	
+
 2004-09-07  Stephane Loeuillet  <[email protected]>
 
 	* conglomerate.desktop.in: Updated (bugzilla #151845)
Index: data/Makefile.am
===================================================================
RCS file: /cvs/gnome/conglomerate/data/Makefile.am,v
retrieving revision 1.10
diff -u -r1.10 Makefile.am
--- data/Makefile.am	19 Jun 2004 22:25:05 -0000	1.10
+++ data/Makefile.am	15 Oct 2004 14:26:55 -0000
@@ -17,12 +17,11 @@
 ## bugzilla 122011 for catalog & catalog.xml
 
 
-
 schemadir        = $(sysconfdir)/gconf/schemas/
 schema_in_files  = conglomerate.schemas.in
 schema_DATA      = $(schema_in_files:.schemas.in=.schemas)
-%.schemas:       %.schemas.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -x -u -c $(top_builddir)/po/.intltool-merge-cache
 
+@INTLTOOL_SCHEMAS_RULE@
 
 stylesheetdir = $(pkgdatadir)/stylesheets
 stylesheet_DATA = selection-to-text.xsl
Index: po/ChangeLog
===================================================================
RCS file: /cvs/gnome/conglomerate/po/ChangeLog,v
retrieving revision 1.196
diff -u -r1.196 ChangeLog
--- po/ChangeLog	13 Oct 2004 21:50:34 -0000	1.196
+++ po/ChangeLog	15 Oct 2004 14:27:00 -0000
@@ -1,4 +1,9 @@
-Top line of ChangeLog $Revision: 1.196 $, update below this line.
+2004-10-15  Nickolay V. Shmyrev <[email protected]>
+
+	* POTFILES.in:
+	Regenerated, with uss/mkpotfilesin version 1.9,
+	this will effect the .po files. Thus we will get dispspec files
+	fully translated.
 
 2004-10-13  David Lodge <[email protected]>
                                                                                 
Index: po/POTFILES.in
===================================================================
RCS file: /cvs/gnome/conglomerate/po/POTFILES.in,v
retrieving revision 1.35
diff -u -r1.35 POTFILES.in
--- po/POTFILES.in	10 Oct 2004 13:43:15 -0000	1.35
+++ po/POTFILES.in	15 Oct 2004 14:27:00 -0000
@@ -3,11 +3,11 @@
 data/conglomerate.desktop.in
 data/conglomerate.keys.in
 data/conglomerate.schemas.in
-dispspecs/dispspec.xds.in
-dispspecs/docbook.xds.in
-dispspecs/forrest-document.xds.in
-dispspecs/kernel-traffic-newsletter.xds.in
-dispspecs/xhtml1-strict.xds.in
+[type: gettext/xml]dispspecs/dispspec.xds.in
+[type: gettext/xml]dispspecs/docbook.xds.in
+[type: gettext/xml]dispspecs/forrest-document.xds.in
+[type: gettext/xml]dispspecs/kernel-traffic-newsletter.xds.in
+[type: gettext/xml]dispspecs/xhtml1-strict.xds.in
 glade/cong-file-import.glade
 glade/cong-file-properties.glade
 glade/cong-find-replace.glade
@@ -22,75 +22,76 @@
 src/auth_off.c
 src/auth_on.c
 src/cong-app.c
+src/cong-attribute-editor.c
 src/cong-attribute-editor-cdata.c
 src/cong-attribute-editor-enumeration.c
 src/cong-attribute-editor-lang.c
 src/cong-attribute-editor-nmtoken.c
-src/cong-attribute-editor.c
+src/cong-attribute-wrapper.c
 src/cong-attribute-wrapper-check-button.c
 src/cong-attribute-wrapper-radio-button.c
-src/cong-attribute-wrapper.c
-src/cong-command-history.c
 src/cong-command.c
+src/cong-command-history.c
 src/cong-debug-log-view.c
 src/cong-dialog.c
+src/cong-dispspec.c
 src/cong-dispspec-element.c
 src/cong-dispspec-registry.c
-src/cong-dispspec.c
-src/cong-document-traversal.c
 src/cong-document.c
+src/cong-document-traversal.c
 src/cong-dom-view.c
 src/cong-dtd.c
 src/cong-edit-find-and-replace.c
-src/cong-edit-preferences.c
 src/cong-editor-area-bin.c
 src/cong-editor-area-border.c
+src/cong-editor-area.c
 src/cong-editor-area-composer.c
 src/cong-editor-area-container.c
 src/cong-editor-area-entity-decl.c
 src/cong-editor-area-entity-ref.c
 src/cong-editor-area-expander.c
 src/cong-editor-area-flow-holder-blocks.c
+src/cong-editor-area-flow-holder.c
 src/cong-editor-area-flow-holder-inlines.c
 src/cong-editor-area-flow-holder-single.c
-src/cong-editor-area-flow-holder.c
 src/cong-editor-area-labelled.c
 src/cong-editor-area-line.c
 src/cong-editor-area-pixbuf.c
 src/cong-editor-area-spacer.c
 src/cong-editor-area-span-tag.c
-src/cong-editor-area-structural-tag.c
 src/cong-editor-area-structural.c
+src/cong-editor-area-structural-tag.c
+src/cong-editor-area-text.c
 src/cong-editor-area-text-comment.c
 src/cong-editor-area-text-fragment.c
-src/cong-editor-area-text.c
 src/cong-editor-area-underline.c
 src/cong-editor-area-unknown-tag.c
-src/cong-editor-area.c
+src/cong-editor-child-policy.c
 src/cong-editor-child-policy-flow-holder.c
 src/cong-editor-child-policy-inline.c
-src/cong-editor-child-policy.c
 src/cong-editor-line-fragments.c
+src/cong-editor-node.c
 src/cong-editor-node-comment.c
 src/cong-editor-node-document.c
 src/cong-editor-node-dtd.c
+src/cong-editor-node-element.c
 src/cong-editor-node-element-span.c
 src/cong-editor-node-element-structural.c
 src/cong-editor-node-element-unknown.c
-src/cong-editor-node-element.c
 src/cong-editor-node-entity-decl.c
 src/cong-editor-node-entity-ref.c
 src/cong-editor-node-text.c
 src/cong-editor-node-unimplemented.c
-src/cong-editor-node.c
 src/cong-editor-widget3.c
-src/cong-eel-graphic-effects.c
+src/cong-edit-preferences.c
 src/cong-eel.c
+src/cong-eel-graphic-effects.c
 src/cong-enum-mapping.c
 src/cong-error-dialog.c
 src/cong-error-file-open.c
 src/cong-error-file-save.c
 src/cong-error-tests.c
+src/cong-fake-plugin-hooks.c
 src/cong-file-export.c
 src/cong-file-import.c
 src/cong-file-new.c
@@ -104,27 +105,28 @@
 src/cong-location.c
 src/cong-marshal.c
 src/cong-menus.c
+src/cong-modification.c
 src/cong-modification-cursor-change.c
 src/cong-modification-selection-change.c
 src/cong-modification-set-dtd-ptr.c
-src/cong-modification.c
+src/cong-node.c
 src/cong-node-modification-add-after.c
 src/cong-node-modification-add-before.c
+src/cong-node-modification.c
 src/cong-node-modification-make-orphan.c
 src/cong-node-modification-remove-attribute.c
 src/cong-node-modification-set-attribute.c
 src/cong-node-modification-set-parent.c
 src/cong-node-modification-set-text.c
-src/cong-node-modification.c
 src/cong-node-properties-dialog.c
-src/cong-node.c
 src/cong-overview-view.c
 src/cong-parser-error.c
-src/cong-plugin-manager.c
 src/cong-plugin.c
+src/cong-plugin-manager.c
 src/cong-primary-window.c
 src/cong-progress-checklist.c
 src/cong-range.c
+src/cong-service.c
 src/cong-service-doc-tool.c
 src/cong-service-document-factory.c
 src/cong-service-editor-node-factory.c
@@ -134,9 +136,9 @@
 src/cong-service-node-tool.c
 src/cong-service-print-method.c
 src/cong-service-tool.c
-src/cong-service.c
 src/cong-source-layout.c
 src/cong-source-view.c
+src/cong-spell.c
 src/cong-text-cache.c
 src/cong-traversal-node.c
 src/cong-tree-view.c
@@ -155,24 +157,24 @@
 src/ilogo.c
 src/main.c
 src/plugin-abiword.c
-src/plugin-admonition-node-element.c
 src/plugin-admonition.c
+src/plugin-admonition-node-element.c
 src/plugin-arbitrary.c
 src/plugin-cleanup-source.c
 src/plugin-convert-case.c
 src/plugin-css.c
-src/plugin-doc-from-xds.c
 src/plugin-docbook.c
+src/plugin-doc-from-xds.c
 src/plugin-dtd.c
 src/plugin-empty.c
 src/plugin-fo.c
 src/plugin-html.c
 src/plugin-lists-area-listitem.c
-src/plugin-lists-node-element-listitem.c
 src/plugin-lists.c
+src/plugin-lists-node-element-listitem.c
 src/plugin-paragraph-area-paragraph.c
-src/plugin-paragraph-node-element-paragraph.c
 src/plugin-paragraph.c
+src/plugin-paragraph-node-element-paragraph.c
 src/plugin-random.c
 src/plugin-relaxng.c
 src/plugin-save-dispspec.c
Index: uss/ChangeLog
===================================================================
RCS file: /cvs/gnome/conglomerate/uss/ChangeLog,v
retrieving revision 1.27
diff -u -r1.27 ChangeLog
--- uss/ChangeLog	13 Aug 2004 13:36:53 -0000	1.27
+++ uss/ChangeLog	15 Oct 2004 14:27:02 -0000
@@ -1,3 +1,9 @@
+2004-08-13 Nickolay V. Shmyrev <[email protected]>
+
+	* mkpotfilesin :
+	
+	Update script to allow translation of xds files
+
 2004-08-13  Geert Stappers <[email protected]>
 
 	* mkcvstarball
Index: uss/mkpotfilesin
===================================================================
RCS file: /cvs/gnome/conglomerate/uss/mkpotfilesin,v
retrieving revision 1.8
diff -u -r1.8 mkpotfilesin
--- uss/mkpotfilesin	13 Aug 2004 13:36:53 -0000	1.8
+++ uss/mkpotfilesin	15 Oct 2004 14:27:02 -0000
@@ -1,6 +1,6 @@
 #!/bin/bash
-# $Id: mkpotfilesin,v 1.8 2004/08/13 13:36:53 stappers Exp $
-VERSION=$( echo '$Revision: 1.8 $' | awk '{ print $2 }' )
+# $Id: mkpotfilesin,v 1.9 2004/10/15 13:36:53 nshmyrev Exp $
+VERSION=$( echo '$Revision: 1.9 $' | awk '{ print $2 }' )
 #
 # po strings update
 #
@@ -32,7 +32,7 @@
 HERE
 
 # document types
-find dispspecs -name "*.xds.in" | sort >> ${FPPI}
+find dispspecs -name "*.xds.in" -printf "[type: gettext/xml]%p\n" | sort >> ${FPPI}
 
 # found glade files
 find glade -name "*.glade" | sort >> ${FPPI}
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.