diff --git a/ChangeLog b/ChangeLog
index fe6a26d86..4706d07c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Nov 22 13:56:55 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* Version 1.3.11
+
 Thu Nov 22 13:14:18 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in (GLIB_MICRO_VERSION): Version 11, 
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index fe6a26d86..4706d07c4 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+Thu Nov 22 13:56:55 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* Version 1.3.11
+
 Thu Nov 22 13:14:18 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in (GLIB_MICRO_VERSION): Version 11, 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fe6a26d86..4706d07c4 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Thu Nov 22 13:56:55 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* Version 1.3.11
+
 Thu Nov 22 13:14:18 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in (GLIB_MICRO_VERSION): Version 11, 
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index fe6a26d86..4706d07c4 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,7 @@
+Thu Nov 22 13:56:55 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* Version 1.3.11
+
 Thu Nov 22 13:14:18 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in (GLIB_MICRO_VERSION): Version 11, 
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index fe6a26d86..4706d07c4 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+Thu Nov 22 13:56:55 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* Version 1.3.11
+
 Thu Nov 22 13:14:18 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in (GLIB_MICRO_VERSION): Version 11, 
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index fe6a26d86..4706d07c4 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+Thu Nov 22 13:56:55 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* Version 1.3.11
+
 Thu Nov 22 13:14:18 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in (GLIB_MICRO_VERSION): Version 11, 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index fe6a26d86..4706d07c4 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Thu Nov 22 13:56:55 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* Version 1.3.11
+
 Thu Nov 22 13:14:18 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in (GLIB_MICRO_VERSION): Version 11, 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index fe6a26d86..4706d07c4 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Thu Nov 22 13:56:55 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* Version 1.3.11
+
 Thu Nov 22 13:14:18 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in (GLIB_MICRO_VERSION): Version 11, 
diff --git a/po/az.po b/po/az.po
index 3ea53c7de..0c46df680 100644
--- a/po/az.po
+++ b/po/az.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glib 1.3.9\n"
-"POT-Creation-Date: 2001-10-22 09:35-0400\n"
+"POT-Creation-Date: 2001-11-22 14:08-0500\n"
 "PO-Revision-Date: 2001-10-03 19:45GMT +0200\n"
 "Last-Translator: Vasif İsmayıloğlu MD <azerb_linux@hotmail.com>\n"
 "Language-Team: Azerbaijani Turkish <linuxaz@azerimal.net>\n"
@@ -25,13 +25,13 @@ msgid "Could not open converter from '%s' to '%s': %s"
 msgstr "`%s' dən `%s' ə dönüşdürücü açıla bilmir: %s"
 
 #: glib/gconvert.c:356 glib/gconvert.c:639 glib/giochannel.c:1282
-#: glib/giochannel.c:1324 glib/giochannel.c:2164 glib/gutf8.c:875
+#: glib/giochannel.c:1324 glib/giochannel.c:2163 glib/gutf8.c:875
 #: glib/gutf8.c:1321
 msgid "Invalid byte sequence in conversion input"
 msgstr "dönüşdürmə girişində hökmsüz bayt qatarı"
 
 #: glib/gconvert.c:361 glib/gconvert.c:572 glib/giochannel.c:1289
-#: glib/giochannel.c:2176
+#: glib/giochannel.c:2175
 #, c-format
 msgid "Error during conversion: %s"
 msgstr "Dönüşdürmə sırasında xəta yarandı: %s"
@@ -130,19 +130,19 @@ msgstr "`%s' hərf dəstəsindən `%s' hərf dəstəsinə dönüşdürmə dəst
 msgid "Could not open converter from `%s' to `%s': %s"
 msgstr "`%s' dən `%s' ə dönüşdürücü açıla bilmir: %s"
 
-#: glib/giochannel.c:1461
+#: glib/giochannel.c:1460
 msgid "Can't do a raw read in g_io_channel_read_line_string"
 msgstr "Can't do a raw read in g_io_channel_read_line_string"
 
-#: glib/giochannel.c:1508 glib/giochannel.c:1762 glib/giochannel.c:1848
+#: glib/giochannel.c:1507 glib/giochannel.c:1761 glib/giochannel.c:1847
 msgid "Leftover unconverted data in read buffer"
 msgstr "Oxuna buferdə dönüşdürülməmiş verilənlər var"
 
-#: glib/giochannel.c:1588 glib/giochannel.c:1662
+#: glib/giochannel.c:1587 glib/giochannel.c:1661
 msgid "Channel terminates in a partial character"
 msgstr "Kanal qismi xarakterlə bitir"
 
-#: glib/giochannel.c:1648
+#: glib/giochannel.c:1647
 msgid "Can't do a raw read in g_io_channel_read_to_end"
 msgstr "Can't do a raw read in g_io_channel_read_to_end"
 
diff --git a/po/ca.po b/po/ca.po
index bf596934c..b97da11bd 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glib 1.3.9\n"
-"POT-Creation-Date: 2001-10-22 09:35-0400\n"
+"POT-Creation-Date: 2001-11-22 14:08-0500\n"
 "PO-Revision-Date: 2001-10-05 19:45+0200\n"
 "Last-Translator: Softcatal� <tradgnome@softcatala.org>\n"
 "Language-Team: Catalan <info@softcatala.org>\n"
@@ -25,13 +25,13 @@ msgid "Could not open converter from '%s' to '%s': %s"
 msgstr "No s'ha pogut obrir el convertidor de '%s' a '%s': %s"
 
 #: glib/gconvert.c:356 glib/gconvert.c:639 glib/giochannel.c:1282
-#: glib/giochannel.c:1324 glib/giochannel.c:2164 glib/gutf8.c:875
+#: glib/giochannel.c:1324 glib/giochannel.c:2163 glib/gutf8.c:875
 #: glib/gutf8.c:1321
 msgid "Invalid byte sequence in conversion input"
 msgstr "Seq��ncia de bytes inv�lida en l'entrada de conversi�"
 
 #: glib/gconvert.c:361 glib/gconvert.c:572 glib/giochannel.c:1289
-#: glib/giochannel.c:2176
+#: glib/giochannel.c:2175
 #, c-format
 msgid "Error during conversion: %s"
 msgstr "S'ha produ�t un error durant la conversi�: %s"
@@ -133,19 +133,19 @@ msgstr "No es suporta la conversi
 msgid "Could not open converter from `%s' to `%s': %s"
 msgstr "No s'ha pogut obrir el convertidor des de '%s' fins a '%s': %s"
 
-#: glib/giochannel.c:1461
+#: glib/giochannel.c:1460
 msgid "Can't do a raw read in g_io_channel_read_line_string"
 msgstr "No es pot fer una lectura b�sica a g_io_channel_read_line_string"
 
-#: glib/giochannel.c:1508 glib/giochannel.c:1762 glib/giochannel.c:1848
+#: glib/giochannel.c:1507 glib/giochannel.c:1761 glib/giochannel.c:1847
 msgid "Leftover unconverted data in read buffer"
 msgstr "A la mem�ria interm�dia de lectura hi ha dades sobrants no convertides"
 
-#: glib/giochannel.c:1588 glib/giochannel.c:1662
+#: glib/giochannel.c:1587 glib/giochannel.c:1661
 msgid "Channel terminates in a partial character"
 msgstr "El canal acaba en un car�cter parcial"
 
-#: glib/giochannel.c:1648
+#: glib/giochannel.c:1647
 msgid "Can't do a raw read in g_io_channel_read_to_end"
 msgstr "No es pot fer una lectura b�sica a g_io_channel_read_to_end"
 
diff --git a/po/de.po b/po/de.po
index 429d96fc3..73a4238d1 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glib (HEAD)\n"
-"POT-Creation-Date: 2001-10-22 09:35-0400\n"
+"POT-Creation-Date: 2001-11-22 14:08-0500\n"
 "PO-Revision-Date: 2001-07-29 07:42+0200\n"
 "Last-Translator: Christian Meyer <chrisime@gnome.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -24,13 +24,13 @@ msgid "Could not open converter from '%s' to '%s': %s"
 msgstr "Konverter von `%s' in `%s' konnte nicht ge�ffnet werden: `%s'"
 
 #: glib/gconvert.c:356 glib/gconvert.c:639 glib/giochannel.c:1282
-#: glib/giochannel.c:1324 glib/giochannel.c:2164 glib/gutf8.c:875
+#: glib/giochannel.c:1324 glib/giochannel.c:2163 glib/gutf8.c:875
 #: glib/gutf8.c:1321
 msgid "Invalid byte sequence in conversion input"
 msgstr "Ung�ltige Bytefolge in Konvertierungseingabe"
 
 #: glib/gconvert.c:361 glib/gconvert.c:572 glib/giochannel.c:1289
-#: glib/giochannel.c:2176
+#: glib/giochannel.c:2175
 #, c-format
 msgid "Error during conversion: %s"
 msgstr "Fehler w�hrend der Umwandlung: %s"
@@ -132,19 +132,19 @@ msgstr "Umwadnlung von Zeichensatz `%s' in `%s' wird nicht unterst
 msgid "Could not open converter from `%s' to `%s': %s"
 msgstr "Konverter von `%s' in `%s' konnte nicht ge�ffnet werden: `%s'"
 
-#: glib/giochannel.c:1461
+#: glib/giochannel.c:1460
 msgid "Can't do a raw read in g_io_channel_read_line_string"
 msgstr ""
 
-#: glib/giochannel.c:1508 glib/giochannel.c:1762 glib/giochannel.c:1848
+#: glib/giochannel.c:1507 glib/giochannel.c:1761 glib/giochannel.c:1847
 msgid "Leftover unconverted data in read buffer"
 msgstr ""
 
