merge po files, improve float reading

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

po/ChangeLog

@@ -1,3 +1,8 @@
+2001-07-25  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+	* po files: merge with lyx.pot
+	* no.po: some updates
+
 2001-07-25  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
 	* da.po: update from Claus Hindsgaul

src/insets/ChangeLog

@@ -1,5 +1,7 @@
 2001-07-25  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
+	* insetfloat.C (read): handle missing parameters.
+
 	* insettext.C (read): handle old latex end_inset
 
 	* insetert.C (setButtonLabel): new method

src/insets/insetfloat.C

@@ -150,6 +150,8 @@ void InsetFloat::read(Buffer const * buf, LyXLex & lex)
 		} else {
 			lyxerr << "InsetFloat::Read: Missing placement!"
 			       << endl;
+			// take countermeasures
+			lex.pushToken(token);
 		}
 		lex.next();
 		token = lex.GetString();
@@ -163,6 +165,8 @@ void InsetFloat::read(Buffer const * buf, LyXLex & lex)
 		} else {
 			lyxerr << "InsetFloat::Read:: Missing wide!"
 			       << endl;
+			// take countermeasures
+			lex.pushToken(token);
 		}
 	}
 	InsetCollapsable::read(buf, lex);