1 files changed, 9 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 9b950c2..11a99b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,15 @@
 (Format: Year/Month/Day)
 Changes for 1.0rc2:
 *06/06/21:
-   * Fix nls file location. nls wouldn't have worked, why did no-one say?
+   * Fix nls (Simon
-     (Simon)
+     - file location waas wrong. nls wouldn't have worked, why did no-one say? 
-     - Need a couple more fixes too:
+     - Messages output on stdout/err now properly in local encoding
-       * Messages output on stdout/err need to be in local encoding
+     - Check for existence of catalog file, if it doesn't exist, and we can
-       * Check for existence of catalog file, if not exist, try opening an
+       convert from UTF-8, try loading that one instead.
-         iconv for UTF-8, and loading that one instead.
+     - bunch of files changed due to macro name change:
-     FbTk/I18n.cc
+       + Use _FB_XTEXT if the text will go out to X (for X fonts)
+       + Use _FB_CONSOLETEXT if the text will go to console (stdout/err)
+     FbTk/I18n.hh/cc (+anything with _FB_TEXT)
 *06/06/20:
   * Fix window placement when apps remembers size but not location (Simon)
     Window.cc

diff --git a/ChangeLog b/ChangeLog index 9b950c2..11a99b1 100644 --- a/ChangeLog +++ b/ChangeLog
@@ -1,13 +1,15 @@
1	(Format: Year/Month/Day)	1	(Format: Year/Month/Day)
2	Changes for 1.0rc2:	2	Changes for 1.0rc2:
3	*06/06/21:	3	*06/06/21:
4	* Fix nls file location. nls wouldn't have worked, why did no-one say?	4	* Fix nls (Simon
5	(Simon)	5	- file location waas wrong. nls wouldn't have worked, why did no-one say?
6	- Need a couple more fixes too:	6	- Messages output on stdout/err now properly in local encoding
7	* Messages output on stdout/err need to be in local encoding	7	- Check for existence of catalog file, if it doesn't exist, and we can
8	* Check for existence of catalog file, if not exist, try opening an	8	convert from UTF-8, try loading that one instead.
9	iconv for UTF-8, and loading that one instead.	9	- bunch of files changed due to macro name change:
10	FbTk/I18n.cc	10	+ Use _FB_XTEXT if the text will go out to X (for X fonts)
		11	+ Use _FB_CONSOLETEXT if the text will go to console (stdout/err)
		12	FbTk/I18n.hh/cc (+anything with _FB_TEXT)
11	*06/06/20:	13	*06/06/20:
12	* Fix window placement when apps remembers size but not location (Simon)	14	* Fix window placement when apps remembers size but not location (Simon)
13	Window.cc	15	Window.cc