-#: glib/giochannel.c:1588 glib/giochannel.c:1662
+#: glib/giochannel.c:1587 glib/giochannel.c:1661
 msgid "Channel terminates in a partial character"
 msgstr ""
 
-#: glib/giochannel.c:1648
+#: glib/giochannel.c:1647
 msgid "Can't do a raw read in g_io_channel_read_to_end"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 8001ae57b..97ec4ca74 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glib VERSION\n"
-"POT-Creation-Date: 2001-10-22 09:35-0400\n"
+"POT-Creation-Date: 2001-11-22 14:08-0500\n"
 "PO-Revision-Date: 2001-09-02 09:00+0200\n"
 "Last-Translator: Jos� Antonio Salgueiro <joseantsa@eresmas.net>\n"
 "Language-Team: Spanish/Spain <es@li.org>\n"
@@ -24,13 +24,13 @@ msgid "Could not open converter from '%s' to '%s': %s"
 msgstr "No se pudo abrir el conversor de `%s'�a�`%s':�%s"
 
 #: glib/gconvert.c:356 glib/gconvert.c:639 glib/giochannel.c:1282
-#: glib/giochannel.c:1324 glib/giochannel.c:2164 glib/gutf8.c:875
+#: glib/giochannel.c:1324 glib/giochannel.c:2163 glib/gutf8.c:875
 #: glib/gutf8.c:1321
 msgid "Invalid byte sequence in conversion input"
 msgstr "Secuencia de byte no v�lida en la entrada de conversi�n"
 
 #: glib/gconvert.c:361 glib/gconvert.c:572 glib/giochannel.c:1289
-#: glib/giochannel.c:2176
+#: glib/giochannel.c:2175
 #, c-format
 msgid "Error during conversion: %s"
 msgstr "Error�durante la�conversi�n:�%s"
@@ -130,19 +130,19 @@ msgstr "Conversi
 msgid "Could not open converter from `%s' to `%s': %s"
 msgstr "No se pudo abrir el conversor de `%s'�a�`%s':�%s"
 
-#: glib/giochannel.c:1461
+#: glib/giochannel.c:1460
 msgid "Can't do a raw read in g_io_channel_read_line_string"
 msgstr ""
 
-#: glib/giochannel.c:1508 glib/giochannel.c:1762 glib/giochannel.c:1848
+#: glib/giochannel.c:1507 glib/giochannel.c:1761 glib/giochannel.c:1847
 msgid "Leftover unconverted data in read buffer"
 msgstr ""
 
-#: glib/giochannel.c:1588 glib/giochannel.c:1662
+#: glib/giochannel.c:1587 glib/giochannel.c:1661
 msgid "Channel terminates in a partial character"
 msgstr ""
 
-#: glib/giochannel.c:1648
+#: glib/giochannel.c:1647
 msgid "Can't do a raw read in g_io_channel_read_to_end"
 msgstr ""
 
diff --git a/po/eu.po b/po/eu.po
index 36b2cfa76..f977ff456 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glib 1.3.9\n"
-"POT-Creation-Date: 2001-10-22 09:35-0400\n"
+"POT-Creation-Date: 2001-11-22 14:08-0500\n"
 "PO-Revision-Date: 2001-07-06 14:23+0200\n"
 "Last-Translator: Joseba Bidaurrazaga van Dierdonck <jbv@euskalnet.net>\n"
 "Language-Team: euskare <linux-eu@chanae.alphanet.ch>\n"
@@ -24,13 +24,13 @@ msgid "Could not open converter from '%s' to '%s': %s"
 msgstr "Ezin ireki `%s'-tik `%s'-rako itzultzailea: %s"
 
 #: glib/gconvert.c:356 glib/gconvert.c:639 glib/giochannel.c:1282
-#: glib/giochannel.c:1324 glib/giochannel.c:2164 glib/gutf8.c:875
+#: glib/giochannel.c:1324 glib/giochannel.c:2163 glib/gutf8.c:875
 #: glib/gutf8.c:1321
 msgid "Invalid byte sequence in conversion input"
 msgstr "Baliogabeko byte segida itzulketa sarreran"
 
 #: glib/gconvert.c:361 glib/gconvert.c:572 glib/giochannel.c:1289
-#: glib/giochannel.c:2176
+#: glib/giochannel.c:2175
 #, c-format
 msgid "Error during conversion: %s"
 msgstr "Errorea itzultzerakoan: %s"
@@ -129,19 +129,19 @@ msgstr "Aldaketa karaktere talde `%s'-tik `%s'-ra ez dago gaitua"
 msgid "Could not open converter from `%s' to `%s': %s"
 msgstr "Ezin ireki `%s'-tik `%s'-rako itzultzailea: %s"
 
-#: glib/giochannel.c:1461
+#: glib/giochannel.c:1460
 msgid "Can't do a raw read in g_io_channel_read_line_string"
 msgstr ""
 
-#: glib/giochannel.c:1508 glib/giochannel.c:1762 glib/giochannel.c:1848
+#: glib/giochannel.c:1507 glib/giochannel.c:1761 glib/giochannel.c:1847
 msgid "Leftover unconverted data in read buffer"
 msgstr ""
 
-#: glib/giochannel.c:1588 glib/giochannel.c:1662
+#: glib/giochannel.c:1587 glib/giochannel.c:1661
 msgid "Channel terminates in a partial character"
 msgstr ""
 
-#: glib/giochannel.c:1648
+#: glib/giochannel.c:1647
 msgid "Can't do a raw read in g_io_channel_read_to_end"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index a858e844d..86f2f9fc1 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glib 1.3.2\n"
-"POT-Creation-Date: 2001-10-22 09:35-0400\n"
+"POT-Creation-Date: 2001-11-22 14:08-0500\n"
 "PO-Revision-Date: 2001-03-02 12:34+0100\n"
 "Last-Translator: Christophe Merlet (RedFox) <redfox@eikonex.org>\n"
 "Language-Team: GNOME French Team <gnomefr@gnomefr.traduc.org>\n"
@@ -25,13 +25,13 @@ msgid "Could not open converter from '%s' to '%s': %s"
 msgstr "Ne peut ouvrir le convertisseur de � %s � vers � %s � : %s"
 
 #: glib/gconvert.c:356 glib/gconvert.c:639 glib/giochannel.c:1282
-#: glib/giochannel.c:1324 glib/giochannel.c:2164 glib/gutf8.c:875
+#: glib/giochannel.c:1324 glib/giochannel.c:2163 glib/gutf8.c:875
 #: glib/gutf8.c:1321
 msgid "Invalid byte sequence in conversion input"
 msgstr "S�quence d'octets invalide en entr�e du convertisseur"
 
 #: glib/gconvert.c:361 glib/gconvert.c:572 glib/giochannel.c:1289
-#: glib/giochannel.c:2176
+#: glib/giochannel.c:2175
 #, c-format
 msgid "Error during conversion: %s"
 msgstr "Erreur durand la conversion : %s"
@@ -133,19 +133,19 @@ msgstr ""
 msgid "Could not open converter from `%s' to `%s': %s"
 msgstr "Ne peut ouvrir le convertisseur de � %s � vers � %s � : %s"
 
-#: glib/giochannel.c:1461
+#: glib/giochannel.c:1460
 msgid "Can't do a raw read in g_io_channel_read_line_string"
 msgstr ""
 
-#: glib/giochannel.c:1508 glib/giochannel.c:1762 glib/giochannel.c:1848
+#: glib/giochannel.c:1507 glib/giochannel.c:1761 glib/giochannel.c:1847
 msgid "Leftover unconverted data in read buffer"
 msgstr ""
 
-#: glib/giochannel.c:1588 glib/giochannel.c:1662
+#: glib/giochannel.c:1587 glib/giochannel.c:1661
 msgid "Channel terminates in a partial character"
 msgstr ""
 
-#: glib/giochannel.c:1648
+#: glib/giochannel.c:1647
 msgid "Can't do a raw read in g_io_channel_read_to_end"
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index 03559803a..eacc9c274 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glib 1.3.x\n"
-"POT-Creation-Date: 2001-11-15 16:48+0900\n"
+"POT-Creation-Date: 2001-11-22 14:08-0500\n"
 "PO-Revision-Date: 2001-10-27 02:34+0900\n"
 "Last-Translator: KUSANO Takayuki <AE5T-KSN@asahi-net.or.jp>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -24,13 +24,13 @@ msgid "Could not open converter from '%s' to '%s': %s"
 msgstr "'%s' ���� '%s' �ؤΥ���С����򳫤��ޤ���: %s"
 
 #: glib/gconvert.c:356 glib/gconvert.c:639 glib/giochannel.c:1282
-#: glib/giochannel.c:1324 glib/giochannel.c:2164 glib/gutf8.c:875
+#: glib/giochannel.c:1324 glib/giochannel.c:2163 glib/gutf8.c:875
 #: glib/gutf8.c:1321
 msgid "Invalid byte sequence in conversion input"
 msgstr "�Ѵ��ؤ����Ϥ��������ʤ��Х��Ȥ��¤Ӥ�����ޤ�"
 
 #: glib/gconvert.c:361 glib/gconvert.c:572 glib/giochannel.c:1289
-#: glib/giochannel.c:2176
+#: glib/giochannel.c:2175
 #, c-format
 msgid "Error during conversion: %s"
 msgstr "�Ѵ���˥��顼: %s"
@@ -129,19 +129,19 @@ msgstr "ʸ
 msgid "Could not open converter from `%s' to `%s': %s"
 msgstr "'%s' ���� '%s' �ؤΥ���С����򳫤��ޤ���: %s"
 
