Fix POTFILES generation, and a first try at updating NEWS file.

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

ChangeLog

@@ -1,3 +1,9 @@
+2000-10-17  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* NEWS: update somehow for 1.1.6
+
+	* lib/ui/default.ui: clean up.
+
 2000-10-17  Angus Leeming <a.leeming@ic.ac.uk>
 
 	* lib/CREDITS: clean up

NEWS

@@ -1,3 +1,64 @@
+What's new in LyX version 1.1.6?
+--------------------------------
+
+As for all of the 1.1.x versions of LyX, this release contains a lot
+of new code: in particular, half of the changes described in the
+ChangeLog (which dates back to the 1.1.0 release) describe changes in
+LyX 1.1.6!
+
+Besides the usual under-the-hood changes, LyX 1.1.6 has many
+new user-visible features. The main visible feature is that the
+GUI-independent branch of development has been merged, as well as code
+from the older development version:
+
+- many popups have been rewritten to use the new GUI-I scheme. In the
+  process they have gotten a nice cleanup: the Document and Paragraph
+  popups now contain in one single place what was previously scattered
+  in many places. Similarly, the citation and cross reference popups
+  have been overhauled.
+
+- LyX now has a Preference popup where you can change most of your
+  lyxrc settings [Allan, details?]
+
+- the menus can now be defined from a text file (like the toolbar) and
+  shows the keyboard bindings associated to commands.
+
+- it is now possible to provide your own icons for the toolbar.
+
+- last but not least, work has begun on a KDE and a GNome frontend for
+  LyX. They are not officially supported for this version, but this
+  can give you an idea of what is happening.
+
+Other major changes in 1.1.6 include:
+
+- the table support has been completely rewritten. It uses the new
+  text inset which will be use throughout LyX in version 1.2.0 and
+  offers many new features: [Juergen??]
+
+- new external material inset: this is a new kind of very powerful
+  inset which will allow LyX to interface intelligently with external
+  applications. Among other good things, it will allow you to finally
+  include GIF, JPEG, TIF, PNG, or just about any other raster format
+  images in your document. It will even do an approximate ascii
+  rendering when you do Ascii export if you have gifscii installed.
+
+- the code which converts from LyX format to anything else (for
+  viewing or exporting purpose) has been rewritten. In particular, the
+  PDF format is now supported [Dekel, details?]
+
+- DocBook improvements [José, details?]
+
+And finally, there has been a lot of smaller changes, which are
+mentionned here for your information
+
+- the menu entry File->New does not prompt for a file name by default
+  (this can be changed in lyxrc).
+
+- new -geometry command line option, which replaces the old -width,
+  -height, etc.
+
+- 
+
 What's new in LyX version 1.1.5?
 --------------------------------
 

lib/ui/default.ui

@@ -26,12 +26,12 @@ Menuset
 
     Menu "file" 
 	Item "New...|N" "buffer-new"
-	Item "New from template|t" "buffer-new-template"
+	Item "New from template...|t" "buffer-new-template"
 	Item "Open...|O" "buffer-open"
 	Separator
 	Item "Close|C" "buffer-close"
 	Item "Save|S" "buffer-write"
-	Item "Save As|A" "buffer-write-as"
+	Item "Save As...|A" "buffer-write-as"
 	Item "Revert to saved|R" "buffer-reload"
 	Separator
 	Item "View dvi|d" "buffer-view dvi"
@@ -54,7 +54,7 @@ Menuset
 
     Menu "file_nobuffer" 
 	Item "New...|N" "buffer-new"
-	Item "New from template|t" "buffer-new-template"
+	Item "New from template...|t" "buffer-new-template"
 	Item "Open...|O" "buffer-open"
 	Separator
 	Submenu "Import|I" "import"
@@ -81,14 +81,6 @@ Menuset
 
     Menu "export"
 	ExportFormats
-#	OptItem "as LaTeX|L" "buffer-export latex"
-#	OptItem "as LinuxDoc|L" "buffer-export linuxdoc"
-#	OptItem "as DocBook|B" "buffer-export docbook"
-#	Item "as DVI|D" "buffer-export dvi"
-#	Item "as Postscript|P" "buffer-export postscript"
-#	Item "as Ascii|A" "buffer-export ascii"
-#	Item "as HTML|H" "buffer-export html"
-#	OptItem "Custom...|C" "buffer-export custom"
     End
 
     Menu "edit"
