minor changes proposed by Hartmut Haase + shortcut conflict resolution

[lyx.git] / po / ChangeLog

diff --git a/po/ChangeLog b/po/ChangeLog
index a43dfcfa8429041d49302bb8ce45796069115cc5..c1577acb594deff85f7ea2c8b32e595010647588 100644 (file)
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,57 @@
+2005-11-28  Michael Gerz  <michael.gerz@teststep.org>
+
+        * de.po: minor changes proposed by Hartmut Haase
+
+2005-11-22  Adrien Rebollo <adrien.rebollo@gmx.fr>
+
+       * fr.po: 2nd and maybe last update for release 1.4
+
+2005-11-21  Adrien Rebollo <adrien.rebollo@gmx.fr>
+
+       * fr.po: 1st update for release 1.4
+
+2005-11-19  Michael Gerz  <michael.gerz@teststep.org>
+
+       * de.po: more updates
+
+2005-11-15  Michael Gerz  <michael.gerz@teststep.org>
+
+       * de.po: more updates
+
+2005-10-31  Michael Gerz  <michael.gerz@teststep.org>
+
+        * de.po: more updates
+
+2005-10-23  Lars Gullik Bjonnes  <larsbj@localhost.localdomain>
+
+       * remerge and some CRLF removal
+
+2005-10-23  Michael Gerz  <michael.gerz@teststep.org>
+
+       * de.po: more updates
+
+2005-10-12  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * Makefile.in.in:
+       * postats.sh: adapt to new developers site.
+
+2005-10-09  Lars Gullik Bjonnes  <larsbj@localhost.localdomain>
+
+       * rename no.po to nb.po, remerge
+       * LINGUAS: replace no with nb
+
+2005-10-03  Michael Gerz  <michael.gerz@teststep.org>
+
+       * de.po: tiny improvements by Hartmut Haase
+
+2005-09-15  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * *.po: remerge.
+       
+       * Makefile.in.in: fix quoting of awk regexp constants. Use sed
+       instead of awk to change single backslashes to double ones in
+       LabelString*, since it is not possible to do this portably in awk.
+
 2005-09-12  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * Makefile.in.in: when invoking awk, use POSIX regexps only.