-#: glib/giochannel.c:1461
+#: glib/giochannel.c:1460
 msgid "Can't do a raw read in g_io_channel_read_line_string"
 msgstr "g_io_channel_read_line_string �Ǥ� raw �⡼�ɤ��ɤ�ޤ���"
 
-#: glib/giochannel.c:1508 glib/giochannel.c:1762 glib/giochannel.c:1848
+#: glib/giochannel.c:1507 glib/giochannel.c:1761 glib/giochannel.c:1847
 msgid "Leftover unconverted data in read buffer"
 msgstr "�Ѵ�����Ƥ��ʤ��ǡ������ɤߤ��ߥХåե��˻ĤäƤ��ޤ�"
 
-#: glib/giochannel.c:1588 glib/giochannel.c:1662
+#: glib/giochannel.c:1587 glib/giochannel.c:1661
 msgid "Channel terminates in a partial character"
 msgstr "�����ͥ뤬�Դ�����ʸ���ǽ���äƤ��ޤ�"
 
-#: glib/giochannel.c:1648
+#: glib/giochannel.c:1647
 msgid "Can't do a raw read in g_io_channel_read_to_end"
 msgstr "g_io_channel_read_to_end �Ǥ� raw �⡼�ɤ��ɤ�ޤ���"
 
diff --git a/po/nn.po b/po/nn.po
index 51bd95a08..f92fd732b 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: KDEADMIN/kcron\n"
-"POT-Creation-Date: 2001-10-22 09:35-0400\n"
+"POT-Creation-Date: 2001-11-22 14:08-0500\n"
 "PO-Revision-Date: 2001-09-06 00:24GMT\n"
 "Last-Translator: Roy-Magne Mo <rmo@sunnmore.net>\n"
 "Language-Team: nynorsk <nn@li.org>\n"
@@ -25,13 +25,13 @@ msgid "Could not open converter from '%s' to '%s': %s"
 msgstr "Kunne ikkje opne konverterar fr� '%s' til '%s': %s"
 
 #: glib/gconvert.c:356 glib/gconvert.c:639 glib/giochannel.c:1282
-#: glib/giochannel.c:1324 glib/giochannel.c:2164 glib/gutf8.c:875
+#: glib/giochannel.c:1324 glib/giochannel.c:2163 glib/gutf8.c:875
 #: glib/gutf8.c:1321
 msgid "Invalid byte sequence in conversion input"
 msgstr "Ugyldig bytesekvens i inndata for konvertering"
 
 #: glib/gconvert.c:361 glib/gconvert.c:572 glib/giochannel.c:1289
-#: glib/giochannel.c:2176
+#: glib/giochannel.c:2175
 #, c-format
 msgid "Error during conversion: %s"
 msgstr "Feil under konvertering: %s"
@@ -130,19 +130,19 @@ msgstr "Konvertering fr
 msgid "Could not open converter from `%s' to `%s': %s"
 msgstr "Kunne ikkje opne konverterar fr� '%s' til '%s': %s"
 
-#: glib/giochannel.c:1461
+#: glib/giochannel.c:1460
 msgid "Can't do a raw read in g_io_channel_read_line_string"
 msgstr ""
 
-#: glib/giochannel.c:1508 glib/giochannel.c:1762 glib/giochannel.c:1848
+#: glib/giochannel.c:1507 glib/giochannel.c:1761 glib/giochannel.c:1847
 msgid "Leftover unconverted data in read buffer"
 msgstr ""
 
-#: glib/giochannel.c:1588 glib/giochannel.c:1662
+#: glib/giochannel.c:1587 glib/giochannel.c:1661
 msgid "Channel terminates in a partial character"
 msgstr ""
 
-#: glib/giochannel.c:1648
+#: glib/giochannel.c:1647
 msgid "Can't do a raw read in g_io_channel_read_to_end"
 msgstr ""
 
diff --git a/po/no.po b/po/no.po
index 9b80a061d..a765b1629 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glib 1.3.3\n"
-"POT-Creation-Date: 2001-11-11 12:53+0100\n"
+"POT-Creation-Date: 2001-11-22 14:08-0500\n"
 "PO-Revision-Date: 2001-11-11 13:02+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -24,13 +24,13 @@ msgid "Could not open converter from '%s' to '%s': %s"
 msgstr "Kunne ikke �pne konverterer fra '%s' til '%s': %s"
 
 #: glib/gconvert.c:356 glib/gconvert.c:639 glib/giochannel.c:1282
-#: glib/giochannel.c:1324 glib/giochannel.c:2164 glib/gutf8.c:875
+#: glib/giochannel.c:1324 glib/giochannel.c:2163 glib/gutf8.c:875
 #: glib/gutf8.c:1321
 msgid "Invalid byte sequence in conversion input"
 msgstr "Ugyldig bytesekvens i inndata for konvertering"
 
 #: glib/gconvert.c:361 glib/gconvert.c:572 glib/giochannel.c:1289
-#: glib/giochannel.c:2176
+#: glib/giochannel.c:2175
 #, c-format
 msgid "Error during conversion: %s"
 msgstr "Feil under konvertering: %s"
@@ -129,19 +129,19 @@ msgstr "Konvertering fra tegnsett `%s' til `%s' er ikke st
 msgid "Could not open converter from `%s' to `%s': %s"
 msgstr "Kunne ikke �pne konverterer fra `%s' til `%s': %s"
 
-#: glib/giochannel.c:1461
+#: glib/giochannel.c:1460
 msgid "Can't do a raw read in g_io_channel_read_line_string"
 msgstr "Kan ikke utf�re r� avlesing i g_io_channel_read_line_string"
 
-#: glib/giochannel.c:1508 glib/giochannel.c:1762 glib/giochannel.c:1848
+#: glib/giochannel.c:1507 glib/giochannel.c:1761 glib/giochannel.c:1847
 msgid "Leftover unconverted data in read buffer"
 msgstr "Overfl�dig ikke-konvertert data i innlesingsbuffer"
 
-#: glib/giochannel.c:1588 glib/giochannel.c:1662
+#: glib/giochannel.c:1587 glib/giochannel.c:1661
 msgid "Channel terminates in a partial character"
 msgstr "Kanalen terminerer i et oppdelt tegn"
 
-#: glib/giochannel.c:1648
+#: glib/giochannel.c:1647
 msgid "Can't do a raw read in g_io_channel_read_to_end"
 msgstr "Kan ikke utf�re r� avlesing i g_io_channel_read_to_end"
 
diff --git a/po/ro.po b/po/ro.po
index b8b4ab53b..580229781 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glib 1.3.10\n"
-"POT-Creation-Date: 2001-10-22 09:35-0400\n"
+"POT-Creation-Date: 2001-11-22 14:08-0500\n"
 "PO-Revision-Date: 2001-10-22 09:35-0400\n"
 "Last-Translator: Marius Andreiana <mandreiana@yahoo.com>\n"
 "Language-Team: Română <ro@li.org>\n"
@@ -24,13 +24,13 @@ msgid "Could not open converter from '%s' to '%s': %s"
 msgstr "Nu s-a putut deschide convertorul de la '%s' la '%s': %s"
 
 #: glib/gconvert.c:356 glib/gconvert.c:639 glib/giochannel.c:1282
-#: glib/giochannel.c:1324 glib/giochannel.c:2164 glib/gutf8.c:875
+#: glib/giochannel.c:1324 glib/giochannel.c:2163 glib/gutf8.c:875
 #: glib/gutf8.c:1321
 msgid "Invalid byte sequence in conversion input"
 msgstr "Secvenţă de octeţi invalidă în intrarea de conversie"
 
 #: glib/gconvert.c:361 glib/gconvert.c:572 glib/giochannel.c:1289
-#: glib/giochannel.c:2176
+#: glib/giochannel.c:2175
 #, c-format
 msgid "Error during conversion: %s"
 msgstr "Eroare în timpul conversiei: %s"
@@ -129,19 +129,19 @@ msgstr "Conversia din setul de caractere '%s' la '%s' nu este suportată"
 msgid "Could not open converter from `%s' to `%s': %s"
 msgstr "Nu s-a putut deschide convertorul de la '%s' la '%s': %s"
 
-#: glib/giochannel.c:1461
+#: glib/giochannel.c:1460
 msgid "Can't do a raw read in g_io_channel_read_line_string"
 msgstr "Nu pot face o citire brută în g_io_channel_read_line_string"
 
-#: glib/giochannel.c:1508 glib/giochannel.c:1762 glib/giochannel.c:1848
+#: glib/giochannel.c:1507 glib/giochannel.c:1761 glib/giochannel.c:1847
 msgid "Leftover unconverted data in read buffer"
 msgstr "Date neconvertite rămase în memoria tampon pentru citire"
 
-#: glib/giochannel.c:1588 glib/giochannel.c:1662
+#: glib/giochannel.c:1587 glib/giochannel.c:1661
 msgid "Channel terminates in a partial character"
 msgstr "Canalul se termină într-un caracter parţial"
 
-#: glib/giochannel.c:1648
+#: glib/giochannel.c:1647
 msgid "Can't do a raw read in g_io_channel_read_to_end"
 msgstr "Nu pot face o citire brută în g_io_channel_read_to_end"
 
@@ -170,7 +170,9 @@ msgstr "Eroare la linia %d: %s"
 #: glib/gmarkup.c:379
 msgid ""
 "Empty entity '&;' seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
-msgstr "Entitate goală '&;' văzută; entităţile valide sunt: &amp; &quot; &lt; &gt; &apos;"
+msgstr ""
+"Entitate goală '&;' văzută; entităţile valide sunt: &amp; &quot; &lt; &gt; "
+"&apos;"
 
 #: glib/gmarkup.c:389
 #, c-format