@@ -169,29 +161,26 @@ Menuset
 	Item "Character...|C" "layout-character"
 	Item "Paragraph...|P" "layout-paragraph"
 	Item "Document...|D" "layout-document"
-#	Item "Paper...|a" "layout-paper"
-#	Item "Quotes...|Q" "layout-quotes"
 	OptItem "Tabular...|a" "layout-tabular"
-#	Item "Table...|T" "layout-table"
 	Separator
 	Item "Emphasize Style|E" "font-emph"
 	Item "Noun Style|N" "font-noun"
 	Item "Bold Style|B" "font-bold"
 	Item "TeX Style|X" "tex-mode"
 	Item "Change environment depth|v" "depth-increment"
-	Item "LaTeX preamble|a" "layout-preamble"
+	Item "LaTeX preamble...|a" "layout-preamble"
 	Item "Start of Appendix|x" "appendix"
 	Separator
 	Item "Save layout as default|S" "layout-save-default"
     End
 
     Menu "insert"
-	Item "Figure...|F" "figure-insert"
+	Item "Figure...|g" "figure-insert"
 	Item "Tabular...|T" "dialog-tabular-insert"
 	Separator
 	Item "Include File...|I" "buffer-child-insert"
 	Submenu "Import ascii file|a" "insert_ascii"
-	Item "Insert LyX file|X" "file-insert"
+	Item "Insert LyX file...|X" "file-insert"
 	Item "Insert external material...|e" "external-insert"
 	Separator
 	Item "Footnote|F" "footnote-insert"
@@ -212,8 +201,8 @@ Menuset
     End
 
     Menu "insert_ascii"
-	Item "As lines|l" "file-insert-ascii lines"
+	Item "As lines...|l" "file-insert-ascii lines"
-	Item "As paragraphs|p" "file-insert-ascii paragraphs"
+	Item "As paragraphs...|p" "file-insert-ascii paragraphs"
     End
 
     Menu "insert_floats"
@@ -231,7 +220,7 @@ Menuset
 	Item "List of Tables|T" "lot-insert"
 	Item "List of Algorithms|A" "loa-insert"
 	Item "Index List|I" "index-print"
-	Item "BibTeX reference|B" "bibtex-insert"
+	Item "BibTeX reference...|B" "bibtex-insert"
     End
 
     Menu "insert_special"
@@ -260,12 +249,8 @@ Menuset
     End
 
     Menu "options"
-#	Item "Screen Fonts...|F" "screen-options"
-#	Item "Spellchecker Options...|S" "spellchecker-options"
-#	Item "Keyboard...|K" "keyboard-options"
-#	Separator
 	Item "Reconfigure|R" "reconfigure"
-	Item "Preferences|P" "dialog-preferences"
+	Item "Preferences...|P" "dialog-preferences"
     End
     
     Menu "documents"

po/ChangeLog

@@ -1,3 +1,8 @@
+2000-10-17  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* Makefile.in.in (${srcdir}/POTFILES.in): hopefully fix the
+	generation of POTFILES.in
+
 2000-10-11  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
 	* no.po: update a bit for 1.1.6cvs

po/Makefile.in.in

@@ -236,14 +236,14 @@ update-po: Makefile
 	  fi; \
 	done
 
-POTFILES.in: $(top_srcdir)/src/ext_l10n.h $(POTFILE_IN_DEPS)
+${srcdir}/POTFILES.in: $(top_srcdir)/src/ext_l10n.h $(POTFILE_IN_DEPS)
 	rm -f $@-t \
 	&& ( cd $(top_srcdir); \
 	     grep -l -E "_\(\".*\"\)" `find src -name \*.[hHC]` | \
 	     awk 'BEGIN {FS= ":"} {print $$1}' | \
 	     sed -e '/xforms.forms/d' | \
 	     sort -f -d | uniq ) > $@-t \
-	&& mv $@-t $(srcdir)/$@
+	&& mv $@-t $@
 
 POTFILES: POTFILES.in
 	( if test 'x$(srcdir)' != 'x.'; then \