merge po files and remove obsolete entries, include cheaders in dist

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@266 a592a061-630c-0410-9148-cb99ea01b6c8

ChangeLog

@@ -1,5 +1,11 @@
 1999-10-28  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
+	* src/form1.C (create_form_Figure): added a couple fo "no-c-format"
+
+	* src/Makefile.am (dist-hook): added used to remove the CVS from
+	cheaders upon creating a dist
+	(EXTRA_DIST): added cheaders
+
 	* src/support/lstrings.C (tostr(char)): fix it to handle param as
 	a character not as a small integer. 
 

po/ChangeLog

@@ -1,3 +1,8 @@
+1999-10-28  Lars Gullik Bjønnes  <larsbj@lyx.org>
+
+	* *.po: obsolete entries and merged with lyx.pot because of make
+	distdir.  
+
 1999-10-25  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
 	* redadded POTFILES.in some of the clean targest need it

src/Makefile.am

@@ -6,7 +6,7 @@ bin_PROGRAMS = lyx
 lyx_LDADD = mathed/mathed.o insets/insets.o support/libsupport.a \
 	@INTLLIBS@ @LYX_LIBS@
 lyx_DEPENDENCIES = mathed insets support/libsupport.a
-EXTRA_DIST = config.h.in stamp-h.in
+EXTRA_DIST = config.h.in stamp-h.in cheaders
 ETAGS_ARGS = --c++
 INCLUDES = -I${top_srcdir}/images
 localedir = $(datadir)/locale
@@ -180,3 +180,6 @@ lyx_main.o: lyx_main.C lyx_main.h config.h version.h debug.h gettext.h
 main.o: main.C config.h lyx_main.h gettext.h LString.h support/filetools.h
 	$(CXXCOMPILE) -DPACKAGE=\"$(PACKAGE)\" -DLOCALEDIR=\"$(localedir)\" \
 	-c ${top_srcdir}/src/main.C
+
+dist-hook:
+	cd $(distdir) ; rm -rf `find cheaders -name \*CVS\*`

src/form1.C

@@ -135,6 +135,7 @@ FD_Figure *create_form_Figure(void)
     fl_set_object_callback(obj,GraphicsCB,2);
 
   fdui->HeightGrp = fl_bgn_group();
+  // xgettext:no-c-format
   fdui->page2 = obj = fl_add_checkbutton(FL_RADIO_BUTTON,110,130,110,30,idex(_("% of Page|#g")));fl_set_button_shortcut(obj,scex(_("% of Page|#g")),1);
     fl_set_object_lsize(obj,FL_NORMAL_SIZE);
     fl_set_object_callback(obj,GraphicsCB,23);
@@ -192,9 +193,11 @@ FD_Figure *create_form_Figure(void)
   fdui->in1 = obj = fl_add_checkbutton(FL_RADIO_BUTTON,10,110,80,30,idex(_("inches|#n")));fl_set_button_shortcut(obj,scex(_("inches|#n")),1);
     fl_set_object_lsize(obj,FL_NORMAL_SIZE);
     fl_set_object_callback(obj,GraphicsCB,12);
+    // xgettext:no-c-format
   fdui->page1 = obj = fl_add_checkbutton(FL_RADIO_BUTTON,10,130,110,30,idex(_("% of Page|#P")));fl_set_button_shortcut(obj,scex(_("% of Page|#P")),1);
     fl_set_object_lsize(obj,FL_NORMAL_SIZE);
     fl_set_object_callback(obj,GraphicsCB,13);
+    // xgettext:no-c-format
   fdui->column1 = obj = fl_add_checkbutton(FL_RADIO_BUTTON,10,150,110,30,idex(_("% of Column|#o")));fl_set_button_shortcut(obj,scex(_("% of Column|#o")),1);
     fl_set_object_lsize(obj,FL_NORMAL_SIZE);
     fl_set_object_callback(obj,GraphicsCB,14);