@@ -178,8 +180,10 @@ msgid ""
 "Character '%s' is not valid at the start of an entity name; the & character "
 "begins an entity; if this ampersand isn't supposed to be an entity, escape "
 "it as &amp;"
-msgstr "Caracterul '%s' nu este valid la începutul numelui entităţii; caracterul '&' "
-"începe o entitate; dacă acest ampersand nu ar trebui să fie o entitate folosiţi &amp;" 
+msgstr ""
+"Caracterul '%s' nu este valid la începutul numelui entităţii; caracterul '&' "
+"începe o entitate; dacă acest ampersand nu ar trebui să fie o entitate "
+"folosiţi &amp;"
 
 #: glib/gmarkup.c:425
 #, c-format
@@ -195,15 +199,17 @@ msgstr "Numele entităţii '%s' nu este cunoscut"
 msgid ""
 "Entity did not end with a semicolon; most likely you used an ampersand "
 "character without intending to start an entity - escape ampersand as &amp;"
-msgstr "Entitatea nu s-a terminat cu punct şi virgulă; probabil că aţi folosit "
-"un caracter ampersand fără intenţia de a începe o entitate - folosiţi &amp;"
+msgstr ""
+"Entitatea nu s-a terminat cu punct şi virgulă; probabil că aţi folosit un "
+"caracter ampersand fără intenţia de a începe o entitate - folosiţi &amp;"
 
 #: glib/gmarkup.c:525
 #, c-format
 msgid ""
 "Failed to parse '%s', which should have been a digit inside a character "
 "reference (&#234; for example) - perhaps the digit is too large"
-msgstr "Eşuare la parsarea '%s', care ar fi trebui să fie o cifră într-un referinţă "
+msgstr ""
+"Eşuare la parsarea '%s', care ar fi trebui să fie o cifră într-un referinţă "
 "caracter (de exemplu &#234;) - poate cifra este prea mare"
 
 #: glib/gmarkup.c:550
@@ -220,8 +226,10 @@ msgid ""
 "Character reference did not end with a semicolon; most likely you used an "
 "ampersand character without intending to start an entity - escape ampersand "
 "as &amp;"
-msgstr "Referinţa caracter nu s-a terminat cu punct şi virgulă; probabil că aţi folosit "
-"un caracter ampersand fără intenţia de a începe o entitate - folosiţi &amp;"
+msgstr ""
+"Referinţa caracter nu s-a terminat cu punct şi virgulă; probabil că aţi "
+"folosit un caracter ampersand fără intenţia de a începe o entitate - "
+"folosiţi &amp;"
 
 #: glib/gmarkup.c:827 glib/gmarkup.c:855 glib/gmarkup.c:886
 msgid "Invalid UTF-8 encoded text"
@@ -236,7 +244,8 @@ msgstr "Documentul trebuie să înceapă cu un element (e.g. <carte>)"
 msgid ""
 "'%s' is not a valid character following a '<' character; it may not begin an "
 "element name"
-msgstr "'%s' nu este un caracter valid care urmează dupa caracterul '<'; nu poate să "
+msgstr ""
+"'%s' nu este un caracter valid care urmează dupa caracterul '<'; nu poate să "
 "înceapă un nume element"
 
 #: glib/gmarkup.c:1023
@@ -244,14 +253,16 @@ msgstr "'%s' nu este un caracter valid care urmează dupa caracterul '<'; nu poa
 msgid ""
 "Odd character '%s', expected a '>' character to end the start tag of element "
 "'%s'"
-msgstr "Caracter '%s' ciudat, aşteptam un '>' pentru a termina tagul de început al "
+msgstr ""
+"Caracter '%s' ciudat, aşteptam un '>' pentru a termina tagul de început al "
 "elementului '%s'"
 
 #: glib/gmarkup.c:1110
 #, c-format
 msgid ""
 "Odd character '%s', expected a '=' after attribute name '%s' of element '%s'"
-msgstr "Caracter '%s' ciudat, aşteptam un '=' după numele atributului '%s' al "
+msgstr ""
+"Caracter '%s' ciudat, aşteptam un '=' după numele atributului '%s' al "
 "elementului '%s'"
 
 #: glib/gmarkup.c:1151
@@ -260,16 +271,18 @@ msgid ""
 "Odd character '%s', expected a '>' or '/' character to end the start tag of "
 "element '%s', or optionally an attribute; perhaps you used an invalid "
 "character in an attribute name"
-msgstr "Caracter '%s' ciudat, aşteptam un '>' sau '/' pentru a termina tagul de început al "
-"elementului '%s', sau opţional un atribut; poate aţi folosit un caracter invalid în "
-"numele atributului"
+msgstr ""
+"Caracter '%s' ciudat, aşteptam un '>' sau '/' pentru a termina tagul de "
+"început al elementului '%s', sau opţional un atribut; poate aţi folosit un "
+"caracter invalid în numele atributului"
 
 #: glib/gmarkup.c:1224
 #, c-format
 msgid ""
 "Odd character '%s', expected an open quote mark after the equals sign when "
 "giving value for attribute '%s' of element '%s'"
-msgstr "Caracter '%s' ciudat, aşteptam ghilimele de început după semnul egal pentru "
+msgstr ""
+"Caracter '%s' ciudat, aşteptam ghilimele de început după semnul egal pentru "
 "a da valoarea atributului '%s' al elementului '%s'"
 
 #: glib/gmarkup.c:1351
@@ -277,8 +290,9 @@ msgstr "Caracter '%s' ciudat, aşteptam ghilimele de început după semnul egal
 msgid ""
 "'%s' is not a valid character following the characters '</'; '%s' may not "
 "begin an element name"
-msgstr "'%s' nu este un caracter valid urmând caracterelor '</'; '%s' nu poate "
-"să înceapă un nume de element"
+msgstr ""
+"'%s' nu este un caracter valid urmând caracterelor '</'; '%s' nu poate să "
+"înceapă un nume de element"
 
 #: glib/gmarkup.c:1388
 #, c-format
@@ -295,8 +309,9 @@ msgstr "Elementul '%s' a fost închis, dar elementul deschis curent este '%s'"
 msgid ""
 "'%s' is not a valid character following the close element name '%s'; the "
 "allowed character is '>'"
-msgstr "'%s' nu este un caracter valid urmând închiderea elementului '%s'; caracterul "
-"permis este '>'"
+msgstr ""
+"'%s' nu este un caracter valid urmând închiderea elementului '%s'; "
+"caracterul permis este '>'"
 
 #: glib/gmarkup.c:1541
 msgid "Document was empty or contained only whitespace"
@@ -311,15 +326,17 @@ msgstr "Documentul s-a terminat neaşteptat imediat dupa un caracter '<'"
 msgid ""
 "Document ended unexpectedly with elements still open - '%s' was the last "
 "element opened"
-msgstr "Documentul s-a terminat neaşteptat cu elemente încă deschise - '%s' a fost ultimul "
-"element deschis"
+msgstr ""
+"Documentul s-a terminat neaşteptat cu elemente încă deschise - '%s' a fost "
+"ultimul element deschis"
 
 #: glib/gmarkup.c:1571
 #, c-format
 msgid ""
 "Document ended unexpectedly, expected to see a close angle bracket ending "
 "the tag <%s/>"
-msgstr "Documentul s-a terminat neaşteptat, mă aşteptat să vad un caracter '>' care "
+msgstr ""
+"Documentul s-a terminat neaşteptat, mă aşteptat să vad un caracter '>' care "
 "să termine tagul <%s/>"
 
 #: glib/gmarkup.c:1577
@@ -338,8 +355,9 @@ msgstr "Documentul s-a terminat neaşteptat într-un tag deschidere element"
 msgid ""
 "Document ended unexpectedly after the equals sign following an attribute "
 "name; no attribute value"
-msgstr "Documentul s-a terminat neaşteptat după semnul egal ce urma un nume "
-"atribut; nici o valoare pentru atribut"
+msgstr ""
+"Documentul s-a terminat neaşteptat după semnul egal ce urma un nume atribut; "
+"nici o valoare pentru atribut"
 
 #: glib/gmarkup.c:1599
 msgid "Document ended unexpectedly while inside an attribute value"
@@ -348,11 +366,14 @@ msgstr "Documentul s-a terminat neaşteptat în valoarea unui atribut"
 #: glib/gmarkup.c:1614
 #, c-format
 msgid "Document ended unexpectedly inside the close tag for element '%s'"
-msgstr "Documentul s-a terminat neaşteptat în tagul închidere pentru elementul '%s'"
+msgstr ""
+"Documentul s-a terminat neaşteptat în tagul închidere pentru elementul '%s'"
 
 #: glib/gmarkup.c:1620
 msgid "Document ended unexpectedly inside a comment or processing instruction"
-msgstr "Documentul s-a terminat neaşteptat într-un comentariu sau instrucţiune de procesare"
+msgstr ""
+"Documentul s-a terminat neaşteptat într-un comentariu sau instrucţiune de "
+"procesare"
 
 #: glib/gshell.c:69
 msgid "Quoted text doesn't begin with a quotation mark"
@@ -360,7 +381,8 @@ msgstr "Textul citat nu începe cu semnul de citare"
 
 #: glib/gshell.c:159
 msgid "Unmatched quotation mark in command line or other shell-quoted text"
-msgstr "Semn de întrebare nepotrivit în linia de comandă sau alt text citat de shell"
+msgstr ""
+"Semn de întrebare nepotrivit în linia de comandă sau alt text citat de shell"
 
 #: glib/gshell.c:526
 #, c-format
@@ -370,7 +392,8 @@ msgstr "Textul s-a terminal imediat după un caracter '' (textul era '%s')"
 #: glib/gshell.c:533
 #, c-format
 msgid "Text ended before matching quote was found for %c. (The text was '%s')"
-msgstr "Textul s-a terminal înainte de găsirea ghilimelei pentru %c (textul era '%s')"
+msgstr ""
+"Textul s-a terminal înainte de găsirea ghilimelei pentru %c (textul era '%s')"
 
 #: glib/gshell.c:545
 msgid "Text was empty (or contained only whitespace)"
@@ -384,7 +407,8 @@ msgstr "Eşuare la citirea datelor de la procesul copil"
 msgid ""
 "Unexpected error in g_io_channel_win32_poll() reading data from a child "
 "process"
-msgstr "Eroare neaşteptată în g_io_channel_win32_poll() la citirea datelor din "
+msgstr ""
+"Eroare neaşteptată în g_io_channel_win32_poll() la citirea datelor din "
 "procesul copil"
 
 #: glib/gspawn-win32.c:837 glib/gspawn.c:907
@@ -405,7 +429,8 @@ msgstr "Eşuare la execuţia procesului copil (%s)"
 #: glib/gspawn-win32.c:975 glib/gspawn.c:1219
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
-msgstr "Eşuare la crearea conectorului pipe pentru comunicare cu procesul copil (%s)"
+msgstr ""
+"Eşuare la crearea conectorului pipe pentru comunicare cu procesul copil (%s)"
 
 #: glib/gspawn.c:159
 #, c-format
@@ -415,7 +440,8 @@ msgstr "Eşuare la citirea datelor din procesul copil (%s)"
 #: glib/gspawn.c:290
 #, c-format
 msgid "Unexpected error in select() reading data from a child process (%s)"
-msgstr "Eroare neaşteptată în select() la citirea datelor din  procesul copil (%s)"
+msgstr ""
+"Eroare neaşteptată în select() la citirea datelor din  procesul copil (%s)"
 
 #: glib/gspawn.c:373
 #, c-format
diff --git a/po/ru.po b/po/ru.po
index e7c48d02c..30c7d45db 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glib\n"
-"POT-Creation-Date: 2001-10-22 09:35-0400\n"
+"POT-Creation-Date: 2001-11-22 14:08-0500\n"
 "PO-Revision-Date: 2001-10-13 15:46+0400\n"
 "Last-Translator: Valek Filippov <frob@df.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -23,14 +23,14 @@ msgid "Could not open converter from '%s' to '%s': %s"
 msgstr "�� ������� ������� ��������������� �� \"%s\" � \"%s\": %s"
 
 #: glib/gconvert.c:356 glib/gconvert.c:639 glib/giochannel.c:1282
-#: glib/giochannel.c:1324 glib/giochannel.c:2164 glib/gutf8.c:875
+#: glib/giochannel.c:1324 glib/giochannel.c:2163 glib/gutf8.c:875
 #: glib/gutf8.c:1321
 msgid "Invalid byte sequence in conversion input"
 msgstr ""
 "������������ ������������������ ������ � ������� ������ ��� ��������������"
 
 #: glib/gconvert.c:361 glib/gconvert.c:572 glib/giochannel.c:1289
-#: glib/giochannel.c:2176
+#: glib/giochannel.c:2175
 #, c-format
 msgid "Error during conversion: %s"
 msgstr "������ ��� ��������������: %s"
@@ -129,20 +129,20 @@ msgstr "
 msgid "Could not open converter from `%s' to `%s': %s"
 msgstr "�� ������� ������� ��������������� �� \"%s\" � \"%s\": %s"
 
-#: glib/giochannel.c:1461
+#: glib/giochannel.c:1460
 msgid "Can't do a raw read in g_io_channel_read_line_string"
 msgstr ""
 "���������� ��������� ���������������� ������ � g_io_channel_read_line_string"
 
-#: glib/giochannel.c:1508 glib/giochannel.c:1762 glib/giochannel.c:1848
+#: glib/giochannel.c:1507 glib/giochannel.c:1761 glib/giochannel.c:1847
 msgid "Leftover unconverted data in read buffer"
 msgstr ""
 
-#: glib/giochannel.c:1588 glib/giochannel.c:1662
+#: glib/giochannel.c:1587 glib/giochannel.c:1661
 msgid "Channel terminates in a partial character"
 msgstr ""
 
-#: glib/giochannel.c:1648
+#: glib/giochannel.c:1647
 msgid "Can't do a raw read in g_io_channel_read_to_end"
 msgstr ""
 "���������� ��������� ���������������� ������ � g_io_channel_read_to_end"
diff --git a/po/sk.po b/po/sk.po
index 839d180c9..ac4a86ab3 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glib 1.3.8\n"
-"POT-Creation-Date: 2001-10-22 09:35-0400\n"
+"POT-Creation-Date: 2001-11-22 14:08-0500\n"
 "PO-Revision-Date: 2001-10-13 19:08CET\n"
 "Last-Translator: Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -25,13 +25,13 @@ msgid "Could not open converter from '%s' to '%s': %s"
 msgstr "Nepodarilo sa otvoriť program pre prevod '%s' do '%s': %s"
 
 #: glib/gconvert.c:356 glib/gconvert.c:639 glib/giochannel.c:1282
-#: glib/giochannel.c:1324 glib/giochannel.c:2164 glib/gutf8.c:875
+#: glib/giochannel.c:1324 glib/giochannel.c:2163 glib/gutf8.c:875
 #: glib/gutf8.c:1321
 msgid "Invalid byte sequence in conversion input"
 msgstr "Neplatná sekvencia bajtov na vstupe prevodu"
 
 #: glib/gconvert.c:361 glib/gconvert.c:572 glib/giochannel.c:1289
-#: glib/giochannel.c:2176
+#: glib/giochannel.c:2175
 #, c-format
 msgid "Error during conversion: %s"
 msgstr "Chyba počas prevodu: %s"
@@ -130,19 +130,19 @@ msgstr "Prevod zo znakovej sady `%s' do `%s' nie je podporovaný"
 msgid "Could not open converter from `%s' to `%s': %s"
 msgstr "Nepodarilo sa otvoriť program pre prevod `%s' do `%s': %s"
 
-#: glib/giochannel.c:1461
+#: glib/giochannel.c:1460
 msgid "Can't do a raw read in g_io_channel_read_line_string"
 msgstr "Nepodarilo sa 'raw' čítanie v g_io_channel_read_line_string"
 
-#: glib/giochannel.c:1508 glib/giochannel.c:1762 glib/giochannel.c:1848
+#: glib/giochannel.c:1507 glib/giochannel.c:1761 glib/giochannel.c:1847
 msgid "Leftover unconverted data in read buffer"
 msgstr "Zanechané neprevedené dáta vo vstupnom bufferi"
 
-#: glib/giochannel.c:1588 glib/giochannel.c:1662
+#: glib/giochannel.c:1587 glib/giochannel.c:1661
 msgid "Channel terminates in a partial character"
 msgstr "Kanál končí čiastočným znakom"
 
-#: glib/giochannel.c:1648
+#: glib/giochannel.c:1647
 msgid "Can't do a raw read in g_io_channel_read_to_end"
 msgstr "Nepodarilo sa 'raw' čítanie v g_io_channel_read_to_end"
 
diff --git a/po/sl.po b/po/sl.po
index 560b9f62b..59fa9a31c 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glib\n"
-"POT-Creation-Date: 2001-09-23 00:53+0200\n"
+"POT-Creation-Date: 2001-11-22 14:08-0500\n"
 "PO-Revision-Date: 2001-02-16 12:30+0200\n"
 "Last-Translator: Andraz Tori <andraz.tori1@guest.arnes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -13,66 +13,69 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: glib/gconvert.c:143
-#, c-format
-msgid "Conversion from character set `%s' to `%s' is not supported"
+#: glib/gconvert.c:202
+#, fuzzy, c-format
+msgid "Conversion from character set '%s' to '%s' is not supported"
 msgstr "Pretvorba iz nabora znakov `%s' v `%s' ni podprta"
 
-#: glib/gconvert.c:147
-#, c-format
-msgid "Could not open converter from `%s' to `%s': %s"
+#: glib/gconvert.c:206
+#, fuzzy, c-format
+msgid "Could not open converter from '%s' to '%s': %s"
 msgstr "Nisem mogel odpreti pretvornika iz `%s' v `%s': %s"
 
-#: glib/gconvert.c:297 glib/gconvert.c:580 glib/gutf8.c:823 glib/gutf8.c:1269
+#: glib/gconvert.c:356 glib/gconvert.c:639 glib/giochannel.c:1282
+#: glib/giochannel.c:1324 glib/giochannel.c:2163 glib/gutf8.c:875
+#: glib/gutf8.c:1321
 msgid "Invalid byte sequence in conversion input"
 msgstr "Neveljavna sekvenca bajtov na vhodu pretvorbe"
 
-#: glib/gconvert.c:302 glib/gconvert.c:513
+#: glib/gconvert.c:361 glib/gconvert.c:572 glib/giochannel.c:1289
+#: glib/giochannel.c:2175
 #, c-format
 msgid "Error during conversion: %s"
 msgstr "Napaka med pretvorbo: %s"
 
-#: glib/gconvert.c:320 glib/gutf8.c:819 glib/gutf8.c:1019 glib/gutf8.c:1160
-#: glib/gutf8.c:1265
+#: glib/gconvert.c:379 glib/gutf8.c:871 glib/gutf8.c:1071 glib/gutf8.c:1212
+#: glib/gutf8.c:1317
 msgid "Partial character sequence at end of input"
 msgstr "Delna (nedokon�ana) sekvenca znakov na koncu vhoda"
 
-#: glib/gconvert.c:488
+#: glib/gconvert.c:547
 #, c-format
 msgid "Cannot convert fallback '%s' to codeset '%s'"
 msgstr "Ne morem pretvoriti '%s' v nabor znakov '%s'"
 
-#: glib/gconvert.c:1202
-#, c-format
-msgid "The URI `%s' is not an absolute URI using the file scheme"
+#: glib/gconvert.c:1261
+#, fuzzy, c-format
+msgid "The URI '%s' is not an absolute URI using the file scheme"
 msgstr "URI `%s' pri uporabi sheme datotek ni absoluten"
 
-#: glib/gconvert.c:1212
-#, c-format
-msgid "The local file URI `%s' may not include a `#'"
+#: glib/gconvert.c:1271
+#, fuzzy, c-format
+msgid "The local file URI '%s' may not include a '#'"
 msgstr "Krajevna datoteka URI `%s' ne sme vsebovati `#'"
 
-#: glib/gconvert.c:1229
-#, c-format
-msgid "The URI `%s' is invalid"
+#: glib/gconvert.c:1288
+#, fuzzy, c-format
+msgid "The URI '%s' is invalid"
 msgstr "URI `%s' je neveljaven"
 
-#: glib/gconvert.c:1238
-#, c-format
-msgid "The hostname of the URI `%s' contains invalidly escaped characters"
+#: glib/gconvert.c:1297
+#, fuzzy, c-format
+msgid "The hostname of the URI '%s' contains invalidly escaped characters"
 msgstr "Ime gostitelja URI `%s' vsebuje neveljavne ube�ne znake"
 
-#: glib/gconvert.c:1254
-#, c-format
-msgid "The URI `%s' contains invalidly escaped characters"
+#: glib/gconvert.c:1313
+#, fuzzy, c-format
+msgid "The URI '%s' contains invalidly escaped characters"
 msgstr "URI `%s' vsebuje neveljavne ube�ne znake"
 
-#: glib/gconvert.c:1297
+#: glib/gconvert.c:1356
 #, c-format
 msgid "The pathname '%s' is not an absolute path"
 msgstr "Pot '%s' ni absolutna pot"
 
-#: glib/gconvert.c:1311
+#: glib/gconvert.c:1370
 msgid "Invalid byte sequence in hostname"
 msgstr "Neveljavno zaporedje bajtov v imenu gostitelja"
 
@@ -102,6 +105,7 @@ msgid "Failed to open file '%s': fdopen() failed: %s"
 msgstr "Nisem uspel odpreti datoteke '%s': fdopen() ni uspel: %s"
 
 #: glib/gfileutils.c:655
+#, c-format
 msgid "Template '%s' invalid, should not contain a '%s'"
 msgstr "�ablona '%s' je neveljavna, ne bi smela vsebovati '%s'"
 
@@ -115,6 +119,44 @@ msgstr "
 msgid "Failed to create file '%s': %s"
 msgstr "Nisem uspel ustvariti datoteke '%s' %s"
 
+#: glib/giochannel.c:1110
+#, c-format
+msgid "Conversion from character set `%s' to `%s' is not supported"
+msgstr "Pretvorba iz nabora znakov `%s' v `%s' ni podprta"
+
+#: glib/giochannel.c:1114
+#, c-format
+msgid "Could not open converter from `%s' to `%s': %s"
+msgstr "Nisem mogel odpreti pretvornika iz `%s' v `%s': %s"
+
+#: glib/giochannel.c:1460
+msgid "Can't do a raw read in g_io_channel_read_line_string"
+msgstr ""
+
+#: glib/giochannel.c:1507 glib/giochannel.c:1761 glib/giochannel.c:1847
+msgid "Leftover unconverted data in read buffer"
+msgstr ""
+
+#: glib/giochannel.c:1587 glib/giochannel.c:1661
+msgid "Channel terminates in a partial character"
+msgstr ""
+
+#: glib/giochannel.c:1647
+msgid "Can't do a raw read in g_io_channel_read_to_end"
+msgstr ""
+
+#: glib/giowin32.c:701 glib/giowin32.c:730
+msgid "Incorrect message size"
+msgstr ""
+
+#: glib/giowin32.c:1024 glib/giowin32.c:1077
+msgid "Socket error"
+msgstr ""
+
+#: glib/giowin32.c:1277
+msgid "Channel set flags unsupported"
+msgstr ""
+
 #: glib/gmarkup.c:216
 #, c-format
 msgid "Error on line %d char %d: %s"
@@ -366,17 +408,17 @@ msgstr ""
 msgid "Failed to read from child pipe (%s)"
 msgstr "Nisem uspel brati iz cevi otroka (%s)"
 
-#: glib/gspawn-win32.c:926 glib/gspawn.c:1112
+#: glib/gspawn-win32.c:925 glib/gspawn.c:1112
 #, c-format
 msgid "Failed to change to directory '%s' (%s)"
 msgstr "Nisem uspel spremeniti imenika v '%s' (%s)"
 
-#: glib/gspawn-win32.c:935 glib/gspawn.c:1122
+#: glib/gspawn-win32.c:934 glib/gspawn.c:1122
 #, c-format
 msgid "Failed to execute child process (%s)"
 msgstr "Nisem uspel izvesti procesa otroka (%s)"
 
-#: glib/gspawn-win32.c:976 glib/gspawn.c:1219
+#: glib/gspawn-win32.c:975 glib/gspawn.c:1219
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr "Nisem uspel ustvariti cevi za komunikacijo s procesom otroka (%s)"
@@ -421,15 +463,15 @@ msgstr "Neznana napaka med izvajanjem procesa otroka"
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr "Nisem uspel prebrati dovolj podatkov iz cevi otroka (%s)"
 
-#: glib/gutf8.c:898
+#: glib/gutf8.c:950
 msgid "Character out of range for UTF-8"
 msgstr "Znak izven intervala za UTF-8"
 
-#: glib/gutf8.c:987 glib/gutf8.c:996 glib/gutf8.c:1128 glib/gutf8.c:1137
-#: glib/gutf8.c:1279 glib/gutf8.c:1375
+#: glib/gutf8.c:1039 glib/gutf8.c:1048 glib/gutf8.c:1180 glib/gutf8.c:1189
+#: glib/gutf8.c:1331 glib/gutf8.c:1427
 msgid "Invalid sequence in conversion input"
 msgstr "Neveljavna sekvenca na vhodu pretvorbe"
 
-#: glib/gutf8.c:1290 glib/gutf8.c:1386
+#: glib/gutf8.c:1342 glib/gutf8.c:1438
 msgid "Character out of range for UTF-16"
 msgstr "Znak izven intervala za UTF-16"
diff --git a/po/sv.po b/po/sv.po
index c76ba1772..477572300 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glib\n"
-"POT-Creation-Date: 2001-10-22 09:35-0400\n"
+"POT-Creation-Date: 2001-11-22 14:08-0500\n"
 "PO-Revision-Date: 2001-09-11 21:20+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -26,13 +26,13 @@ msgid "Could not open converter from '%s' to '%s': %s"
 msgstr "Kunde inte �ppna konverteraren fr�n \"%s\" till \"%s\": %s"
 
 #: glib/gconvert.c:356 glib/gconvert.c:639 glib/giochannel.c:1282
-#: glib/giochannel.c:1324 glib/giochannel.c:2164 glib/gutf8.c:875
+#: glib/giochannel.c:1324 glib/giochannel.c:2163 glib/gutf8.c:875
 #: glib/gutf8.c:1321
 msgid "Invalid byte sequence in conversion input"
 msgstr "Ogiltig bytesekvens i konverteringsindata"
 
 #: glib/gconvert.c:361 glib/gconvert.c:572 glib/giochannel.c:1289
-#: glib/giochannel.c:2176
+#: glib/giochannel.c:2175
 #, c-format
 msgid "Error during conversion: %s"
 msgstr "Fel under konvertering: %s"
@@ -134,19 +134,19 @@ msgstr "Konvertering fr
 msgid "Could not open converter from `%s' to `%s': %s"
 msgstr "Kunde inte �ppna konverteraren fr�n \"%s\" till \"%s\": %s"
 
-#: glib/giochannel.c:1461
+#: glib/giochannel.c:1460
 msgid "Can't do a raw read in g_io_channel_read_line_string"
 msgstr ""
 
-#: glib/giochannel.c:1508 glib/giochannel.c:1762 glib/giochannel.c:1848
+#: glib/giochannel.c:1507 glib/giochannel.c:1761 glib/giochannel.c:1847
 msgid "Leftover unconverted data in read buffer"
 msgstr ""
 
-#: glib/giochannel.c:1588 glib/giochannel.c:1662
+#: glib/giochannel.c:1587 glib/giochannel.c:1661
 msgid "Channel terminates in a partial character"
 msgstr ""
 
-#: glib/giochannel.c:1648
+#: glib/giochannel.c:1647
 msgid "Can't do a raw read in g_io_channel_read_to_end"
 msgstr ""
 
diff --git a/po/ta.po b/po/ta.po
index 50dd79b71..e4396b0b7 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glib 1.5\n"
-"POT-Creation-Date: 2001-10-22 09:35-0400\n"
+"POT-Creation-Date: 2001-11-22 14:08-0500\n"
 "PO-Revision-Date: 2001-09-28 18:43-0500\n"
 "Last-Translator: Dinesh Nadarajah <n_dinesh@yahoo.com>\n"
 "Language-Team: Tamil <tamilinix@yahoogroups.com>\n"
@@ -24,13 +24,13 @@ msgid "Could not open converter from '%s' to '%s': %s"
 msgstr "`%s' '�� `%s' '�� ����� ���� ���Ȣ�� ���� ���Ţ���: %s"
 
 #: glib/gconvert.c:356 glib/gconvert.c:639 glib/giochannel.c:1282
-#: glib/giochannel.c:1324 glib/giochannel.c:2164 glib/gutf8.c:875
+#: glib/giochannel.c:1324 glib/giochannel.c:2163 glib/gutf8.c:875
 #: glib/gutf8.c:1321
 msgid "Invalid byte sequence in conversion input"
 msgstr "���� ���Ȣ¢� ��ǣ�� �â��� ��� �â��Ө�"
 
 #: glib/gconvert.c:361 glib/gconvert.c:572 glib/giochannel.c:1289
-#: glib/giochannel.c:2176
+#: glib/giochannel.c:2175
 #, c-format
 msgid "Error during conversion: %s"
 msgstr "����� ���� ����: %s"
@@ -130,19 +130,19 @@ msgstr "`%s', `%s' ¢
 msgid "Could not open converter from `%s' to `%s': %s"
 msgstr "`%s' '�� `%s' '�� ����� ���� ���Ȣ�� ���� ���Ţ���: %s"
 
-#: glib/giochannel.c:1461
+#: glib/giochannel.c:1460
 msgid "Can't do a raw read in g_io_channel_read_line_string"
 msgstr ""
 
-#: glib/giochannel.c:1508 glib/giochannel.c:1762 glib/giochannel.c:1848
+#: glib/giochannel.c:1507 glib/giochannel.c:1761 glib/giochannel.c:1847
 msgid "Leftover unconverted data in read buffer"
 msgstr ""
 
-#: glib/giochannel.c:1588 glib/giochannel.c:1662
+#: glib/giochannel.c:1587 glib/giochannel.c:1661
 msgid "Channel terminates in a partial character"
 msgstr ""
 
-#: glib/giochannel.c:1648
+#: glib/giochannel.c:1647
 msgid "Can't do a raw read in g_io_channel_read_to_end"
 msgstr ""
 
diff --git a/po/tr.po b/po/tr.po
index 01617766a..b462c5294 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glib 1.3.2\n"
-"POT-Creation-Date: 2001-10-22 09:35-0400\n"
+"POT-Creation-Date: 2001-11-22 14:08-0500\n"
 "PO-Revision-Date: 2001-02-05 20:28+0200\n"
 "Last-Translator: Kemal Y�lmaz <kyilmaz@uekae.tubitak.gov.tr>\n"
 "Language-Team: GNOME Turk <gnome-turk@gnome.org>\n"
@@ -24,13 +24,13 @@ msgid "Could not open converter from '%s' to '%s': %s"
 msgstr "`%s' den `%s' e d�n��t�r�c� a��lam�yor: %s"
 
 #: glib/gconvert.c:356 glib/gconvert.c:639 glib/giochannel.c:1282
-#: glib/giochannel.c:1324 glib/giochannel.c:2164 glib/gutf8.c:875
+#: glib/giochannel.c:1324 glib/giochannel.c:2163 glib/gutf8.c:875
 #: glib/gutf8.c:1321
 msgid "Invalid byte sequence in conversion input"
 msgstr "d�n���m girdisinde ge�ersiz bayt dizisi"
 
 #: glib/gconvert.c:361 glib/gconvert.c:572 glib/giochannel.c:1289
-#: glib/giochannel.c:2176
+#: glib/giochannel.c:2175
 #, c-format
 msgid "Error during conversion: %s"
 msgstr "d�n���m s�ras�nda hata olu�tu: %s"
@@ -132,19 +132,19 @@ msgstr "`%s' karakter k
 msgid "Could not open converter from `%s' to `%s': %s"
 msgstr "`%s' den `%s' e d�n��t�r�c� a��lam�yor: %s"
 
-#: glib/giochannel.c:1461
+#: glib/giochannel.c:1460
 msgid "Can't do a raw read in g_io_channel_read_line_string"
 msgstr ""
 
-#: glib/giochannel.c:1508 glib/giochannel.c:1762 glib/giochannel.c:1848
+#: glib/giochannel.c:1507 glib/giochannel.c:1761 glib/giochannel.c:1847
 msgid "Leftover unconverted data in read buffer"
 msgstr ""
 
-#: glib/giochannel.c:1588 glib/giochannel.c:1662
+#: glib/giochannel.c:1587 glib/giochannel.c:1661
 msgid "Channel terminates in a partial character"
 msgstr ""
 
-#: glib/giochannel.c:1648
+#: glib/giochannel.c:1647
 msgid "Can't do a raw read in g_io_channel_read_to_end"
 msgstr ""
 
diff --git a/po/uk.po b/po/uk.po
index 551ce8517..8ace59709 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glib 1.3.2\n"
-"POT-Creation-Date: 2001-10-22 09:35-0400\n"
+"POT-Creation-Date: 2001-11-22 14:08-0500\n"
 "PO-Revision-Date: 2001-01-22 11:23+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -24,13 +24,13 @@ msgid "Could not open converter from '%s' to '%s': %s"
 msgstr "�� ������� צ������ ������������ � \"%s\" � \"%s\": %s"
 
 #: glib/gconvert.c:356 glib/gconvert.c:639 glib/giochannel.c:1282
-#: glib/giochannel.c:1324 glib/giochannel.c:2164 glib/gutf8.c:875
+#: glib/giochannel.c:1324 glib/giochannel.c:2163 glib/gutf8.c:875
 #: glib/gutf8.c:1321
 msgid "Invalid byte sequence in conversion input"
 msgstr "��צ��� ���̦���Φ��� ���Ԧ� � ��������������� ���Ħ"
 
 #: glib/gconvert.c:361 glib/gconvert.c:572 glib/giochannel.c:1289
-#: glib/giochannel.c:2176
+#: glib/giochannel.c:2175
 #, c-format
 msgid "Error during conversion: %s"
 msgstr "������� � ��� ������������: %s"
@@ -130,19 +130,19 @@ msgstr "
 msgid "Could not open converter from `%s' to `%s': %s"
 msgstr "�� ������� צ������ ������������ � \"%s\" � \"%s\": %s"
 
-#: glib/giochannel.c:1461
+#: glib/giochannel.c:1460
 msgid "Can't do a raw read in g_io_channel_read_line_string"
 msgstr ""
 
-#: glib/giochannel.c:1508 glib/giochannel.c:1762 glib/giochannel.c:1848
+#: glib/giochannel.c:1507 glib/giochannel.c:1761 glib/giochannel.c:1847
 msgid "Leftover unconverted data in read buffer"
 msgstr ""
 
-#: glib/giochannel.c:1588 glib/giochannel.c:1662
+#: glib/giochannel.c:1587 glib/giochannel.c:1661
 msgid "Channel terminates in a partial character"
 msgstr ""
 
-#: glib/giochannel.c:1648
+#: glib/giochannel.c:1647
 msgid "Can't do a raw read in g_io_channel_read_to_end"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 45a303784..94b8af62b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glib\n"
-"POT-Creation-Date: 2001-11-02 10:09+0800\n"
+"POT-Creation-Date: 2001-11-22 14:08-0500\n"
 "PO-Revision-Date: 2001-11-03 22:42+0800\n"
 "Last-Translator: He Qiangqiang <carton@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -24,13 +24,13 @@ msgid "Could not open converter from '%s' to '%s': %s"
 msgstr "无法打开从“%s”到“%s”的转换器：%s"
 
 #: glib/gconvert.c:356 glib/gconvert.c:639 glib/giochannel.c:1282
-#: glib/giochannel.c:1324 glib/giochannel.c:2164 glib/gutf8.c:875
+#: glib/giochannel.c:1324 glib/giochannel.c:2163 glib/gutf8.c:875
 #: glib/gutf8.c:1321
 msgid "Invalid byte sequence in conversion input"
 msgstr "转换输入中出现无效字符序列"
 
 #: glib/gconvert.c:361 glib/gconvert.c:572 glib/giochannel.c:1289
-#: glib/giochannel.c:2176
+#: glib/giochannel.c:2175
 #, c-format
 msgid "Error during conversion: %s"
 msgstr "转换过程中出错：%s"
@@ -41,8 +41,7 @@ msgid "Partial character sequence at end of input"
 msgstr "输入末尾出现未尽字符序列"
 
 #: glib/gconvert.c:547
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "Cannot convert fallback '%s' to codeset '%s'"
 msgstr "无法转换 fallback “%s”到字符集“%s”"
 
@@ -130,19 +129,19 @@ msgstr "不支持从字符集“%s”到“%s”的转换"
 msgid "Could not open converter from `%s' to `%s': %s"
 msgstr "无法打开从“%s”到“%s”的转换器：%s"
 
-#: glib/giochannel.c:1461
+#: glib/giochannel.c:1460
 msgid "Can't do a raw read in g_io_channel_read_line_string"
 msgstr "g_io_channel_read_line_string 函数无法进行原始读取"
 
-#: glib/giochannel.c:1508 glib/giochannel.c:1762 glib/giochannel.c:1848
+#: glib/giochannel.c:1507 glib/giochannel.c:1761 glib/giochannel.c:1847
 msgid "Leftover unconverted data in read buffer"
 msgstr "在读缓冲里留有未转换数据"
 
-#: glib/giochannel.c:1588 glib/giochannel.c:1662
+#: glib/giochannel.c:1587 glib/giochannel.c:1661
 msgid "Channel terminates in a partial character"
 msgstr "通道终止于未尽字符"
 
-#: glib/giochannel.c:1648
+#: glib/giochannel.c:1647
 msgid "Can't do a raw read in g_io_channel_read_to_end"
 msgstr "g_io_channel_read_to_end 函数无法进行原始读取"
 
@@ -171,8 +170,7 @@ msgstr "第%d行出错：%s"
 #: glib/gmarkup.c:379
 msgid ""
 "Empty entity '&;' seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
-msgstr ""
-"发现空的实体“&;”。有效的实体为：&amp; &quot; &lt; &gt; &apos;"
+msgstr "发现空的实体“&;”。有效的实体为：&amp; &quot; &lt; &gt; &apos;"
 
 #: glib/gmarkup.c:389
 #, c-format
@@ -181,9 +179,8 @@ msgid ""
 "begins an entity; if this ampersand isn't supposed to be an entity, escape "
 "it as &amp;"
 msgstr ""
-"字符“%s”出现在实体名的开头无效。实体都以 & 字符 "
-"开头，如果这个 & 不是一个实体的开头，把它"
-"变为 &amp;"
+"字符“%s”出现在实体名的开头无效。实体都以 & 字符 开头，如果这个 & 不是一个实体"
+"的开头，把它变为 &amp;"
 
 #: glib/gmarkup.c:425
 #, c-format
@@ -200,17 +197,15 @@ msgid ""
 "Entity did not end with a semicolon; most likely you used an ampersand "
 "character without intending to start an entity - escape ampersand as &amp;"
 msgstr ""
-"实体没有以分号结束。很可能您使用了 & "
-"字符而又不是一个实体－将这个 & 变为 &amp;"
+"实体没有以分号结束。很可能您使用了 & 字符而又不是一个实体－将这个 & 变为 "
+"&amp;"
 
 #: glib/gmarkup.c:525
 #, c-format
 msgid ""
 "Failed to parse '%s', which should have been a digit inside a character "
 "reference (&#234; for example) - perhaps the digit is too large"
-msgstr ""
-"无法解析“%s”。它应该是字符引用中的数字"
-"(如&#234;)－可能该数字太大了"
+msgstr "无法解析“%s”。它应该是字符引用中的数字(如&#234;)－可能该数字太大了"
 
 #: glib/gmarkup.c:550
 #, fuzzy, c-format
@@ -227,8 +222,8 @@ msgid ""
 "ampersand character without intending to start an entity - escape ampersand "
 "as &amp;"
 msgstr ""
-"字符引用没有以分号结束。很可能您使用了 & "
-"字符而又不是一个实体－将这个 & 变为 &amp;"
+"字符引用没有以分号结束。很可能您使用了 & 字符而又不是一个实体－将这个 & 变为 "
+"&amp;"
 
 #: glib/gmarkup.c:827 glib/gmarkup.c:855 glib/gmarkup.c:886
 msgid "Invalid UTF-8 encoded text"
@@ -243,23 +238,20 @@ msgstr "文档必须以一个元素开始(例如 <book>)"
 msgid ""
 "'%s' is not a valid character following a '<' character; it may not begin an "
 "element name"
-msgstr ""
-"“%s”出现在字符“<”后是无效字符；它不能作为元素名的开头"
+msgstr "“%s”出现在字符“<”后是无效字符；它不能作为元素名的开头"
 
 #: glib/gmarkup.c:1023
 #, c-format
 msgid ""
 "Odd character '%s', expected a '>' character to end the start tag of element "
 "'%s'"
-msgstr ""
-"字符“%s”无效，应该以字符“>”来结束元素“%s”的起始标记"
+msgstr "字符“%s”无效，应该以字符“>”来结束元素“%s”的起始标记"
 
 #: glib/gmarkup.c:1110
 #, c-format
 msgid ""
 "Odd character '%s', expected a '=' after attribute name '%s' of element '%s'"
-msgstr ""
-"字符“%s”无效，在属性名“%s”(元素“%s”)的后应该是字符“=”"
+msgstr "字符“%s”无效，在属性名“%s”(元素“%s”)的后应该是字符“=”"
 
 #: glib/gmarkup.c:1151
 #, c-format
@@ -268,24 +260,22 @@ msgid ""
 "element '%s', or optionally an attribute; perhaps you used an invalid "
 "character in an attribute name"
 msgstr ""
-"字符“%s”无效，应该以“>”或“/”结束元素“%s”的起始标记，"
-"或紧跟该元素的属性；可能您在属性名中使用了无效字符"
+"字符“%s”无效，应该以“>”或“/”结束元素“%s”的起始标记，或紧跟该元素的属性；可能"
+"您在属性名中使用了无效字符"
 
 #: glib/gmarkup.c:1224
 #, c-format
 msgid ""
 "Odd character '%s', expected an open quote mark after the equals sign when "
 "giving value for attribute '%s' of element '%s'"
-msgstr ""
-"字符“%s”无效，在给属性“%s”(元素“%s”)赋值时，在等号后应该是引号"
+msgstr "字符“%s”无效，在给属性“%s”(元素“%s”)赋值时，在等号后应该是引号"
 
 #: glib/gmarkup.c:1351
 #, c-format
 msgid ""
 "'%s' is not a valid character following the characters '</'; '%s' may not "
 "begin an element name"
-msgstr ""
-"“%s”出现在字符“</”后无效；“%s”不能作为元素名的开头"
+msgstr "“%s”出现在字符“</”后无效；“%s”不能作为元素名的开头"
 
 #: glib/gmarkup.c:1388
 #, c-format
@@ -302,8 +292,7 @@ msgstr "元素“%s”已经结束，当前未结束的元素是“%s”"
 msgid ""
 "'%s' is not a valid character following the close element name '%s'; the "
 "allowed character is '>'"
-msgstr ""
-"“%s”出现在结束的元素名无效；允许的字符是“>”"
+msgstr "“%s”出现在结束的元素名无效；允许的字符是“>”"
 
 #: glib/gmarkup.c:1541
 msgid "Document was empty or contained only whitespace"
@@ -318,17 +307,14 @@ msgstr "文档在一个打开的尖括号“<”后意外结束"
 msgid ""
 "Document ended unexpectedly with elements still open - '%s' was the last "
 "element opened"
-msgstr ""
-"文档在还存在未结束元素时意外结束－最后的未结束元素"
-"是“%s”"
+msgstr "文档在还存在未结束元素时意外结束－最后的未结束元素是“%s”"
 
 #: glib/gmarkup.c:1571
 #, c-format
 msgid ""
 "Document ended unexpectedly, expected to see a close angle bracket ending "
 "the tag <%s/>"
-msgstr ""
-"文档意外结束，应该以右尖括号“>”来结束标记 <%s/>"
+msgstr "文档意外结束，应该以右尖括号“>”来结束标记 <%s/>"
 
 #: glib/gmarkup.c:1577
 msgid "Document ended unexpectedly inside an element name"
@@ -346,9 +332,7 @@ msgstr "文档在元素起始标记中意外结束"
 msgid ""
 "Document ended unexpectedly after the equals sign following an attribute "
 "name; no attribute value"
-msgstr ""
-"文档在跟在属性名后的等号后意外结束；"
-"没有属性值"
+msgstr "文档在跟在属性名后的等号后意外结束；没有属性值"
 
 #: glib/gmarkup.c:1599
 msgid "Document ended unexpectedly while inside an attribute value"
@@ -393,9 +377,7 @@ msgstr "无法从子进程中读取数据"
 msgid ""
 "Unexpected error in g_io_channel_win32_poll() reading data from a child "
 "process"
-msgstr ""
-"g_io_channel_win32_poll() 从子进程中读取数据时出现"
-"异常错误"
+msgstr "g_io_channel_win32_poll() 从子进程中读取数据时出现异常错误"
 
 #: glib/gspawn-win32.c:837 glib/gspawn.c:907
 #, c-format
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f9498b895..d70268114 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glib 1.3.11\n"
-"POT-Creation-Date: 2001-11-18 08:37-0500\n"
+"POT-Creation-Date: 2001-11-22 14:08-0500\n"
 "PO-Revision-Date: 2001-11-20 04:30+0800\n"
 "Last-Translator: Abel Cheung <maddog@linux.org.hk>\n"
 "Language-Team: Traditional Chinese <zh-l10n@linux.org.tw>\n"
@@ -180,7 +180,7 @@ msgid ""
 "it as &amp;"
 msgstr ""
 "實體名稱不應以 '%s' 開始，應該使用 & 字元；如果這個 & 字元不是作為實體使用，"
-"請將 & 轉換為 &amp;" 
+"請將 & 轉換為 &amp;"
 
 #: glib/gmarkup.c:425
 #, c-format
@@ -197,8 +197,8 @@ msgid ""
 "Entity did not end with a semicolon; most likely you used an ampersand "
 "character without intending to start an entity - escape ampersand as &amp;"
 msgstr ""
-"實體的結尾不是分號；很可能你想使用 & 字元但未將它變為實體 ─ 請將 & 轉換"
-"為 &amp;" 
+"實體的結尾不是分號；很可能你想使用 & 字元但未將它變為實體 ─ 請將 & 轉換為 "
+"&amp;"
 
 #: glib/gmarkup.c:525
 #, c-format
@@ -223,7 +223,7 @@ msgid ""
 "as &amp;"
 msgstr ""
 "字元參引的結尾不是分號；很可能你想使用 & 字元但未將它變為實體 ─ 請將 & 轉換"
-"為 &amp;" 
+"為 &amp;"
 
 #: glib/gmarkup.c:827 glib/gmarkup.c:855 glib/gmarkup.c:886
 msgid "Invalid UTF-8 encoded text"