[glib] 2.25.3

From: Matthias Clasen <matthiasc src gnome org>
To: commits-list gnome org
Cc:
Subject: [glib] 2.25.3
Date: Sat, 24 Apr 2010 00:51:16 +0000 (UTC)
commit afe3aef7b02e94e1d2b926e131beea2de5f5c96d
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Apr 23 20:49:02 2010 -0400

    2.25.3

 po/af.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/am.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/ar.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/as.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/ast.po         |   52 ++++++++++++++++++++++++++++------------------------
 po/az.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/be.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/be latin po    |   52 ++++++++++++++++++++++++++++------------------------
 po/bg.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/bn.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/bn_IN.po       |   52 ++++++++++++++++++++++++++++------------------------
 po/bs.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/ca.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/ca valencia po |   52 ++++++++++++++++++++++++++++------------------------
 po/cs.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/cy.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/da.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/de.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/dz.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/el.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/en shaw po     |   52 ++++++++++++++++++++++++++++------------------------
 po/en_CA.po       |   52 ++++++++++++++++++++++++++++------------------------
 po/en_GB.po       |   52 ++++++++++++++++++++++++++++------------------------
 po/eo.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/es.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/et.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/eu.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/fa.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/fi.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/fr.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/ga.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/gl.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/gu.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/he.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/hi.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/hr.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/hu.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/hy.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/id.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/is.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/it.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/ja.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/ka.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/kn.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/ko.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/ku.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/lt.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/lv.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/mai.po         |   52 ++++++++++++++++++++++++++++------------------------
 po/mg.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/mk.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/ml.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/mn.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/mr.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/ms.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/nb.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/nds.po         |   52 ++++++++++++++++++++++++++++------------------------
 po/ne.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/nl.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/nn.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/oc.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/or.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/pa.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/pl.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/ps.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/pt.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/pt_BR.po       |   52 ++++++++++++++++++++++++++++------------------------
 po/ro.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/ru.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/rw.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/si.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/sk.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/sl.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/sq.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/sr.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/sr ije po      |   52 ++++++++++++++++++++++++++++------------------------
 po/sr latin po    |   52 ++++++++++++++++++++++++++++------------------------
 po/sv.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/ta.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/te.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/th.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/tl.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/tr.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/tt.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/uk.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/vi.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/wa.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/xh.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/yi.po          |   52 ++++++++++++++++++++++++++++------------------------
 po/zh_CN.po       |   52 ++++++++++++++++++++++++++++------------------------
 po/zh_HK.po       |   52 ++++++++++++++++++++++++++++------------------------
 po/zh_TW.po       |   52 ++++++++++++++++++++++++++++------------------------
 92 files changed, 2576 insertions(+), 2208 deletions(-)
---
diff --git a/po/af.po b/po/af.po
index a17f05e..edd0980 100644
--- a/po/af.po
+++ b/po/af.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-03-08 11:23+0100\n"
 "Last-Translator: F Wolff <friedel translate org za>\n"
 "Language-Team: translate-discuss-af lists sourceforge net\n"
@@ -1122,7 +1122,7 @@ msgstr ""
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr ""
 
@@ -1909,106 +1909,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr ""
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr ""
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr ""
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr ""
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr ""
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr ""
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr ""
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr ""
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr ""
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr ""
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr ""
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr ""
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr ""
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr ""
diff --git a/po/am.po b/po/am.po
index cc69667..819c460 100644
--- a/po/am.po
+++ b/po/am.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2003-01-16 08:39+EDT\n"
 "Last-Translator: Ge'ez Frontier Foundation <locales geez org>\n"
 "Language-Team: Amharic <locales geez org>\n"
@@ -1121,7 +1121,7 @@ msgstr ""
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr ""
 
@@ -1911,107 +1911,111 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr ""
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr ""
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "á??á?á?? '%s'á?? á??á??á??á? á?¥ á?µá??á?°á?µ á? á??á?¦ %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "á??á?á?? '%s'á?? á??á??á??á? á?¥ á?µá??á?°á?µ á? á??á?¦ %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "á??á?á?? '%s'á?? á??á??á??á? á?¥ á?µá??á?°á?µ á? á??á?¦ %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "á??á?á?? '%s'á?? á??á??á??á? á?¥ á?µá??á?°á?µ á? á??á?¦ %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "á??á?á?? '%s'á?? á??á??á??á? á?¥ á?µá??á?°á?µ á? á??á?¦ %s"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "á??á?á?? '%s'á?? á??á??á??á? á?¥ á?µá??á?°á?µ á? á??á?¦ %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "á??á?á?? '%s'á?? á??á??á??á? á?¥ á?µá??á?°á?µ á? á??á?¦ %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "á??á?á?? '%s'á?? á??á??á??á? á?¥ á?µá??á?°á?µ á? á??á?¦ %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "á??á?á?? '%s'á?? á??á??á??á? á?¥ á?µá??á?°á?µ á? á??á?¦ %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "á??á?á?? '%s'á?? á??á??á??á? á?¥ á?µá??á?°á?µ á? á??á?¦ %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "á??á?á?? '%s'á?? á??á??á??á? á?¥ á?µá??á?°á?µ á? á??á?¦ %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr ""
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "á??á?á?? '%s'á?? á??á??á??á? á?¥ á?µá??á?°á?µ á? á??á?¦ %s"
diff --git a/po/ar.po b/po/ar.po
index de3557d..2e67543 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2008-09-17 05:06+0300\n"
 "Last-Translator: Anas Afif Emad <anas e87 gmail com>\n"
 "Language-Team: Arabic <doc arabeyes org>\n"
@@ -1150,7 +1150,7 @@ msgstr "Ø³Ù?Ø³Ù?Ø© Ø¨Ø§Ù?ØªØ§Øª ØºÙ?Ø± Ø³Ù?Ù?Ù?Ø© Ù?Ù? Ø¯Ø®Ù?Ù? Ø§Ù?ØªØÙ?Ù?Ù?"
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 #, fuzzy
 msgid "Cancellable initialization not supported"
 msgstr "Ø¹Ù?Ù?Ù?Ù?Ø© ØºÙ?Ø± Ù?Ø¯Ø¹Ù?Ù?Ø©"
@@ -1949,109 +1949,113 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Ø®Ù?Ø§Ø± Ù?Ø¬Ù?Ù?Ù? %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 #, fuzzy
 msgid "Socket is already closed"
 msgstr "Ø¯Ù?Ù?Ù?Ù?Ù? Ø§Ù?Ù?Ù?ØµØ¯Ø± Ø³Ø¨Ù? Ø¥ØºÙ?Ø§Ù?Ù?"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "Ø®Ø·Ø£ Ø£Ø«Ù?Ø§Ø¡ Ø§Ù?Ù?Ø±Ø§Ø¡Ø© Ù?Ù? Ø§Ù?Ù?Ù?Ù?: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "ØªØ¹Ø°Ù?Ø± Ø¥Ù?Ø´Ø§Ø¡ Ù?Ø¬Ù?Ø¯ Ø³Ù?Ø© Ø§Ù?Ù?Ù?Ù?Ù?Ø§Øª %s: â??%s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "Ø®Ø·Ø£ Ù?Ù? Ø§Ù?Ù?ØªØ§Ø¨Ø© Ù?Ù?Ù?Ù?Ù?: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "Ø®Ø·Ø£ Ø£Ø«Ù?Ø§Ø¡ Ø§Ù?ØªØÙ?Ù?Ù?: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "Ø®Ø·Ø£ Ø£Ø«Ù?Ø§Ø¡ Ø¨Ù?ØªÙ?Ø± Ø§Ù?Ù?Ù?Ù?: %s "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "Ø®Ø·Ø£ Ø¹Ù?Ø¯ Ù?ØªØ Ø§Ù?Ù?Ù?Ù?: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "ØªØ¹Ø°Ù?Ø± Ù?Ù?Ù? Ø§Ù?Ù?Ù?Ù?: %s Ø¥Ù?Ù? Ø§Ù?Ù?Ù?Ù?Ù?Ø§Øª "
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "Ø®Ø·Ø£ Ø¹Ù?Ø¯ ØØ°Ù? Ø§Ù?Ù?Ù?Ù?: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "Ø®Ø·Ø£ Ø¹Ù?Ø¯ Ù?ØªØ Ø§Ù?Ù?Ù?Ù?: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "Ø®Ø·Ø£ Ø¹Ù?Ø¯ ØºÙ?Ù? Ø§Ù?Ù?Ù?Ù?: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "Ø®Ø·Ø£ Ø¹Ù?Ø¯ Ù?ØªØ Ø§Ù?Ù?Ù?Ù?: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 #, fuzzy
 msgid "GSocketControlMessage not supported on windows"
 msgstr "ØªØºÙ?Ù?Ø± Ø§Ù?ØªØ±Ø§Ø¨Ø·Ø§Øª ØºÙ?Ø± Ù?Ø¯Ø¹Ù?Ù? Ø¹Ù?Ù? win32"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "Ø®Ø·Ø£ Ø¹Ù?Ø¯ ØØ°Ù? Ø§Ù?Ù?Ù?Ù?: %s"
diff --git a/po/as.po b/po/as.po
index c8df635..44f3550 100644
--- a/po/as.po
+++ b/po/as.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: as\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2009-09-15 12:48+0530\n"
 "Last-Translator: \n"
 "Language-Team: Assamese <>\n"
@@ -1152,7 +1152,7 @@ msgstr "à¦¸à¦²à¦¨à¦¿ à¦?à§°à¦¾à§° à¦¨à¦¿à¦¬à§?à¦¶à¦¤ à¦?à§±à§?à¦§ byte à¦?à§?à§°
 msgid "Not enough space in destination"
 msgstr "à¦?à¦?à§?à¦? à¦ à¦¿à¦?à¦¨à¦¾à§° à¦?à¦¾à§°à¦£à§? à¦¯à¦¥à§?à¦·à§?à¦? à¦¸à§?à¦¥à¦¾à¦¨ à¦¨à¦¾à¦?"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "à¦¬à¦¾à¦¤à¦¿à¦² à¦?à§°à¦¿à¦¬ à¦ªà§°à¦¾ à¦?à§°à¦®à§?à¦ à¦¸à¦®à§°à§?à¦¥à¦¿à¦¤ à¦¨à¦¹à§?"
 
@@ -1946,106 +1946,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "à¦?à¦?à§?à¦?à¦¾à¦¤ à¦¬à¦¿à¦?à¦²à§?à¦ª %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "à¦?à¦¬à§?à¦§ à¦?à¦?à§?à¦?, à¦?à§°à¦®à§?à¦ à¦?à§°à¦¾ à¦¹à§?à§±à¦¾ à¦¨à¦¾à¦?"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "à¦?à¦¬à§?à¦§ à¦?à¦?à§?à¦?, à¦?à§?à¦¾à§° à¦?à¦¾à§°à¦£à§? à¦?à§°à¦®à§?à¦ à¦?à§°à¦¿à¦¬ à¦¨à§?à§±à¦¾à§°à¦¿: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "à¦?à¦?à§?à¦? à¦?à¦¤à¦¿à¦®à¦§à§?à¦¯à§? à¦¬à¦¨à§?à¦§"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "fd à§° à¦ªà§°à¦¾ GSocket à¦¸à§?à¦·à§?à¦?à¦¿ à¦?à§°à¦¾ à¦¹à§?à¦?à§?: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "à¦?à¦?à§?à¦? à¦¨à¦¿à§°à§?à¦®à¦¾à¦£ à¦?à§°à¦¿à¦¬à¦²à§? à¦¸à¦®à¦¸à§?à¦¯à¦¾: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "à¦?à¦?à§?à¦?à¦¾à¦¤ à¦?à¦?à¦¾à§° à¦¬à¦¿à¦§à¦¿ à¦¨à¦¿à§°à§?à¦§à¦¾à§°à¦¿à¦¤ à¦?à§°à¦¾ à¦¹à§?à¦?à§?"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "à¦¸à§?à¦¥à¦¾à¦¨à§?à§? à¦ à¦¿à¦?à¦¨à¦¾ à¦ªà§?à§±à¦¾ à¦¨à¦¾à¦¯à¦¾à§?: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "à¦¦à§?à§°à§° à¦ à¦¿à¦?à¦¨à¦¾ à¦ªà§?à§±à¦¾ à¦¨à¦¾à¦¯à¦¾à§?: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "à¦¶à§?à¦¨à¦¿à¦¬ à¦ªà§°à¦¾ à¦¨'à¦?'à¦²: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "à¦ à¦¿à¦?à¦¨à¦¾à¦²à§? à¦¬à¦¾à¦¨à§?à¦§à¦¿à¦¬à¦²à§? à¦¸à¦®à¦¸à§?à¦¯à¦¾: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "à¦¸à¦?à¦¯à§?à¦? à¦?à§?à§°à¦¹à¦£ à¦?à§°à§?à¦?à¦¤à§? à¦à§?à¦²: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "à¦¸à¦?à¦¯à§?à¦? à¦?à§°à¦¿à¦¬à¦²à§? à¦à§?à¦²:"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "à¦¸à¦?à¦¯à§?à¦? à¦?à¦²à¦¿ à¦?à¦?à§?"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "à¦¸à¦?à¦¯à§?à¦? à¦?à§°à¦¿à¦¬à¦²à§? à¦¸à¦®à¦¸à§?à¦¯à¦¾: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "à¦ªà§?à¦¨à§?à¦¡à¦¿à¦? à¦à§?à¦² à¦ªà¦¾à¦¬à¦²à§? à¦¬à§?à¦¯à§°à§?à¦¥: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "à¦¤à¦¥à§?à¦¯ à¦ªà¦¾à¦?à¦?à¦¤à§? à¦à§?à¦²: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "à¦¤à¦¥à§?à¦¯ à¦ªà¦ à¦¿à§?à¦¾à¦¬à¦²à§? à¦¸à¦®à¦¸à§?à¦¯à¦¾: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "à¦?à¦?à§?à¦? à¦¬à¦¨à§?à¦§ à¦?à§°à§?à¦?à¦¤à§? à¦à§?à¦²: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "à¦?à¦?à§?à¦? à¦?à§±à¦¸à§?à¦¥à¦¾à§° à¦?à¦¾à§°à¦£à§? à¦ªà§?à§°à¦¤à§?à¦?à§?à¦·à¦¾ à¦?à§°à¦¾ à¦¹à§?à¦?à§?: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "à¦¸à¦®à§?à¦¬à¦¾à¦¦ à¦ªà¦ à¦¿à§?à¦¾à¦?à¦?à¦¤à§? à¦à§?à¦²: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage à¦?  windows à¦¤ à¦¸à¦®à§°à§?à¦¥à¦¿à¦¤ à¦¨à¦¹à§?"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "à¦¸à¦®à§?à¦¬à¦¾à¦¦ à¦ªà¦¾à¦?à¦?à¦¤à§? à¦à§?à¦²: %s"
diff --git a/po/ast.po b/po/ast.po
index b5ae015..7ba410e 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-01-04 19:27+0100\n"
 "Last-Translator: astur <malditoastur gmail com>\n"
 "Language-Team: Asturian <alministradores softastur org>\n"
@@ -1193,7 +1193,7 @@ msgstr "Hai una secuencia de bytes nun vÃ¡lida na entrada de conversiÃ³n"
 msgid "Not enough space in destination"
 msgstr "Nun hai abondu espaciu pa la direiciÃ³n del socket"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "AnicializaciÃ³n encaboxable non soportada"
 
@@ -1995,106 +1995,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "OpciÃ³n desconocÃa %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "Socket incorreutu, non anicializÃ¡u"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Socket incorreutu, fallÃ³ n'anicializaciÃ³n darrÃ©u de: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "El socket Ã¡a ta pesllÃ¡u"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "creando Gsocket de df: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Nun pudo crease'l socket: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "EspecificÃ³se un protocolu desconocÃu"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "nun pudo obtenese la direiciÃ³n llocal: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "nun pudo obtenese la direiciÃ³n remota: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "nun s'escuchÃ³: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Fallu al vinculase a la direiciÃ³n: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Fallu aceutando conexÃ³n: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "Fallu coneutando: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "ConexÃ³n en cursu"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "Fallu coneutando: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Incapaz d'obtener el fallu pendiente: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Fallu al recibir datos: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Fallu al unviar datos: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Fallu al pesllar el socket: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Esperando la condiciÃ³n del socket: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Fallu al unviar mensax: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage non sofitÃ¡u sobro ventanes"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Fallu al recibir mensax: %s"
diff --git a/po/az.po b/po/az.po
index 4250034..7eb536d 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib.HEAD.az\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2004-02-02 12:12+0200\n"
 "Last-Translator: MÉ?tin Æ?mirov <metin karegen com>\n"
 "Language-Team: Azerbaijani Turkish <gnome azitt com>\n"
@@ -1164,7 +1164,7 @@ msgstr "dÃ¶nÃ¼Å?dÃ¼rmÉ? giriÅ?indÉ? hÃ¶kmsÃ¼z bayt qatarÄ±"
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 #, fuzzy
 msgid "Cancellable initialization not supported"
 msgstr "Simvolik kÃ¶rpÃ¼lÉ?r dÉ?stÉ?klÉ?nmir"
@@ -1959,107 +1959,111 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr ""
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr ""
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "Fayl oxuma xÉ?tasÄ±: '%s': %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "Fayl yaratma iflasÄ± '%s': %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, fuzzy, c-format
 msgid "could not get remote address: %s"
 msgstr "\"%2$s\" faylÄ±nÄ± oxumaq Ã¼Ã§Ã¼n %1$lu bayt ayrÄ±la bilmir"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "Fayl oxuma xÉ?tasÄ±: '%s': %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "DÃ¶nÃ¼Å?dÃ¼rmÉ? sÄ±rasÄ±nda xÉ?ta yarandÄ±: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "Fayl oxuma xÉ?tasÄ±: '%s': %s"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "Fayl oxuma xÉ?tasÄ±: '%s': %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Fayl yaratma iflasÄ± '%s': %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "Fayl oxuma xÉ?tasÄ±: '%s': %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "Fayl oxuma xÉ?tasÄ±: '%s': %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "Fayl oxuma xÉ?tasÄ±: '%s': %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "Fayl oxuma xÉ?tasÄ±: '%s': %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr ""
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "Fayl oxuma xÉ?tasÄ±: '%s': %s"
diff --git a/po/be.po b/po/be.po
index acfc0c8..9f060ab 100644
--- a/po/be.po
+++ b/po/be.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2005-11-16 11:21+0200\n"
 "Last-Translator: Vital Khilko <vk altlinux ru>\n"
 "Language-Team: Belarusian <i18n mova org>\n"
@@ -1291,7 +1291,7 @@ msgstr "Ð?ÐµÐ´Ð°Ð¿Ñ?Ñ?Ñ?Ð°Ð»Ñ?Ð½Ð°Ñ? Ð¿Ð°Ñ?Ñ?Ð»Ñ?Ð´Ð¾Ñ?Ð½Ð°Ñ?Ñ?Ñ?Ñ? Ð±Ð°Ð¹Ñ?Ð°Ñ?
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 #, fuzzy
 msgid "Cancellable initialization not supported"
 msgstr "Ð¡Ñ?Ð¼Ð±Ð°Ð»Ñ?Ñ?Ð½Ñ?Ñ? Ñ?Ð¿Ð°Ñ?Ñ?Ð»ÐºÑ? Ð½Ðµ Ð¿Ð°Ð´Ñ?Ñ?Ñ?Ð¼Ð»Ñ?Ð²Ð°Ñ?Ñ?Ñ?Ð°"
@@ -2135,121 +2135,125 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Ð?ÐµÐ²Ñ?Ð´Ð¾Ð¼Ð°Ñ? Ð¼Ð¾Ð¶Ð½Ð°Ñ?Ñ?Ñ?Ñ? %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr ""
 
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
 # glib/gfileutils.c:348
-#: gio/gsocket.c:413
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "Ð?Ð°Ð¼Ñ?Ð»ÐºÐ° Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ð½Ñ? Ñ?Ð°Ð¹Ð»Ñ? \"%s\": %s"
 
 # glib/gfileutils.c:745
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "Ð?Ð±Ð¾Ð¹ Ñ?Ñ?Ð²Ð°Ñ?Ñ?Ð½Ñ?Ð½Ñ? Ñ?Ð°Ð¹Ð»Ñ? \"%s\": %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
 # glib/gfileutils.c:337 glib/gfileutils.c:402
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, fuzzy, c-format
 msgid "could not get remote address: %s"
 msgstr "Ð?ÐµÐ¼Ð°Ð³Ñ?Ñ?Ð¼Ð° Ð·Ñ?Ð¼Ñ?Ð½Ñ?Ñ?Ñ? Ñ?Ñ?Ð¶Ñ?Ð¼ Ñ?Ð°Ð¹Ð»Ñ?: Ð·Ð±Ð¾Ð¹ waitpid(): %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
 # glib/gfileutils.c:348
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "Ð?Ð°Ð¼Ñ?Ð»ÐºÐ° Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ð½Ñ? Ñ?Ð°Ð¹Ð»Ñ? \"%s\": %s"
 
 # glib/gconvert.c:597 glib/gconvert.c:813 glib/giochannel.c:1289
 # glib/giochannel.c:2175
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "Ð?Ð°Ð¼Ñ?Ð»ÐºÐ° Ñ? Ñ?Ð°Ñ?Ðµ Ð¿ÐµÑ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ñ?Ð½Ñ?Ð½Ñ?: %s"
 
 # glib/gfileutils.c:348
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "Ð?Ð°Ð¼Ñ?Ð»ÐºÐ° Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ð½Ñ? Ñ?Ð°Ð¹Ð»Ñ? \"%s\": %s"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
 # glib/gfileutils.c:348
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "Ð?Ð°Ð¼Ñ?Ð»ÐºÐ° Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ð½Ñ? Ñ?Ð°Ð¹Ð»Ñ? \"%s\": %s"
 
 # glib/gfileutils.c:745
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Ð?Ð±Ð¾Ð¹ Ñ?Ñ?Ð²Ð°Ñ?Ñ?Ð½Ñ?Ð½Ñ? Ñ?Ð°Ð¹Ð»Ñ? \"%s\": %s"
 
 # glib/gfileutils.c:348
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "Ð?Ð°Ð¼Ñ?Ð»ÐºÐ° Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ð½Ñ? Ñ?Ð°Ð¹Ð»Ñ? \"%s\": %s"
 
 # glib/gfileutils.c:348
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "Ð?Ð°Ð¼Ñ?Ð»ÐºÐ° Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ð½Ñ? Ñ?Ð°Ð¹Ð»Ñ? \"%s\": %s"
 
 # glib/gfileutils.c:348
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "Ð?Ð°Ð¼Ñ?Ð»ÐºÐ° Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ð½Ñ? Ñ?Ð°Ð¹Ð»Ñ? \"%s\": %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
 # glib/gfileutils.c:348
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "Ð?Ð°Ð¼Ñ?Ð»ÐºÐ° Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ð½Ñ? Ñ?Ð°Ð¹Ð»Ñ? \"%s\": %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr ""
 
 # glib/gfileutils.c:348
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "Ð?Ð°Ð¼Ñ?Ð»ÐºÐ° Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ð½Ñ? Ñ?Ð°Ð¹Ð»Ñ? \"%s\": %s"
diff --git a/po/be latin po b/po/be latin po
index b704569..ced3cbf 100644
--- a/po/be latin po
+++ b/po/be latin po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2008-02-16 23:33+0200\n"
 "Last-Translator: Ihar Hrachyshka <ihar hrachyshka gmail com>\n"
 "Language-Team: Belarusian Latin <i18n mova org>\n"
@@ -1299,7 +1299,7 @@ msgstr "Niapravilnaja paÅ?ladoÅnaÅ?Ä? bajtaÅ na Åvachodzie kanversii"
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 #, fuzzy
 msgid "Cancellable initialization not supported"
 msgstr "Aperacyja nie padtrymlivajecca"
@@ -2151,122 +2151,126 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Nieviadomaja opcyja %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 #, fuzzy
 msgid "Socket is already closed"
 msgstr "KryniÄ?naja pÅ?yÅ? uÅ¾o zaÄ?ynienaja"
 
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
 # glib/gfileutils.c:348
-#: gio/gsocket.c:413
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "PamyÅ?ka adÄ?ytaÅ?nia z fajÅ?u: %s"
 
 # glib/gfileutils.c:745
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "NiemahÄ?yma stvaryÄ? kataloh Å?mietnicy %s: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
 # glib/gfileutils.c:348
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "PamyÅ?ka zapisu Å fajÅ?: %s"
 
 # glib/gconvert.c:597 glib/gconvert.c:813 glib/giochannel.c:1289
 # glib/giochannel.c:2175
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "PamyÅ?ka padÄ?as kanversii: %s"
 
 # glib/gfileutils.c:348
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "PamyÅ?ka abcinaÅ?nia fajÅ?u: %s"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
 # glib/gfileutils.c:348
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "PamyÅ?ka adÄ?ynieÅ?nia fajÅ?u: %s"
 
 # glib/gfileutils.c:745
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "NiemahÄ?yma vykinuÄ? u Å?mietnicu fajÅ?: %s"
 
 # glib/gfileutils.c:348
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "PamyÅ?ka vydaleÅ?nia fajÅ?u: %s"
 
 # glib/gfileutils.c:348
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "PamyÅ?ka adÄ?ynieÅ?nia fajÅ?u: %s"
 
 # glib/gfileutils.c:348
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "PamyÅ?ka zaÄ?ynieÅ?nia fajÅ?u: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
 # glib/gfileutils.c:348
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "PamyÅ?ka adÄ?ynieÅ?nia fajÅ?u: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 #, fuzzy
 msgid "GSocketControlMessage not supported on windows"
 msgstr "Åºmieny asacyjacyjaÅ nie padtrymlivajucca dla win32"
 
 # glib/gfileutils.c:348
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "PamyÅ?ka vydaleÅ?nia fajÅ?u: %s"
diff --git a/po/bg.po b/po/bg.po
index 1b02c04..c9788cf 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-03-06 20:22+0200\n"
 "Last-Translator: Alexander Shopov <ash kambanaria org>\n"
 "Language-Team: Bulgarian <dict fsa-bg org>\n"
@@ -1193,7 +1193,7 @@ msgstr "Ð?ÐµÐ¿Ñ?Ð»Ð½Ð° Ð±Ð°Ð¹Ñ?Ð¾Ð²Ð° Ð¿Ð¾Ñ?Ð»ÐµÐ´Ð¾Ð²Ð°Ñ?ÐµÐ»Ð½Ð¾Ñ?Ñ? Ð½Ð° Ð²Ñ?
 msgid "Not enough space in destination"
 msgstr "Ð?Ñ?Ð¼Ð° Ð´Ð¾Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ð½Ð¾ Ð¼Ñ?Ñ?Ñ?Ð¾ Ð² Ñ?ÐµÐ»Ñ?Ð°"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "Ð?Ðµ Ñ?Ðµ Ð¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð° Ð¾Ñ?Ð¼ÐµÐ½Ð¸Ð¼Ð° Ð¸Ð½Ð¸Ñ?Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ?Ð¸Ñ?"
 
@@ -1985,106 +1985,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Ð?ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ?Ð° Ð¾Ð¿Ñ?Ð¸Ñ? %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "Ð?ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»Ð½Ð¾ Ð³Ð½ÐµÐ·Ð´Ð¾, Ð½Ðµ Ðµ Ð¸Ð½Ð¸Ñ?Ð¸Ð°Ð»Ð¸Ð·Ð¸Ñ?Ð°Ð½Ð¾"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Ð?ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»Ð½Ð¾ Ð³Ð½ÐµÐ·Ð´Ð¾, Ð½ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð° Ð¸Ð½Ð¸Ñ?Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ?Ð¸Ñ? Ð¿Ð¾Ð½ÐµÐ¶Ðµ: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "Ð?Ð½ÐµÐ·Ð´Ð¾Ñ?Ð¾ Ð²ÐµÑ?Ðµ Ðµ Ð·Ð°Ñ?Ð²Ð¾Ñ?ÐµÐ½Ð¾"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° GSocket Ð¾Ñ? Ñ?Ð°Ð¹Ð»Ð¾Ð² Ð´ÐµÑ?ÐºÑ?Ð¸Ð¿Ñ?Ð¾Ñ?: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ñ?Ñ?Ð·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð³Ð½ÐµÐ·Ð´Ð¾: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "Ð£ÐºÐ°Ð·Ð°Ð½ Ðµ Ð½ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ? Ð¿Ñ?Ð¾Ñ?Ð¾ÐºÐ¾Ð»"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "Ð»Ð¾ÐºÐ°Ð»Ð½Ð¸Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±Ñ?Ð´Ðµ Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½ :%s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "Ð¾Ñ?Ð´Ð°Ð»ÐµÑ?ÐµÐ½Ð¸Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±Ñ?Ð´Ðµ Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½ :%s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ðµ Ñ?Ð»Ñ?Ñ?Ð°: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð²Ñ?Ñ?Ð·Ð²Ð°Ð½Ðµ ÐºÑ?Ð¼ Ð°Ð´Ñ?ÐµÑ?: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¿Ñ?Ð¸ÐµÐ¼Ð°Ð½Ðµ Ð½Ð° Ð²Ñ?Ñ?Ð·ÐºÐ°: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð²Ñ?Ñ?Ð·Ð²Ð°Ð½Ðµ: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "Ð? Ð¼Ð¾Ð¼ÐµÐ½Ñ?Ð° Ñ?Ðµ Ð¾Ñ?Ñ?Ñ?ÐµÑ?Ñ?Ð²Ñ?Ð²Ð° Ð²Ñ?Ñ?Ð·ÐºÐ°"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð²Ñ?Ñ?Ð·Ð²Ð°Ð½Ðµ: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ? Ð¿Ñ?Ð¸ Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ñ?ÐµÐºÑ?Ñ?Ð°Ñ?Ð° Ð³Ñ?ÐµÑ?ÐºÐ°: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¿Ð¾Ð»Ñ?Ñ?Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð´Ð°Ð½Ð½Ð¸: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¸Ð·Ð¿Ñ?Ð°Ñ?Ð°Ð½Ðµ Ð½Ð° Ð´Ð°Ð½Ð½Ð¸: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð·Ð°Ñ?Ð²Ð°Ñ?Ñ?Ð½Ðµ Ð½Ð° Ð³Ð½ÐµÐ·Ð´Ð¾: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Ð?Ð·Ñ?Ð°ÐºÐ²Ð°Ð½Ðµ Ð·Ð° Ñ?Ñ?Ñ?Ñ?Ð¾Ñ?Ð½Ð¸Ðµ Ð½Ð° Ð³Ð½ÐµÐ·Ð´Ð¾: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¸Ð·Ð¿Ñ?Ð°Ñ?Ð°Ð½Ðµ Ð½Ð° Ñ?Ñ?Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage Ð½Ðµ Ñ?Ðµ Ð¿Ð¾Ð´Ð´Ñ?Ñ?Ð¶Ð° Ð¿Ð¾Ð´ Ð£Ð¸Ð½Ð´Ð¾Ñ?Ñ?"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¸Ð·Ð¿Ñ?Ð°Ñ?Ð°Ð½Ðµ Ð½Ð° Ñ?Ñ?Ð¾Ð±Ñ?ÐµÐ½Ð¸Ðµ: %s"
diff --git a/po/bn.po b/po/bn.po
index 3a73c0a..5bfd9f4 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-03-07 01:38+0600\n"
 "Last-Translator: Israt Jahan <israt ankur org bd>\n"
 "Language-Team: Bengali <ankur-bd-l10n googlegroups com>\n"
@@ -1174,7 +1174,7 @@ msgstr "à¦°à§?à¦ªà¦¾à¦¨à§?à¦¤à¦° à¦?à¦°à¦¾à¦° à¦?à¦¨à§?à¦¯ à¦ªà§?à¦°à¦¦à¦¤à§?à¦¤
 msgid "Not enough space in destination"
 msgstr "à¦?à¦¨à§?à¦¤à¦¬à§?à¦¯à§?à¦° à¦?à¦¨à§?à¦¯ à¦ªà¦°à§?à¦¯à¦¾à¦ªà§?à¦¤ à¦¸à§?à¦¥à¦¾à¦¨ à¦¨à§?à¦?"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "à¦¬à¦¾à¦¤à¦¿à¦² à¦?à¦°à¦¾à¦° à¦¯à§?à¦?à§?à¦¯ à¦ªà§?à¦°à¦¾à¦°à¦®à§?à¦à¦¿à¦? à¦?à¦°à§?à¦® à¦¸à¦®à¦°à§?à¦¥à¦¿à¦¤ à¦¨à§?"
 
@@ -1969,106 +1969,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "à¦?à¦?à¦¾à¦¨à¦¾ à¦?à¦ªà¦¶à¦¨ %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "à¦?à¦¬à§?à¦§ à¦¸à¦?à§?à¦?, à¦?à¦°à¦®à§?à¦ à¦?à¦°à¦¾ à¦¹à§?à¦¨à¦¿"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "à¦?à¦¬à§?à¦§ à¦¸à¦?à§?à¦?, à¦?à¦¿à¦¹à§?à¦¨à¦¿à¦¤ à¦?à¦¾à¦°à¦£à§? à¦?à¦°à¦®à§?à¦ à¦?à¦°à¦¤à§? à¦¬à§?à¦¯à¦°à§?à¦¥: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "à¦¸à¦?à§?à¦? à¦¬à¦°à§?à¦¤à¦®à¦¾à¦¨à§? à¦¬à¦¨à§?à¦§ à¦?à¦°à¦¾ à¦¹à§?à§?à¦?à§?"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "fd à¦¥à§?à¦?à§? GSocket à¦¤à§?à¦°à¦¿ à¦?à¦°à¦¾ à¦¹à¦?à§?à¦?à§?: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "à¦¸à¦?à§?à¦? à¦¤à§?à¦°à¦¿ à¦?à¦°à¦¤à§? à¦¬à§?à¦¯à¦°à§?à¦¥: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "à¦?à¦?à¦¾à¦¨à¦¾ à¦ªà§?à¦°à§?à¦?à§?à¦?à¦² à¦¨à¦¿à¦°à§?à¦§à¦¾à¦°à¦£ à¦?à¦°à¦¾ à¦¹à§?"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "à¦¸à§?à¦¥à¦¾à¦¨à§?à§? à¦ à¦¿à¦?à¦¾à¦¨à¦¾ à¦ªà§?à¦¤à§? à¦¬à§?à¦¯à¦°à§?à¦¥: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "à¦¦à§?à¦°à¦¬à¦°à§?à¦¤à§? à¦ à¦¿à¦?à¦¾à¦¨à¦¾ à¦ªà§?à¦¤à§? à¦¬à§?à¦¯à¦°à§?à¦¥: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "à¦?à¦ªà§?à¦?à§?à¦·à¦¾ à¦?à¦°à¦¤à§? à¦¬à§?à¦¯à¦°à§?à¦¥: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "à¦ à¦¿à¦?à¦¾à¦¨à¦¾à¦° à¦¸à¦¾à¦¥à§? à¦¬à¦¾à¦?à¦¨à§?à¦¡ à¦?à¦°à¦¤à§? à¦¸à¦®à¦¸à§?à¦¯à¦¾: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "à¦¸à¦?à¦¯à§?à¦? à¦?à§?à¦°à¦¹à¦£ à¦?à¦°à¦¤à§? à¦¸à¦®à¦¸à§?à¦¯à¦¾: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "à¦¸à¦?à¦¯à§?à¦? à¦¸à§?à¦¥à¦¾à¦ªà¦¨ à¦?à¦°à¦¤à§? à¦¸à¦®à¦¸à§?à¦¯à¦¾:"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "à¦¸à¦?à¦¯à§?à¦? à¦¬à¦°à§?à¦¤à¦®à¦¾à¦¨à§? à¦¸à§?à¦¥à¦¾à¦ªà¦¿à¦¤ à¦¹à¦?à§?à¦?à§?"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "à¦¸à¦?à¦¯à§?à¦? à¦¸à§?à¦¥à¦¾à¦ªà¦¨ à¦?à¦°à¦¤à§? à¦¸à¦®à¦¸à§?à¦¯à¦¾: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "à¦?à¦ªà§?à¦?à§?à¦·à¦¾à¦°à¦¤ à¦¤à§?à¦°à§?à¦?à¦¿ à¦ªà§?à¦¤à§? à¦¸à¦®à¦¸à§?à¦¯à¦¾: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "à¦¤à¦¥à§?à¦¯ à¦ªà§?à¦¤à§? à¦¸à¦®à¦¸à§?à¦¯à¦¾: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "à¦¤à¦¥à§?à¦¯ à¦ªà¦¾à¦ à¦¾à¦¤à§? à¦¸à¦®à¦¸à§?à¦¯à¦¾: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "à¦¸à¦?à§?à¦? à¦¬à¦¨à§?à¦§ à¦?à¦°à¦¤à§? à¦¸à¦®à¦¸à§?à¦¯à¦¾: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "à¦¸à¦?à§?à¦?à§?à¦° à¦?à¦¬à¦¸à§?à¦¥à¦¾ à¦ªà§?à¦¤à§? à¦?à¦ªà§?à¦?à§?à¦·à¦¾ à¦?à¦°à¦¾ à¦¹à¦?à§?à¦?à§?: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "à¦¬à¦¾à¦°à§?à¦¤à¦¾ à¦ªà¦¾à¦ à¦¾à¦¤à§? à¦¸à¦®à¦¸à§?à¦¯à¦¾: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "à¦?à¦?à¦¨à§?à¦¡à§?à¦¤à§? GSocketControlMessage à¦¸à¦®à¦°à§?à¦¥à¦¿à¦¤ à¦¨à§?"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "à¦¬à¦¾à¦°à§?à¦¤à¦¾ à¦ªà§?à¦¤à§? à¦¸à¦®à¦¸à§?à¦¯à¦¾: %s"
diff --git a/po/bn_IN.po b/po/bn_IN.po
index ebe4c21..c9f0d25 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bn_IN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2009-09-15 18:31+0530\n"
 "Last-Translator: Runa Bhattacharjee <runab redhat com>\n"
 "Language-Team: Bengali INDIA <anubad lists ankur org in>\n"
@@ -1168,7 +1168,7 @@ msgstr "à¦°à§?à¦ªà¦¾à¦¨à§?à¦¤à¦° à¦?à¦°à¦¾à¦° à¦?à¦¨à§?à¦¯ à¦ªà§?à¦°à¦¦à¦¤à§?à¦¤
 msgid "Not enough space in destination"
 msgstr "à¦¸à¦?à§?à¦?à§?à¦° à¦ à¦¿à¦?à¦¾à¦¨à¦¾à¦° à¦?à¦¨à§?à¦¯ à¦ªà¦°à§?à¦¯à¦¾à¦ªà§?à¦¤ à¦¸à§?à¦¥à¦¾à¦¨ à¦?à¦ªà¦²à¦¬à§?à¦§ à¦¨à§?à¦?"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "à¦¬à¦¾à¦¤à¦¿à¦² à¦?à¦°à¦¾à¦° à¦¯à§?à¦?à§?à¦¯ à¦ªà§?à¦°à¦¾à¦°à¦®à§?à¦à¦¿à¦? à¦?à¦°à§?à¦® à¦¸à¦®à¦°à§?à¦¥à¦¿à¦¤ à¦¨à§?"
 
@@ -1964,106 +1964,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "à¦?à¦?à¦¾à¦¨à¦¾ à¦¬à¦¿à¦?à¦²à§?à¦ª %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "à¦?à¦¬à§?à¦§ à¦¸à¦?à§?à¦?, à¦?à¦°à¦®à§?à¦ à¦?à¦°à¦¾ à¦¹à§?à¦¨à¦¿"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "à¦?à¦¬à§?à¦§ à¦¸à¦?à§?à¦?, à¦?à¦¿à¦¹à§?à¦¨à¦¿à¦¤ à¦?à¦¾à¦°à¦£à§? à¦?à¦°à¦®à§?à¦ à¦?à¦°à¦¤à§? à¦¬à§?à¦¯à¦°à§?à¦¥: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "à¦¸à¦?à§?à¦? à¦¬à¦°à§?à¦¤à¦®à¦¾à¦¨à§? à¦¬à¦¨à§?à¦§ à¦?à¦°à¦¾ à¦¹à§?à§?à¦?à§?"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "fd à¦¥à§?à¦?à§? GSocket à¦¨à¦¿à¦°à§?à¦®à¦¾à¦£ à¦?à¦°à¦¾ à¦¹à¦?à§?à¦?à§?: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "à¦¸à¦?à§?à¦? à¦¨à¦¿à¦°à§?à¦®à¦¾à¦£ à¦?à¦°à¦¤à§? à¦¬à§?à¦¯à¦°à§?à¦¥: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "à¦?à¦?à¦¾à¦¨à¦¾ à¦ªà§?à¦°à§?à¦?à§?à¦?à¦² à¦¨à¦¿à¦°à§?à¦§à¦¾à¦°à¦£ à¦?à¦°à¦¾ à¦¹à§?"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "à¦¸à§?à¦¥à¦¾à¦¨à§?à§? à¦ à¦¿à¦?à¦¾à¦¨à¦¾ à¦ªà§?à¦°à¦¾à¦ªà§?à¦¤ à¦?à¦°à¦¤à§? à¦¬à§?à¦¯à¦°à§?à¦¥: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "à¦¦à§?à¦°à¦¬à¦°à§?à¦¤à§? à¦ à¦¿à¦?à¦¾à¦¨à¦¾ à¦ªà§?à¦°à¦¾à¦ªà§?à¦¤ à¦?à¦°à¦¤à§? à¦¬à§?à¦¯à¦°à§?à¦¥: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "à¦?à¦ªà§?à¦?à§?à¦·à¦¾ à¦?à¦°à¦¤à§? à¦¬à§?à¦¯à¦°à§?à¦¥: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "à¦ à¦¿à¦?à¦¾à¦¨à¦¾à¦° à¦¸à¦¾à¦¥à§? à¦¬à¦¾à¦?à¦¨à§?à¦¡ à¦?à¦°à¦¤à§? à¦¤à§?à¦°à§?à¦?à¦¿: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "à¦¸à¦?à¦¯à§?à¦? à¦?à§?à¦°à¦¹à¦£ à¦?à¦°à¦¤à§? à¦¬à§?à¦¯à¦°à§?à¦¥: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "à¦¸à¦?à¦¯à§?à¦? à¦¸à§?à¦¥à¦¾à¦ªà¦¨ à¦?à¦°à¦¤à§? à¦¬à§?à¦¯à¦°à§?à¦¥: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "à¦¸à¦?à¦¯à§?à¦? à¦¬à¦°à§?à¦¤à¦®à¦¾à¦¨à§? à¦¸à§?à¦¥à¦¾à¦ªà¦¿à¦¤ à¦¹à¦?à§?à¦?à§?"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "à¦¸à¦?à¦¯à§?à¦? à¦¸à§?à¦¥à¦¾à¦ªà¦¨ à¦?à¦°à¦¤à§? à¦¤à§?à¦°à§?à¦?à¦¿: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "à¦?à¦ªà§?à¦?à§?à¦·à¦¾à¦°à¦¤ à¦¤à§?à¦°à§?à¦?à¦¿ à¦ªà§?à¦°à¦¾à¦ªà§?à¦¤ à¦?à¦°à¦¤à§? à¦¬à§?à¦¯à¦°à§?à¦¥: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "à¦¤à¦¥à§?à¦¯ à¦ªà§?à¦°à¦¾à¦ªà§?à¦¤ à¦?à¦°à¦¤à§? à¦¤à§?à¦°à§?à¦?à¦¿: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "à¦¤à¦¥à§?à¦¯ à¦ªà¦¾à¦ à¦¾à¦¤à§? à¦¤à§?à¦°à§?à¦?à¦¿: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "à¦¸à¦?à§?à¦? à¦¬à¦¨à§?à¦§ à¦?à¦°à¦¤à§? à¦¤à§?à¦°à§?à¦?à¦¿: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "à¦¸à¦?à§?à¦?à§?à¦° à¦?à¦¬à¦¸à§?à¦¥à¦¾ à¦ªà§?à¦°à¦¾à¦ªà§?à¦¤ à¦?à¦°à¦¤à§? à¦?à¦ªà§?à¦?à§?à¦·à¦¾ à¦?à¦°à¦¾ à¦¹à¦?à§?à¦?à§?: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "à¦¬à¦¾à¦°à§?à¦¤à¦¾ à¦ªà¦¾à¦ à¦¾à¦¤à§? à¦¤à§?à¦°à§?à¦?à¦¿: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "à¦?à¦?à¦¨à§?à¦¡à§?à¦° GSocketControlMessage à¦®à¦§à§?à¦¯à§? à¦¸à¦®à¦°à§?à¦¥à¦¿à¦¤ à¦¨à§?"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "à¦¬à¦¾à¦°à§?à¦¤à¦¾ à¦ªà§?à¦°à¦¾à¦ªà§?à¦¤ à¦?à¦°à¦¤à§? à¦¤à§?à¦°à§?à¦?à¦¿: %s"
diff --git a/po/bs.po b/po/bs.po
index f7b708e..5b9b012 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib.glib-2-4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2004-05-17 01:30+0000\n"
 "Last-Translator: Kenan HadÅ¾iavdiÄ? <kenanh frisurf no>\n"
 "Language-Team: Bosnian <lokal lugbih org>\n"
@@ -1164,7 +1164,7 @@ msgstr "NevaÅ¾eÄ?i niz bajtova u ulaznim podacima za pretvaranje"
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 #, fuzzy
 msgid "Cancellable initialization not supported"
 msgstr "SimboliÄ?ki linkovi nisu podrÅ¾ani"
@@ -1959,107 +1959,111 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr ""
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr ""
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "GreÅ¡ka tokom Ä?itanja datoteke '%s': %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "NeuspjeÅ¡no pravljenje datoteke '%s': %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, fuzzy, c-format
 msgid "could not get remote address: %s"
 msgstr "Nisam mogao dodijeliti %lu bajtova za Ä?itanje datoteke \"%s\""
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "GreÅ¡ka tokom Ä?itanja datoteke '%s': %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "GreÅ¡ka tokom pretvaranja: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "GreÅ¡ka tokom Ä?itanja datoteke '%s': %s"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "GreÅ¡ka tokom Ä?itanja datoteke '%s': %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "NeuspjeÅ¡no pravljenje datoteke '%s': %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "GreÅ¡ka tokom Ä?itanja datoteke '%s': %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "GreÅ¡ka tokom Ä?itanja datoteke '%s': %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "GreÅ¡ka tokom Ä?itanja datoteke '%s': %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "GreÅ¡ka tokom Ä?itanja datoteke '%s': %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr ""
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "GreÅ¡ka tokom Ä?itanja datoteke '%s': %s"
diff --git a/po/ca.po b/po/ca.po
index f3d6583..8473cab 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib 2.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-04-02 14:03+0200\n"
 "Last-Translator: Gil Forcada <gilforcada guifi net>\n"
 "Language-Team: Catalan <tradgnome softcatala org>\n"
@@ -1202,7 +1202,7 @@ msgstr "La seqÃ¼Ã¨ncia de mÃºltiples bytes de l'entrada no Ã©s completa"
 msgid "Not enough space in destination"
 msgstr "No hi ha prou espai a la destinaciÃ³"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "No estÃ  implementada la cancelÂ·laciÃ³ de la inicialitzaciÃ³"
 
@@ -2013,106 +2013,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Es desconeix l'opciÃ³ %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "El sÃ²col no Ã©s vÃ lid, no estÃ  inicialitzat"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "El sÃ²col no Ã©s vÃ lid, ha fallat la inicialitzaciÃ³ degut a: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "El sÃ²col ja Ã©s tancat"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "s'estÃ  creant un GSocket a partir del descriptor de fitxer: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "No s'ha pogut crear el sÃ²col: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "S'ha especificat un protocol desconegut"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "no s'ha pogut obtenir l'adreÃ§a local: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "no s'ha pogut obtenir l'adreÃ§a remota: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "no s'ha pogut escoltar: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "S'ha produÃ¯t un error en vincular-se a l'adreÃ§a: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "S'ha produÃ¯t un error en acceptar la connexiÃ³: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "S'ha produÃ¯t un error en connectar-se: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "ConnexiÃ³ en procÃ©s"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "S'ha produÃ¯t un error en connectar-se: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "No s'ha pogut obtenir l'error pendent: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "S'ha produÃ¯t un error en rebre les dades: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "S'ha produÃ¯t un error en enviar les dades: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "S'ha produÃ¯t un error en tancar el sÃ²col: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "S'estÃ  esperant la condiciÃ³ del sÃ²col: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "S'ha produÃ¯t un error en enviar el missatge: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "El GSocketControlMessage no estÃ  implementat a Windows"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "S'ha produÃ¯t un error en rebre un missatge: %s"
diff --git a/po/ca valencia po b/po/ca valencia po
index 9fee484..9840637 100644
--- a/po/ca valencia po
+++ b/po/ca valencia po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib 2.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-04-02 14:03+0200\n"
 "Last-Translator: Gil Forcada <gilforcada guifi net>\n"
 "Language-Team: Catalan <tradgnome softcatala org>\n"
@@ -1202,7 +1202,7 @@ msgstr "La seqÃ¼Ã¨ncia de mÃºltiples bytes de l'entrada no Ã©s completa"
 msgid "Not enough space in destination"
 msgstr "No hi ha prou espai a la destinaciÃ³"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "No estÃ  implementada la cancelÂ·laciÃ³ de la inicialitzaciÃ³"
 
@@ -2013,106 +2013,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Es desconeix l'opciÃ³ %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "El sÃ²col no Ã©s vÃ lid, no estÃ  inicialitzat"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "El sÃ²col no Ã©s vÃ lid, ha fallat la inicialitzaciÃ³ degut a: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "El sÃ²col ja Ã©s tancat"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "s'estÃ  creant un GSocket a partir del descriptor de fitxer: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "No s'ha pogut crear el sÃ²col: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "S'ha especificat un protocol desconegut"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "no s'ha pogut obtindre l'adreÃ§a local: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "no s'ha pogut obtindre l'adreÃ§a remota: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "no s'ha pogut escoltar: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "S'ha produÃ¯t un error en vincular-se a l'adreÃ§a: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "S'ha produÃ¯t un error en acceptar la connexiÃ³: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "S'ha produÃ¯t un error en connectar-se: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "ConnexiÃ³ en procÃ©s"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "S'ha produÃ¯t un error en connectar-se: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "No s'ha pogut obtindre l'error pendent: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "S'ha produÃ¯t un error en rebre les dades: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "S'ha produÃ¯t un error en enviar les dades: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "S'ha produÃ¯t un error en tancar el sÃ²col: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "S'estÃ  esperant la condiciÃ³ del sÃ²col: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "S'ha produÃ¯t un error en enviar el missatge: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "El GSocketControlMessage no estÃ  implementat a Windows"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "S'ha produÃ¯t un error en rebre un missatge: %s"
diff --git a/po/cs.po b/po/cs.po
index 66057c4..9362235 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-03-15 02:28+0100\n"
 "Last-Translator: Petr Kovar <pknbe volny cz>\n"
 "Language-Team: Czech <gnome-cs-list gnome org>\n"
@@ -1170,7 +1170,7 @@ msgstr "NeÃºplnÃ¡ vÃcebajtovÃ¡ posloupnost na vstupu"
 msgid "Not enough space in destination"
 msgstr "CÃl nemÃ¡ dostatek mÃsta"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "ZruÅ¡itelnÃ© spuÅ¡tÄ?nÃ nenÃ podporovÃ¡no"
 
@@ -1963,106 +1963,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "NeznÃ¡mÃ½ pÅ?epÃnaÄ? %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "NeplatnÃ½ socket, nebyl spuÅ¡tÄ?n"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "NeplatnÃ½ socket, spuÅ¡tÄ?nÃ selhalo kvÅ¯li: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "Socket je jiÅ¾ ukonÄ?en"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "vytvÃ¡Å?Ã se GSocket z fd: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Nelze vytvoÅ?it socket: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "Byl zadÃ¡n neznÃ¡mÃ½ protokol"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "nezdaÅ?ilo se zÃskat mÃstnÃ adresu: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "nezdaÅ?ilo se zÃskat vzdÃ¡lenou adresu: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "nezdaÅ?ilo se naslouchÃ¡nÃ: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Chyba pÅ?i propojenÃ na adresu: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Chyba pÅ?i pÅ?ijÃmÃ¡nÃ spojenÃ: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "Chyba pÅ?i spojovÃ¡nÃ: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "ProbÃhÃ¡ spojenÃ"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "Chyba pÅ?i spojenÃ: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Nelze zÃskat nevyÅ?Ãzenou chybu: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Chyba pÅ?i zÃskÃ¡vÃ¡nÃ dat: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Chyba pÅ?i odesÃlÃ¡nÃ dat: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Chyba pÅ?i zavÃrÃ¡nÃ socketu: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Ä?ekÃ¡ se na stav socketu: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Chyba pÅ?i odesÃlÃ¡nÃ zprÃ¡vy: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage nepodporovÃ¡no na Windows"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Chyba pÅ?i zÃskÃ¡vÃ¡nÃ zprÃ¡vy: %s"
diff --git a/po/cy.po b/po/cy.po
index 1b26115..9e84230 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2009-12-21 14:56+0100\n"
 "Last-Translator: Iestyn Pryce <dylunio gmail com>\n"
 "Language-Team: Welsh <gnome-cy pengwyn linux org uk>\n"
@@ -1170,7 +1170,7 @@ msgstr "Dilyniant beit annilys ym mewnbwn trawsnewid"
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 #, fuzzy
 msgid "Cancellable initialization not supported"
 msgstr "Ni chynhelir cysylltion symbolaidd"
@@ -1965,107 +1965,111 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Opsiwn anhysbys %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr ""
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "Methwyd creu'r ffeil '%s': %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, fuzzy, c-format
 msgid "could not get remote address: %s"
 msgstr "Methu newid modd ffeil: methodd waitpid(): %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "Gwall wrth drawsnewid: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Methwyd creu'r ffeil '%s': %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr ""
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
diff --git a/po/da.po b/po/da.po
index a92ba8f..ea0bc2f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-03-27 18:38+0100\n"
 "Last-Translator: Ask Hjorth Larsen <asklarsen gmail com>\n"
 "Language-Team: Danish <dansk dansk-gruppen dk>\n"
@@ -1188,7 +1188,7 @@ msgstr "UfuldstÃ¦ndig flerbytesekvens i inddata"
 msgid "Not enough space in destination"
 msgstr "UtilstrÃ¦kkelig plads pÃ¥ destinationen"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "Initialisering med mulighed for afbrydelse understÃ¸ttes ikke"
 
@@ -1985,106 +1985,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Ukendt flag %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "Ugyldig sokkel, ikke initialiseret"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Ugyldig sokkel, initialisering mislykkedes pÃ¥ grund af: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "Soklen er allerede lukket"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "opretter GSocket fra fd: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Kan ikke oprette sokkel: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "Der blev angivet en ukendt protokol"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "kunne ikke finde lokal adresse: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "kunne ikke finde fjern adresse: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "kunne ikke lytte: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Fejl ved binding til adresse: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Fejl ved accept af forbindelse: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "Fejl ved forbindelse: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "Forbinder"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "Fejl ved forbindelse: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Kan ikke hente verserende fejl: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Fejl ved modtagelse af data: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Fejl ved afsendelse af data: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Fejl ved lukning af sokkel: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Venter pÃ¥ sokkelbetingelse: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Fejl ved afsendelse af meddelelse: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage understÃ¸ttes ikke af windows"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Fejl ved modtagelse af meddelelse: %s"
diff --git a/po/de.po b/po/de.po
index 4ec1482..6233c27 100644
--- a/po/de.po
+++ b/po/de.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-03-04 22:01+0100\n"
 "Last-Translator: Mario BlÃ¤ttermann <mariobl gnome org>\n"
 "Language-Team: Deutsch <gnome-de gnome org>\n"
@@ -1216,7 +1216,7 @@ msgstr "UngÃ¼ltige Multibyte-Folge in Eingabe"
 msgid "Not enough space in destination"
 msgstr "Nicht genug Platz im Ziel"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "Abbrechbare Initialisierung wird nicht unterstÃ¼tzt"
 
@@ -2014,106 +2014,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Unbekannte Option %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "UngÃ¼ltiger Socket, wurde nicht initialisiert"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "UngÃ¼ltiger Socket, Initialisierung schlug fehl wegen: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "Der Socket ist bereits geschlossen"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "GSocket wird erstellt von Dateideskriptor: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Socket kann nicht angelegt werden: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "Ein unbekanntes Protokoll wurde angegeben"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "Lokale Adresse konnte nicht gelesen werden: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "Entfernte Adresse konnte nicht gelesen werden: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "Es konnte nicht gelauscht werden: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Fehler beim Binden an Adresse: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Fehler bei Annahme der Verbindung: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "Fehler beim Verbinden:"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "Verbindungsvorgang lÃ¤uft"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "Fehler beim Verbinden: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Fehlermeldung kann nicht gelesen werden: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Fehler beim Erhalt von Daten: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Fehler beim Senden von Daten: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Fehler beim SchlieÃ?en des Sockets: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Es wird auf eine Socket-Bedingung gewartet: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Fehler beim Senden der Nachricht: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage wird unter Windows nicht unterstÃ¼tzt"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Fehler beim Empfang der Nachricht: %s"
diff --git a/po/dz.po b/po/dz.po
index b9b0dc7..cef7657 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib.HEAD.dz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2006-08-09 10:23+0530\n"
 "Last-Translator: Mindu Dorji\n"
 "Language-Team: DZONGKHA <pgeyleg dit gov bt>\n"
@@ -1169,7 +1169,7 @@ msgstr "à½?à½?à½²à¼?à½?à½¦à¾?à¾±à½´à½¢à¼?à½?à¾±à½²à¼?à½¨à½²à½?à¼?à½?à½´à½?à½²à¼?
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 #, fuzzy
 msgid "Cancellable initialization not supported"
 msgstr "à½?à½¢à¾¡à¼?à½?à½?à½¼à½?à¼?à½ à½?à¾²à½ºà½£à¼?à½£à½?à¼?à½£à½´à¼? à½¢à¾?à¾±à½?à¼?à½¦à¾?à¾±à½¼à½¢à¼?à½?à½²à½?à¼?à½ à½?à½´à½?"
@@ -1967,107 +1967,111 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "à½¤à½ºà½¦à¼?à½?à¼?à½?à½´à½?à½¦à¼?à½?à½ à½²à¼?à½?à½?à½?à¼?à½?à¼? %sà¼?"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr ""
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "à½¡à½²à½?à¼?à½¦à¾£à½¼à½?à¼? â??%sâ??: %s à½£à¾·à½?à¼?à½?à½²à¼?à½£à½´à¼?à½ à½?à½¼à½£à¼?à½?à¼?"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "à½¡à½²à½?à¼?à½¦à¾£à½¼à½?à¼? â??%sâ??:%s à½?à½¦à½¢à¼?à½?à½¦à¾?à¾²à½´à½?à¼?à½ à½?à½?à¼?à½?à¼?à½?à½´à½?à½¦à¼?"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, fuzzy, c-format
 msgid "could not get remote address: %s"
 msgstr "à½¡à½²à½?à¼?à½¦à¾£à½¼à½?à¼?à½?à½?à½¦à¼?à½£à½?à¼? à½?à½¦à¾?à¾±à½´à½¢à¼?à½?à½?à½¼à½¦à¼?à½ à½?à½?à¼?à½?à¼?à½?à½´à½?à½¦à¼?: waitpid() à½?à½²à½¦à¼?%s à½£à½´à¼?à½?à¼?à½?à½?à½´à½?à¼?"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "à½¡à½²à½?à¼?à½¦à¾£à½¼à½?à¼? â??%sâ??: %s à½£à¾·à½?à¼?à½?à½²à¼?à½£à½´à¼?à½ à½?à½¼à½£à¼?à½?à¼?"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "à½?à½?à½²à¼?à½?à½¦à¾?à¾±à½´à½¢à¼?à½?à¾±à½²à¼?à½¦à¾?à½?à½¦à¼?à½ à½?à½¼à½£à¼?à½?à¼? :%s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "à½¡à½²à½?à¼?à½¦à¾£à½¼à½?à¼? â??%sâ??: %s à½£à¾·à½?à¼?à½?à½²à¼?à½£à½´à¼?à½ à½?à½¼à½£à¼?à½?à¼?"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "à½¡à½²à½?à¼?à½¦à¾£à½¼à½?à¼? â??%sâ??: %s à½£à¾·à½?à¼?à½?à½²à¼?à½£à½´à¼?à½ à½?à½¼à½£à¼?à½?à¼?"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "à½¡à½²à½?à¼?à½¦à¾£à½¼à½?à¼? â??%sâ??:%s à½?à½¦à½¢à¼?à½?à½¦à¾?à¾²à½´à½?à¼?à½ à½?à½?à¼?à½?à¼?à½?à½´à½?à½¦à¼?"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "à½¡à½²à½?à¼?à½¦à¾£à½¼à½?à¼? â??%sâ??: %s à½£à¾·à½?à¼?à½?à½²à¼?à½£à½´à¼?à½ à½?à½¼à½£à¼?à½?à¼?"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "à½¡à½²à½?à¼?à½¦à¾£à½¼à½?à¼? â??%sâ??: %s à½£à¾·à½?à¼?à½?à½²à¼?à½£à½´à¼?à½ à½?à½¼à½£à¼?à½?à¼?"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "à½¡à½²à½?à¼?à½¦à¾£à½¼à½?à¼? â??%sâ??: %s à½£à¾·à½?à¼?à½?à½²à¼?à½£à½´à¼?à½ à½?à½¼à½£à¼?à½?à¼?"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "à½¡à½²à½?à¼?à½¦à¾£à½¼à½?à¼? â??%sâ??: %s à½£à¾·à½?à¼?à½?à½²à¼?à½£à½´à¼?à½ à½?à½¼à½£à¼?à½?à¼?"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr ""
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "à½¡à½²à½?à¼?à½¦à¾£à½¼à½?à¼? â??%sâ??: %s à½£à¾·à½?à¼?à½?à½²à¼?à½£à½´à¼?à½ à½?à½¼à½£à¼?à½?à¼?"
diff --git a/po/el.po b/po/el.po
index 4ab3e3e..489cf43 100644
--- a/po/el.po
+++ b/po/el.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-03-18 23:12+0200\n"
 "Last-Translator: nikolaosx1 <nikolaosx1 gmail com>\n"
 "Language-Team: Greek\n"
@@ -1231,7 +1231,7 @@ msgstr "Î?Î»Î»Î¹Ï?Î®Ï? Ï?ÎµÎ¹Ï?Î¬ byte Ï?Ï?Î·Î½ ÎµÎ¯Ï?Î¿Î´Î¿"
 msgid "Not enough space in destination"
 msgstr "Î?Î· ÎµÏ?Î±Ï?ÎºÎ®Ï? Ï?Ï?Ï?Î¿Ï? Ï?Ï?Î·Î½ Ï?ÎµÏ?Î¹Î¿Ï?Î® Ï?Ï?Î¿Î¿Ï?Î¹Ï?Î¼Î¿Ï?"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "Î?ÎµÎ½ Ï?Ï?Î¿Ï?Ï?Î·Ï?Î¯Î¶ÎµÏ?Î±Î¹ Î· Î±Ï?Ï?Î¹ÎºÎ¿Ï?Î¿Î¯Î·Ï?Î· Î¼Îµ Î´Ï?Î½Î±Ï?Ï?Ï?Î·Ï?Î± Î±ÎºÏ?Ï?Ï?Ï?Î·Ï?"
 
@@ -2050,110 +2050,114 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Î?Î³Î½Ï?Ï?Ï?Î· ÎµÏ?Î¹Î»Î¿Î³Î® %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "Î?Î· ÎÎ³ÎºÏ?Ï?Î¿Ï? Ï?Ï?Î¿Î´Î¿Ï?ÎÎ±Ï?, Î´ÎµÎ½ Î±Ï?Ï?Î¹ÎºÎ¿Ï?Î¿Î¹Î®Î¸Î·ÎºÎµ"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Î?Î· ÎÎ³ÎºÏ?Ï?Î¿Ï? Ï?Ï?Î¿Î´Î¿Ï?ÎÎ±, Î· Î±Ï?Ï?Î¹ÎºÎ¿Ï?Î¿Î¯Î·Ï?Î· Î±Ï?ÎÏ?Ï?Ï?Îµ Î»Ï?Î³Î¿ Ï?Î¿Ï?: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "Î? Ï?Ï?Î¿Î´Î¿Ï?ÎÎ±Ï? ÎµÎ¯Î½Î±Î¹ Î®Î´Î· ÎºÎ»ÎµÎ¹Ï?Ï?Ï?Ï?"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "Î?Î·Î¼Î¹Î¿Ï?Ï?Î³Î¯Î± Ï?Ï?Î¿Î´Î¿Ï?ÎÎ± GSocket Î±Ï?Ï? fd: %s"
 
 # gconf/gconf-internals.c:2416
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Î?Î´Ï?Î½Î±Î¼Î¯Î± Î´Î·Î¼Î¹Î¿Ï?Ï?Î³Î¯Î±Ï? Ï?Ï?Î¿Î´Î¿Ï?ÎÎ±: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "Î Ï?Î¿Ï?Î´Î¹Î¿Ï?Î¯Ï?Ï?Î·ÎºÎµ Î¬Î³Î½Ï?Ï?Ï?Î¿ Ï?Ï?Ï?Ï?Ï?ÎºÎ¿Î»Î»Î¿"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "Î±Î´Ï?Î½Î±Î¼Î¯Î± Î»Î®Ï?Î·Ï? Ï?Î·Ï? Ï?Î¿Ï?Î¹ÎºÎ®Ï? Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?Î·Ï?: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "Î±Î´Ï?Î½Î±Î¼Î¯Î± Î»Î®Ï?Î·Ï? Ï?Î·Ï? Î±Ï?Î¿Î¼Î±ÎºÏ?Ï?Ï?Î¼ÎÎ½Î·Ï? Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?Î·Ï?: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "Î±Î´Ï?Î½Î±Î¼Î¯Î± Î±ÎºÏ?Ï?Î±Ï?Î·Ï?: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Î£Ï?Î¬Î»Î¼Î± ÎºÎ±Ï?Î¬ Ï?Î·Î½ Ï?Ï?Î½Î´ÎµÏ?Î· Ï?Ï?Î·Î½ Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?Î·: %s"
 
 # gconf/gconftool.c:1181
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Î£Ï?Î¬Î»Î¼Î± Î±Ï?Î¿Î´Î¿Ï?Î®Ï? Ï?Ï?Î½Î´ÎµÏ?Î·Ï?: %s"
 
 #
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "Î£Ï?Î¬Î»Î¼Î± Ï?Ï?Î½Î´ÎµÏ?Î·Ï?:"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "Î£Ï?Î½Î´ÎµÏ?Î· Ï?Îµ ÎµÎ¾ÎÎ»Î¹Î¾Î·"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "Î£Ï?Î¬Î»Î¼Î± Ï?Ï?Î½Î´ÎµÏ?Î·Ï?: %s"
 
 # gconf/gconf-internals.c:2416
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Î?Î´Ï?Î½Î±Ï?Î· Î»Î®Ï?Î·Ï? ÎµÎºÎºÏ?ÎµÎ¼Î¿Ï?Ï? Ï?Ï?Î¬Î»Î¼Î±Ï?Î¿Ï?: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Î£Ï?Î¬Î»Î¼Î± Î»Î®Ï?Î·Ï? Î´ÎµÎ´Î¿Î¼ÎÎ½Ï?Î½: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Î£Ï?Î¬Î»Î¼Î± Î±Ï?Î¿Ï?Ï?Î¿Î»Î®Ï? Î´ÎµÎ´Î¿Î¼ÎÎ½Ï?Î½: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Î£Ï?Î¬Î»Î¼Î± Ï?ÎµÏ?Î¼Î±Ï?Î¹Ï?Î¼Î¿Ï? Ï?Ï?Î¿Î´Î¿Ï?ÎÎ±: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Î?Î½Î±Î¼Î¿Î½Î® Î³Î¹Î± Ï?Î·Î½ Ï?Ï?Î½Î¸Î®ÎºÎ· Ï?Ï?Î¿Î´Î¿Ï?ÎÎ±: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Î£Ï?Î¬Î»Î¼Î± Î±Ï?Î¿Ï?Ï?Î¿Î»Î®Ï? Î¼Î·Î½Ï?Î¼Î±Ï?Î¿Ï?: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "Î¤Î¿ GSocketControlMessage Î´ÎµÎ½ Ï?Ï?Î¿Ï?Ï?Î·Ï?Î¯Î¶ÎµÏ?Îµ Ï?Ï?Î± windows"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Î£Ï?Î¬Î»Î¼Î± Î»Î®Ï?Î·Ï? Î¼Î·Î½Ï?Î¼Î±Ï?Î¿Ï?: %s"
diff --git a/po/en shaw po b/po/en shaw po
index 08ffda7..00c2cab 100644
--- a/po/en shaw po
+++ b/po/en shaw po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Thomas Thurman <tthurman gnome org>\n"
 "Language-Team: Shavian <ubuntu-l10n-en-shaw lists launchpad net>\n"
@@ -1150,7 +1150,7 @@ msgstr "ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð???ð??²ð??? ð???ð??°ð???ð??¢ð??©ð??¯ð??? 
 msgid "Not enough space in destination"
 msgstr "ð??¯ð??ªð??? ð??¦ð??¯ð??³ð??? ð???ð???ð??±ð??? ð???ð??¹ ð???ð??ªð???ð??©ð??? ð??©ð???ð??®ð??§ð???"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "ð???ð??¨ð??¯ð???ð??§ð??¤ð??©ð???ð??©ð??¤ ð??¦ð??¯ð??¦ð???ð??¦ð??©ð??¤ð??²ð???ð??¨ð???ð??©ð??¯ ð??¯ð??ªð??? ð???ð??©ð???ð??¹ð???ð??©ð???"
 
@@ -1943,106 +1943,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "ð??³ð??¯ð??´ð??¯ ð??ªð???ð???ð??©ð??¯ %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð???ð??ªð???ð??©ð???, ð??¯ð??ªð??? ð??¦ð??¯ð??¦ð???ð??©ð??¤ð??²ð???ð???"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "ð??¦ð??¯ð???ð??¨ð??¤ð??¦ð??? ð???ð??ªð???ð??©ð???, ð??¦ð??¯ð??¦ð???ð??¦ð??©ð??¤ð??²ð???ð??¨ð???ð??©ð??¯ ð???ð??±ð??¤ð??? ð???ð??¿ ð???: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "ð???ð??ªð???ð??©ð??? ð??¦ð??? ð??·ð??¤ð??®ð??§ð???ð??¦ ð???ð??¤ð??´ð???ð???"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "ð???ð??®ð??¦ð??±ð???ð??¦ð??? GSocket ð???ð??®ð??ªð??¥ fd: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "ð??³ð??¯ð??±ð???ð??©ð??¤ ð??? ð???ð??®ð??¦ð??±ð??? ð???ð??ªð???ð??©ð???: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "ð??³ð??¯ð??´ð??¯ ð???ð??®ð??´ð???ð??©ð???ð??ªð??¤ ð??¢ð??ªð??? ð???ð???ð??§ð???ð??¦ð???ð??²ð???"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??§ð??? ð??¤ð??´ð???ð??©ð??¤ ð??©ð???ð??®ð??§ð???: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??§ð??? ð??®ð??¦ð??¥ð??´ð??? ð??©ð???ð??®ð??§ð???: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð??¤ð??¦ð???ð??©ð??¯: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "ð??»ð??¼ ð???ð??²ð??¯ð???ð??¦ð??? ð??? ð??©ð???ð??®ð??§ð???: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "ð??»ð??¼ ð??¨ð???ð???ð??§ð???ð???ð??¦ð??? ð???ð??©ð??¯ð??§ð???ð???ð??©ð??¯: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "ð??»ð??¼ ð???ð??©ð??¯ð??§ð???ð???ð??¦ð???: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "ð???ð??©ð??¯ð??§ð???ð???ð??©ð??¯ ð??¦ð??¯ ð???ð??®ð??´ð???ð??®ð??§ð???"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "ð??»ð??¼ ð???ð??©ð??¯ð??§ð???ð???ð??¦ð???: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "ð??³ð??¯ð??±ð???ð??©ð??¤ ð??? ð???ð??§ð??? ð???ð??§ð??¯ð???ð??¦ð??? ð??»ð??¼: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "ð??»ð??¼ ð??®ð??¦ð???ð??°ð???ð??¦ð??? ð???ð??±ð???ð??©: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "ð??»ð??¼ ð???ð??§ð??¯ð???ð??¦ð??? ð???ð??±ð???ð??©: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "ð??»ð??¼ ð???ð??¤ð??´ð???ð??¦ð??? ð???ð??ªð???ð??©ð???: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "ð??¢ð??±ð???ð??¦ð??? ð???ð??¹ ð???ð??ªð???ð??©ð??? ð???ð??©ð??¯ð???ð??¦ð???ð??©ð??¯: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "ð??»ð??¼ ð???ð??§ð??¯ð???ð??¦ð??? ð??¥ð??§ð???ð??¦ð??¡: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage ð??¯ð??ªð??? ð???ð??©ð???ð??¹ð???ð??©ð??? ð??ªð??¯ Â·ð??¢ð??¦ð??¯ð???ð??´ð???"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "ð??»ð??¼ ð??®ð??¦ð???ð??°ð???ð??¦ð??? ð??¥ð??§ð???ð??¦ð??¡: %s"
diff --git a/po/en_CA.po b/po/en_CA.po
index 7f3b4c0..0ff037d 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2005-08-27 16:20-0400\n"
 "Last-Translator: Adam Weinberger <adamw gnome org>\n"
 "Language-Team: Canadian English <adamw gnome org>\n"
@@ -1157,7 +1157,7 @@ msgstr "Invalid byte sequence in conversion input"
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 #, fuzzy
 msgid "Cancellable initialization not supported"
 msgstr "Operation not supported"
@@ -1959,109 +1959,113 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Unknown option %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 #, fuzzy
 msgid "Socket is already closed"
 msgstr "Source stream is already closed"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "Error reading from file: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "Unable to create trash dir %s: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "Error writing to file: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "Error during conversion: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "Error truncating file: %s"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "Error opening file: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Unable to trash file: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "Error removing file: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "Error opening file: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "Error closing file: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "Error opening file: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 #, fuzzy
 msgid "GSocketControlMessage not supported on windows"
 msgstr "association changes not supported on win32"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "Error removing file: %s"
diff --git a/po/en_GB.po b/po/en_GB.po
index 51972af..13e1f5c 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-02-24 15:27+0100\n"
 "Last-Translator: Philip Withnall <philip tecnocode co uk>\n"
 "Language-Team: British English <en li org>\n"
@@ -1159,7 +1159,7 @@ msgstr "Incomplete multibyte sequence in input"
 msgid "Not enough space in destination"
 msgstr "Not enough space in destination"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "Cancellable initialisation not supported"
 
@@ -1948,106 +1948,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Unknown option %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "Invalid socket, not initialised"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Invalid socket, initialisation failed due to: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "Socket is already closed"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "creating GSocket from fd: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Unable to create socket: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "Unknown protocol was specified"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "could not get local address: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "could not get remote address: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "could not listen: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Error binding to address: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Error accepting connection: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "Error connecting: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "Connection in progress"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "Error connecting: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Unable to get pending error: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Error receiving data: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Error sending data: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Error closing socket: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Waiting for socket condition: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Error sending message: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage not supported on Windows"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Error receiving message: %s"
diff --git a/po/eo.po b/po/eo.po
index 5361d75..db2fd52 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib 2.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2003-07-01 15:10-0500\n"
 "Last-Translator: Charles Voelger <cvoelger dweasel com>\n"
 "Language-Team: Esperanto <LL li org>\n"
@@ -1158,7 +1158,7 @@ msgstr "Nevalida bitokosekvenco en konverta enigo"
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr ""
 
@@ -1949,107 +1949,111 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr ""
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr ""
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "Eraro dum legado de dosiero '%s': %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "Malsukcesis krei dosieron '%s': %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, fuzzy, c-format
 msgid "could not get remote address: %s"
 msgstr "Ne eblis akiri %lu bitokojn por lego de dosiero \"%s\""
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "Eraro dum legado de dosiero '%s': %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "Eraro dum konverto: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "Eraro dum legado de dosiero '%s': %s"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "Eraro dum legado de dosiero '%s': %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Malsukcesis krei dosieron '%s': %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "Eraro dum legado de dosiero '%s': %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "Eraro dum legado de dosiero '%s': %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "Eraro dum legado de dosiero '%s': %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "Eraro dum legado de dosiero '%s': %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr ""
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "Eraro dum legado de dosiero '%s': %s"
diff --git a/po/es.po b/po/es.po
index 78469af..39b0cc7 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-04-21 18:46+0200\n"
 "Last-Translator: Jorge GonzÃ¡lez <jorgegonz svn gnome org>\n"
 "Language-Team: EspaÃ±ol <gnome-es-list gnome org>\n"
@@ -1200,7 +1200,7 @@ msgstr "Secuencia multibyte incompleta en la entrada"
 msgid "Not enough space in destination"
 msgstr "No hay suficiente espacio en el destino"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "La inicializaciÃ³n cancelable no eestÃ¡ soportada"
 
@@ -2011,106 +2011,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "OpciÃ³n desconocida %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "Socket no vÃ¡lido, no inicializado"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Socket no vÃ¡lido, fallÃ³ la instalaciÃ³n debido a: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "El socket ya estÃ¡ cerrado"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "creando el GSocket desde fd: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "No se pudo crear el socket: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "Se especificÃ³ un protocolo desconocido"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "no se pudo obtener la direcciÃ³n local: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "no se pudo obtener la direcciÃ³n remota: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "no se pudo escuchar: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Error al vincular con la direcciÃ³n: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Error al aceptar la conexiÃ³n: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "Error al conectar: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "ConexiÃ³n en progreso"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "Error al conectar: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "No se pudo obtener el error pendiente: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Error al recibir los datos: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Error al enviar los datos: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Error al cerrar el socket: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Esperando la condiciÃ³n del socket: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Error al enviar el mensaje: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage no estÃ¡ soportado en win32"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Error al recibir el mensaje: %s"
diff --git a/po/et.po b/po/et.po
index b04588f..98ed95b 100644
--- a/po/et.po
+++ b/po/et.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLib MASTER\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-03-05 09:47+0200\n"
 "Last-Translator: Ivar Smolin <okul linux ee>\n"
 "Language-Team: Estonian <gnome-et linux ee>\n"
@@ -1165,7 +1165,7 @@ msgstr "Sisendis olev mitmebaidine jada on poolik"
 msgid "Not enough space in destination"
 msgstr "Sihtkohas pole piisavalt vaba ruumi"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "TÃ¼histatav kÃ¤ivitamine ei ole toetatud"
 
@@ -1959,106 +1959,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Tundmatu vÃµti %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "Vigane sokkel, kÃ¤ivitamata"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Vigane sokkel, kÃ¤ivitamine nurjus kuna: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "Sokkel on juba suletud"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "GSocketi loomine fd-st: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Soklit pole vÃµimalik luua: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "Etteantud protokoll on tundmatu"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "kohalikku aadressi ei suudeta mÃ¤Ã¤rata: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "kaugaadressi ei suudeta mÃ¤Ã¤rata: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "pole vÃµimalik kuulata: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Viga aadressile sidumisel: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Viga Ã¼hendusega nÃµustumisel: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "Viga Ã¼hendumisel: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "Ã?hendumise edenemine"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "Viga Ã¼hendumisel: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Aktiivset viga pole vÃµimalik saada: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Viga andmete vastuvÃµtmisel: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Viga andmete saatmisel: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Viga sokli sulgemisel: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Sokli Ã¼lesseadmise ootamine: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Viga sÃµnumi saatmisel: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage pole windows-platvormil toetatud"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Viga sÃµnumi vastuvÃµtmisel: %s"
diff --git a/po/eu.po b/po/eu.po
index fa83059..66d7431 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-03-22 12:31+0100\n"
 "Last-Translator: IÃ±aki LarraÃ±aga Murgoitio <dooteo euskalgnu org>\n"
 "Language-Team: Basque <itzulpena euskalgnu org>\n"
@@ -1198,7 +1198,7 @@ msgstr "Byteen sekuentzia baliogabea sarreran"
 msgid "Not enough space in destination"
 msgstr "Ez dago nahikoa lekurik helburuan"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "Hasieratzea bertan behera uztea ez dago onartuta"
 
@@ -1996,106 +1996,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "%s aukera ezezaguna"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "Baliogabeko socket-a, hasieratu gabe dago"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Baliogabeko socket-a, hasieratzeak huts egin du: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "Socket-a jadanik itxita dago"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "GSocket sortzen fd-tik: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Ezin da socket-a sortu: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "Protokolo ezezaguna zehaztu da"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "ezin izan da lokaleko helbidea lortu: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "ezin izan da urruneko helbidea lortu: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "ezin izan da entzun: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Errorea helbidea lotzean: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Errorea konexioa onartzean: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "Errorea konektatzean: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "Konexioa lantzen"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "Errorea konektatzean: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Ezin da falta diren erroreak lortu: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Errorea datuak jasotzean: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Errorea datuak bidaltzean: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Errorea socket-a ixtean: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Socket-aren baldintzen zai: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Errorea mezua bidaltzean: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage ez da windows sisteman onartzen"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Errorea mezua jasotzean: %s"
diff --git a/po/fa.po b/po/fa.po
index 92e3003..1787959 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2006-09-04 18:36+0330\n"
 "Last-Translator: Roozbeh Pournader <roozbeh farsiweb info>\n"
 "Language-Team: Persian\n"
@@ -1164,7 +1164,7 @@ msgstr "Ø¯Ù?Ø¨Ø§Ù?Ù?Ù? Ø¨Ø§Û?ØªÛ? Ù?Ø§Ù?Ø¹ØªØ¨Ø± Ø¯Ø± Ù?Ø±Ù?Ø¯Û? ØªØ¨Ø¯Û?Ù?"
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 #, fuzzy
 msgid "Cancellable initialization not supported"
 msgstr "Ù¾Û?Ù?Ù?Ø¯Ù?Ø§Û? Ù?Ù?Ø§Ø¯Û? Ù¾Ø´ØªÛ?Ø¨Ø§Ù?Û? Ù?Ù?Û?â??Ø´Ù?Ù?Ø¯"
@@ -1962,107 +1962,111 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Ú¯Ø²Û?Ù?Ù?Ù? Ù?Ø§Ù?Ø¹Ù?Ù?Ù? %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr ""
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "Ø®Ø·Ø§ Ø¯Ø± Ø®Ù?Ø§Ù?Ø¯Ù? Ù¾Ø±Ù?Ù?Ø¯Ù?Ù? Â«â??%sÂ»â??: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "Ø§Û?Ø¬Ø§Ø¯ Ù¾Ø±Ù?Ù?Ø¯Ù?Ù? Â«â??%sÂ» Ø´Ú©Ø³Øª Ø®Ù?Ø±Ø¯: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, fuzzy, c-format
 msgid "could not get remote address: %s"
 msgstr "Ù?Ù?Û?â??ØªÙ?Ø§Ù? %Ilu Ø¨Ø§Û?Øª Ø¨Ø±Ø§Û? Ø®Ù?Ø§Ù?Ø¯Ù? Ù¾Ø±Ù?Ù?Ø¯Ù?Ù? Â«%sÂ» ØªØ®ØµÛ?Øµ Ø¯Ø§Ø¯"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "Ø®Ø·Ø§ Ø¯Ø± Ø®Ù?Ø§Ù?Ø¯Ù? Ù¾Ø±Ù?Ù?Ø¯Ù?Ù? Â«â??%sÂ»â??: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "Ø®Ø·Ø§ Ø¯Ø± ØÛ?Ù? ØªØ¨Ø¯Û?Ù?: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "Ø®Ø·Ø§ Ø¯Ø± Ø®Ù?Ø§Ù?Ø¯Ù? Ù¾Ø±Ù?Ù?Ø¯Ù?Ù? Â«â??%sÂ»â??: %s"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "Ø®Ø·Ø§ Ø¯Ø± Ø®Ù?Ø§Ù?Ø¯Ù? Ù¾Ø±Ù?Ù?Ø¯Ù?Ù? Â«â??%sÂ»â??: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Ø§Û?Ø¬Ø§Ø¯ Ù¾Ø±Ù?Ù?Ø¯Ù?Ù? Â«â??%sÂ» Ø´Ú©Ø³Øª Ø®Ù?Ø±Ø¯: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "Ø®Ø·Ø§ Ø¯Ø± Ø®Ù?Ø§Ù?Ø¯Ù? Ù¾Ø±Ù?Ù?Ø¯Ù?Ù? Â«â??%sÂ»â??: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "Ø®Ø·Ø§ Ø¯Ø± Ø®Ù?Ø§Ù?Ø¯Ù? Ù¾Ø±Ù?Ù?Ø¯Ù?Ù? Â«â??%sÂ»â??: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "Ø®Ø·Ø§ Ø¯Ø± Ø®Ù?Ø§Ù?Ø¯Ù? Ù¾Ø±Ù?Ù?Ø¯Ù?Ù? Â«â??%sÂ»â??: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "Ø®Ø·Ø§ Ø¯Ø± Ø®Ù?Ø§Ù?Ø¯Ù? Ù¾Ø±Ù?Ù?Ø¯Ù?Ù? Â«â??%sÂ»â??: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr ""
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "Ø®Ø·Ø§ Ø¯Ø± Ø®Ù?Ø§Ù?Ø¯Ù? Ù¾Ø±Ù?Ù?Ø¯Ù?Ù? Â«â??%sÂ»â??: %s"
diff --git a/po/fi.po b/po/fi.po
index eb776c1..2899ef2 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-03-20 00:00+0200\n"
 "Last-Translator: Tommi Vainikainen <thv iki fi>\n"
 "Language-Team: Finnish <gnome-fi-laatu lists sourceforge net>\n"
@@ -1179,7 +1179,7 @@ msgstr "Virheellinen monitavusarja syÃ¶tteessÃ¤"
 msgid "Not enough space in destination"
 msgstr "Kohteessa ei ole tarpeeksi tilaa"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "Keskeytyskelpoinen alustus ei ole tuettu"
 
@@ -1971,106 +1971,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Tuntematon valitsin %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "Virheellinen pistoke, alustamaton"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Virheellinen pistoke, alustus epÃ¤onnistui: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "Pistoke on jo suljettu"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "luodaan GSocket tiedostokahvasta: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Pistoketta ei voi luoda: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "Tuntematon protokolla mÃ¤Ã¤ritetty"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "ei saatu paikallista osoitetta: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "ei saatu etÃ¤osoitetta: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "ei voitu kuunnella: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Virhe sidottaessa osoitetta: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Virhe hyvÃ¤ksyttÃ¤essÃ¤ yhteyttÃ¤: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "Virhe yhteydenotossa: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "Yhteydenotto meneillÃ¤Ã¤n"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "Virhe yhteydenotossa: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Ei saatu tulossa olevaa virhettÃ¤: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Virhe vastaanotettaessa dataa: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Virhe lÃ¤hetettÃ¤essÃ¤ dataa: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Virhe suljettaessa pistoketta: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Odotetaan pistoke-ehtoa: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Virhe lÃ¤hetettÃ¤essÃ¤ viestiÃ¤: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage ei ole tuettu windowis-alustalla"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Virhe vastaanotettaessa viestiÃ¤: %s"
diff --git a/po/fr.po b/po/fr.po
index c83f1be..13766c8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-03-05 22:31+0100\n"
 "Last-Translator: Claude Paroz <claude 2xlibre net>\n"
 "Language-Team: GNOME French Team <gnomefr traduc org>\n"
@@ -1231,7 +1231,7 @@ msgstr "SÃ©quence multi-octet incomplÃ¨te en entrÃ©e"
 msgid "Not enough space in destination"
 msgstr "Espace insuffisant dans la destination"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "Initialisation annulable non prise en charge"
 
@@ -2034,107 +2034,111 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Option inconnue %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "Connecteur rÃ©seau non valide, non initialisÃ©"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 "Connecteur rÃ©seau non valide, l'initialisation a Ã©chouÃ© en raison deÂ : %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "Le connecteur rÃ©seau est dÃ©jÃ  fermÃ©"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "crÃ©ation de GSocket Ã  partir de fdÂ : %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Impossible de crÃ©er le connecteur rÃ©seauÂ : %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "Un protocole inconnu a Ã©tÃ© indiquÃ©"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "impossible d'obtenir l'adresse localeÂ : %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "impossible d'obtenir l'adresse distanteÂ : %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "impossible d'Ã©couterÂ : %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Erreur lors de liaison Ã  l'adresseÂ : %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Erreur d'acceptation de la connexionÂ : %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "Erreur de connexionÂ : "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "Connexion en cours"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "Erreur de connexionÂ : %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Impossible d'obtenir l'erreur actuelleÂ : %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Erreur de rÃ©ception de donnÃ©esÂ : %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Erreur d'envoi de donnÃ©esÂ : %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Erreur de fermeture du connecteur rÃ©seauÂ : %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Attente de la condition du connecteur rÃ©seauÂ : %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Erreur d'envoi de messageÂ : %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage n'est pas pris en en charge sur windows"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Erreur de rÃ©ception de messageÂ : %s"
diff --git a/po/ga.po b/po/ga.po
index 26c5c5c..6159d5b 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2009-08-08 01:49-0600\n"
 "Last-Translator: SeÃ¡n de BÃºrca <leftmostcat gmail com>\n"
 "Language-Team: Irish <gaeilge-gnulinux lists sourceforge net>\n"
@@ -1126,7 +1126,7 @@ msgstr ""
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr ""
 
@@ -1915,106 +1915,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Rogha anaithnid %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr ""
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "GSocket Ã¡ chruthÃº Ã³ fd: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "NÃ fÃ©idir soicÃ©ad a chruthÃº: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "EarrÃ¡id agus Ã¡ cheangal le seoladh: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "EarrÃ¡id agus ag glacadh leis an gceangal: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "EarrÃ¡id agus Ã¡ nasc: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "EarrÃ¡id agus Ã¡ nasc: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "NÃ fÃ©idir earrÃ¡id ar feitheamh a fhÃ¡il: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "EarrÃ¡id agus sonraÃ Ã¡ bhfÃ¡il: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "EarrÃ¡id agus sonraÃ Ã¡ seoladh: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "EarrÃ¡id agus soicÃ©ad Ã¡ dhÃºnadh: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "EarrÃ¡id agus teachtaireacht Ã¡ seoladh: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr ""
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "EarrÃ¡id agus teachtaireacht Ã¡ fÃ¡il: %s"
diff --git a/po/gl.po b/po/gl.po
index bc1caa6..7edf410 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-04-22 09:56+0200\n"
 "Last-Translator: Fran DiÃ©guez <frandieguez ubuntu com>\n"
 "Language-Team: Galician <gnome g11n net>\n"
@@ -1212,7 +1212,7 @@ msgstr "A secuencia de bytes non Ã© vÃ¡lida na entrada da conversiÃ³n"
 msgid "Not enough space in destination"
 msgstr "Non hai espazo abondo para o enderezo do socket"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "Non se permite a inicializaciÃ³n cancelÃ¡bel"
 
@@ -2036,106 +2036,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Orde '%s' descoÃ±ecida\n"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "O socket non Ã© correcto, non se inicialiou"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "O socket non Ã© correcto, a inicializaciÃ³n fallou debido a: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "O fluxo de orixe xa estÃ¡ pechado"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "creando o GSocket a partir de fd: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Non Ã© posÃbel crear o socket: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "Foi especificado un protocolo descoÃ±ecido"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "Non foi posÃbel obter un enderezo local: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "non foi posÃbel obter un enderezo remoto: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "non foi posÃbel escoitar: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Produciuse un erro ao conectar co enderezo: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Produciuse un erro ao aceptar a conexiÃ³n : %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "Produciuse un erro ao conectar: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "ConexiÃ³n en marcha"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "Produciuse un erro ao conectar: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Non Ã© posÃbel obter o erro pendente: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Produciuse un erro ao recibir datos: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Produciuse un erro ao enviar datos: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Produciuse un erro ao pechar o socket: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Agardando pola situaciÃ³n do socket: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Produciuse un erro ao enviar a mensaxe: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "O GSocketControlMessage non estÃ¡ permitido en windows"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Produciuse un erro ao recibir a mensaxe: %s"
diff --git a/po/gu.po b/po/gu.po
index ebbf00f..1fcf179 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib.master.gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-04-15 16:38+0530\n"
 "Last-Translator: Sweta Kothari <swkothar redhat com>\n"
 "Language-Team: Gujarati\n"
@@ -1152,7 +1152,7 @@ msgstr "àª?àª¨àªªà«?àª?àª®àª¾àª? àª?àª¸àª?àªªà«?àª°à«?àª£ àª®àª²à«?àª?à«?àª¬àª¾
 msgid "Not enough space in destination"
 msgstr "àª²àª?à«?àª·à«?àª¯àª®àª¾àª? àªªà«?àª°àª¤à«? àª?àª?à«?àª¯àª¾ àª¨àª¥à«?"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "àª°àª¦ àª?àª°à«? àª¶àª?àª¾àª¯ àª¤à«?àªµà«? àªªà«?àª°àª¾àª°àª?àª àª?àª§àª¾àª°àªà«?àª¤ àª¨àª¥à«?"
 
@@ -1939,106 +1939,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "àª?àª?à«?àª?àª¾àª¤ àªµàª¿àª?àª²à«?àªª %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "àª?àª¯à«?àª?à«?àª¯ àª¸à«?àª?à«?àª?, àªªà«?àª°àª¾àª°àª?àª àª¥àª¯à«?àª² àª¨àª¥à«?"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "àª?àª¯à«?àª?à«?àª¯ àª¸à«?àª?à«?àª?, àª¦àª°àª®à«?àª¯àª¾àª¨ àªªà«?àª°àª¾àª°àª?àª àª¨àª¿àª·à«?àª«àª³: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "àª¸à«?àª?à«?àª? àªªàª¹à«?àª²à«?àª¥à«? àª? àª¬àª?àª§ àª¥àª¯à«?àª² àª?à«?"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "fd àª®àª¾àª?àª¥à«? GSocket àª¨à«? àª¬àª¨àª¾àªµà«? àª°àª¹à«?àª¯àª¾ àª?à«?: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "àª¸à«?àª?à«?àª? àª¨à«? àª¬àª¨àª¾àªµàªµàª¾àª®àª¾àª? àª?àª¸àª®àª°à«?àª¥: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "àª?àª?à«?àª?àª¾àª¤ àªªà«?àª°à«?àª?à«?àª?à«?àª² àª¸à«?àªªàª·à«?àª? àª¥àª¯à«?àª² àª¹àª¤à«?"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "àª¸à«?àª¥àª¾àª¨àª¿àª¯ àª¸àª°àª¨àª¾àª®àª¾àª?àª¨à«? àª®à«?àª³àªµà«? àª¶àª?àª¾àª¯à«? àª¨àª¹àª¿àª?: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "àª¦à«?àª°àª¸à«?àª¥ àª¸àª°àª¨àª¾àª®àª¾àª?àª¨à«? àª®à«?àª³àªµà«? àª¶àª?àª¾àª¯à«? àª¨àª¹àª¿àª?: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "àª¸àª¾àª?àªàª³à«? àª¶àª?àª¾àª¯à«? àª¨àª¹àª¿àª?: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "àª¸àª°àª¨àª¾àª®àª¾àª?àª¨à«? àª¬àª¾àª?àª¨à«?àª¡ àª?àª°à«? àª°àª¹à«?àª¯àª¾ àª¹à«?àª¯ àª¤à«?àª¯àª¾àª°à«? àªà«?àª²: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "àª?à«?àª¡àª¾àª£àª¨à«? àª¸à«?àªµà«?àª?àª¾àª°à«? àª°àª¹à«?àª¯àª¾ àª¹à«?àª¯ àª¤à«?àª¯àª¾àª°à«? àªà«?àª²: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "àª?à«?àª¡àª¾àª? àª°àª¹à«?àª¯àª¾ àª¹à«?àª¯ àª¤à«?àª¯àª¾àª°à«? àªà«?àª²: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "àª?à«?àª¡àª¾àª£ àªªà«?àª°àª?àª¤àª¿àª®àª¾àª? àª?à«?"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "àª?à«?àª¡àª¾àª? àª°àª¹à«?àª¯àª¾ àª¹à«?àª¯ àª¤à«?àª¯àª¾àª°à«? àªà«?àª²: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "àªªà«?àª¨à«?àª¡àª¿àª?àª? àªà«?àª² àª¨à«? àª®à«?àª³àªµàªµàª¾àª®àª¾àª? àª?àª¸àª®àª°à«?àª¥: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "àª®àª¾àª¹àª¿àª¤à«? àª®à«?àª³àªµà«? àª°àª¹à«?àª¯àª¾ àª¹à«?àª¯ àª¤à«?àª¯àª¾àª°à«? àªà«?àª²: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "àª®àª¾àª¹àª¿àª¤à«? àª®à«?àª?àª²à«? àª°àª¹à«?àª¯àª¾ àª¹à«?àª¯ àª¤à«?àª¯àª¾àª°à«? àªà«?àª²: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "àª¸à«?àª?à«?àª?àª¨à«? àª¬àª?àª§ àª?àª°à«? àª°àª¹à«?àª¯àª¾ àª¹à«?àª¯ àª¤à«?àª¯àª¾àª°à«? àªà«?àª²: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "àª¸à«?àª?à«?àª? àª¶àª°àª¤ àª®àª¾àª?à«? àª°àª¾àª¹ àª?à«?àª? àª°àª¹à«?àª¯àª¾ àª?à«?: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "àª¸àª?àª¦à«?àª¶à«? àª®à«?àª?àª²à«? àª°àª¹à«?àª¯àª¾ àª¹à«?àª¯ àª¤à«?àª¯àª¾àª°à«? àªà«?àª²: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage àª? àªµàª¿àª¨à«?àª¡à«? àªªàª° àª?àª§àª¾àª°àªà«?àª¤ àª¨àª¥à«?"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "àªà«?àª² àª®à«?àª³àªµà«? àª°àª¹à«?àª¯àª¾ àª¹à«?àª¯ àª¤à«?àª¯àª¾àª°à«? àªà«?àª²: %s"
diff --git a/po/he.po b/po/he.po
index d32501e..e8ddcdd 100644
--- a/po/he.po
+++ b/po/he.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib.HEAD.he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2009-09-06 09:32+0200\n"
 "Last-Translator: Yaron Shahrabani <sh yaron gmail com>\n"
 "Language-Team: Hebrew <he li org>\n"
@@ -1167,7 +1167,7 @@ msgstr "Invalid byte sequence in conversion input"
 msgid "Not enough space in destination"
 msgstr "Not enough space for socket address"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "Cancellable initialization not supported"
 
@@ -1956,106 +1956,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Unknown option %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "Invalid socket, not initialized"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Invalid socket, initialization failed due to: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "Socket is already closed"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "creating GSocket from fd: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Unable to create socket: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "Unknown protocol was specified"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "could not get local address: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "could not get remote address: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "could not listen: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Error binding to address: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Error accepting connection: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "Error connecting: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "Connection in progress"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "Error connecting: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Unable to get pending error: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Error receiving data: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Error sending data: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Error closing socket: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Waiting for socket condition: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Error sending message: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage not supported on windows"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Error receiving message: %s"
diff --git a/po/hi.po b/po/hi.po
index d044f9f..009ee8e 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2009-09-11 15:59+0530\n"
 "Last-Translator: Rajesh Ranjan <rajesh672 gmail com>\n"
 "Language-Team: Hindi <hindi.sf.net>\n"
@@ -1157,7 +1157,7 @@ msgstr "à¤ªà¤°à¤¿à¤µà¤°à¥?à¤¤à¤¨ à¤?à¤¨à¤ªà¥?à¤? à¤®à¥?à¤? à¤?à¤µà¥?à¤§ à¤¬à¤¾
 msgid "Not enough space in destination"
 msgstr "à¤¸à¥?à¤?à¥?à¤? à¤ªà¤¤à¤¾ à¤?à¥? à¤²à¤¿à¤? à¤ªà¤°à¥?à¤¯à¤¾à¤ªà¥?à¤¤ à¤¸à¥?à¤¥à¤¾à¤¨ à¤¨à¤¹à¥?à¤?"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "à¤°à¤¦à¥?à¤¦ à¤?à¤°à¤¨à¥? à¤¯à¥?à¤?à¥?à¤¯ à¤?à¤°à¤?à¤à¥?à¤?à¤°à¤£ à¤¸à¤®à¤°à¥?à¤¥à¤¿à¤¤ à¤¨à¤¹à¥?à¤? à¤¹à¥?"
 
@@ -1950,106 +1950,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "à¤?à¤¨à¤?à¤¾à¤¨ à¤µà¤¿à¤?à¤²à¥?à¤ª %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "à¤?à¤µà¥?à¤§ à¤¸à¥?à¤?à¥?à¤?, à¤?à¤°à¤?à¤à¥?à¤?à¥?à¤¤ à¤¨à¤¹à¥?à¤?"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "à¤?à¤µà¥?à¤§ à¤¸à¥?à¤?à¥?à¤?, à¤?à¤¸à¤?à¥? à¤?à¤¾à¤°à¤£ à¤?à¤°à¤?à¤à¥?à¤?à¤°à¤£ à¤µà¤¿à¤«à¤²: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "à¤¸à¥?à¤?à¥?à¤? à¤ªà¤¹à¤²à¥? à¤¸à¥? à¤¬à¤?à¤¦ à¤¹à¥?"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "fd à¤¸à¥? GSocket à¤¬à¤¨à¤¾ à¤°à¤¹à¤¾ à¤¹à¥?: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "à¤¸à¥?à¤?à¥?à¤? à¤¬à¤¨à¤¾à¤¨à¥? à¤®à¥?à¤? à¤?à¤¸à¤®à¤°à¥?à¤¥: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "à¤?à¤?à¥?à¤?à¤¾à¤¤ à¤ªà¥?à¤°à¥?à¤?à¥?à¤?à¥?à¤² à¤¨à¤¿à¤°à¥?à¤¦à¤¿à¤·à¥?à¤? à¤?à¤¿à¤¯à¤¾ à¤?à¤¯à¤¾ à¤¥à¤¾"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "à¤¸à¥?à¤¥à¤¾à¤¨à¥?à¤¯ à¤ªà¤¤à¤¾ à¤¨à¤¹à¥?à¤? à¤ªà¤¾ à¤¸à¤?à¤¾: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "à¤¦à¥?à¤°à¤¸à¥?à¤¥ à¤ªà¤¤à¤¾ à¤¨à¤¹à¥?à¤? à¤ªà¤¾ à¤¸à¤?à¤¾: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "à¤¸à¥?à¤¨ à¤¨à¤¹à¥?à¤? à¤¸à¤?à¤¾: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "à¤ªà¤¤à¤¾ à¤®à¥?à¤? à¤¬à¤¾à¤?à¤§à¤¨à¥? à¤®à¥?à¤? à¤¤à¥?à¤°à¥?à¤?à¤¿: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "à¤?à¤¨à¥?à¤?à¥?à¤¶à¤¨ à¤¸à¥?à¤µà¥?à¤?à¤¾à¤° à¤?à¤°à¤¨à¥? à¤®à¥?à¤? à¤¤à¥?à¤°à¥?à¤?à¤¿: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "à¤?à¤¨à¥?à¤?à¥?à¤? à¤?à¤°à¤¨à¥? à¤®à¥?à¤? à¤¤à¥?à¤°à¥?à¤?à¤¿: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "à¤?à¤¨à¥?à¤?à¥?à¤¶à¤¨ à¤ªà¥?à¤°à¤?à¤¤à¤¿ à¤®à¥?à¤?"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "à¤?à¤¨à¥?à¤?à¥?à¤? à¤?à¤°à¤¨à¥? à¤®à¥?à¤? à¤¤à¥?à¤°à¥?à¤?à¤¿: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "à¤¸à¥?à¤¥à¤?à¤¿à¤¤ à¤¤à¥?à¤°à¥?à¤?à¤¿ à¤ªà¤¾à¤¨à¥? à¤®à¥?à¤? à¤?à¤¸à¤®à¤°à¥?à¤¥: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "à¤?à¤?à¤?à¤¡à¤¼à¤¾ à¤ªà¤¾à¤¨à¥? à¤®à¥?à¤? à¤¤à¥?à¤°à¥?à¤?à¤¿: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "à¤?à¤?à¤?à¤¡à¤¼à¤¾ à¤à¥?à¤?à¤¨à¥? à¤®à¥?à¤? à¤¤à¥?à¤°à¥?à¤?à¤¿: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "à¤¸à¥?à¤?à¥?à¤? à¤¬à¤?à¤¦ à¤?à¤°à¤¨à¥? à¤®à¥?à¤? à¤¤à¥?à¤°à¥?à¤?à¤¿: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "à¤¸à¥?à¤?à¥?à¤? à¤¸à¥?à¤¥à¤¿à¤¤à¤¿ à¤?à¥? à¤²à¤¿à¤? à¤ªà¥?à¤°à¤¤à¥?à¤?à¥?à¤·à¤¾à¤°à¤¤: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "à¤¸à¤?à¤¦à¥?à¤¶ à¤à¥?à¤?à¤¨à¥? à¤®à¥?à¤? à¤¤à¥?à¤°à¥?à¤?à¤¿: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage à¤µà¤¿à¤?à¤¡à¥?à¤? à¤ªà¤° à¤¸à¤®à¤°à¥?à¤¥à¤¿à¤¤ à¤¨à¤¹à¥?à¤?"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "à¤¸à¤?à¤¦à¥?à¤¶ à¤ªà¤¾à¤¨à¥? à¤®à¥?à¤? à¤¤à¥?à¤°à¥?à¤?à¤¿: %s"
diff --git a/po/hr.po b/po/hr.po
index 20f77ad..39b37ad 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib 0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2008-05-18 15:38+0000\n"
 "Last-Translator: Launchpad Translations Administrators <rosetta launchpad "
 "net>\n"
@@ -1172,7 +1172,7 @@ msgstr "Neispravna sekvenca bajtova u izlazu konverzije"
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 #, fuzzy
 msgid "Cancellable initialization not supported"
 msgstr "Nisu podrÅ¾ane simboliÄ?ke veze"
@@ -1967,107 +1967,111 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Nepoznata opcija %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr ""
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "GreÅ¡ka pri Ä?itanju datoteke '%s': %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "GreÅ¡ka pri stvaranju datoteke '%s': %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "GreÅ¡ka pri Ä?itanju datoteke '%s': %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "GreÅ¡ka prilikom konverzije: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "GreÅ¡ka pri Ä?itanju datoteke '%s': %s"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "GreÅ¡ka pri Ä?itanju datoteke '%s': %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "GreÅ¡ka pri stvaranju datoteke '%s': %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "GreÅ¡ka pri Ä?itanju datoteke '%s': %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "GreÅ¡ka pri Ä?itanju datoteke '%s': %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "GreÅ¡ka pri Ä?itanju datoteke '%s': %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "GreÅ¡ka pri Ä?itanju datoteke '%s': %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr ""
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "GreÅ¡ka pri Ä?itanju datoteke '%s': %s"
diff --git a/po/hu.po b/po/hu.po
index f4f7cc6..fe4cbda 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-03-05 22:02+0100\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
 "Language-Team: Hungarian <gnome at fsf dot hu>\n"
@@ -1195,7 +1195,7 @@ msgstr "Ã?rvÃ©nytelen tÃ¶bb bÃ¡jtos sorozat a bemenetben"
 msgid "Not enough space in destination"
 msgstr "Nincs elÃ©g hely a cÃ©lon"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "A megszakÃthatÃ³ elÅ?kÃ©szÃtÃ©s nem tÃ¡mogatott"
 
@@ -1991,106 +1991,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Ismeretlen kapcsolÃ³: %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "Ã?rvÃ©nytelen foglalat, nincs elÅ?kÃ©szÃtve"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Ã?rvÃ©nytelen foglalat, az elÅ?kÃ©szÃtÃ©s meghiÃºsulÃ¡sÃ¡nak oka: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "A foglalat mÃ¡r le van zÃ¡rva"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "GSocket lÃ©trehozÃ¡sa fÃ¡jlleÃrÃ³bÃ³l: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Nem sikerÃ¼lt lÃ©trehozni foglalatot: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "Ismeretlen protokollt adtak meg"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "nem kÃ©rhetÅ? le a helyi cÃm: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "nem kÃ©rhetÅ? le a tÃ¡voli cÃm: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "nem lehet figyelni: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Hiba a cÃmhez csatlakozÃ¡skor: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Hiba a kapcsolat elfogadÃ¡sakor: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "Hiba a csatlakozÃ¡skor: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "CsatlakozÃ¡s folyamatban"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "Hiba a csatlakozÃ¡skor: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Nem lehet lekÃ©rni a fÃ¼ggÅ?ben lÃ©vÅ? hibÃ¡t: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Hiba az adatok fogadÃ¡sakor: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Hiba az adatok kÃ¼ldÃ©sekor: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Hiba a foglalat lezÃ¡rÃ¡sakor: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "VÃ¡rakozÃ¡s a foglalat Ã¡llapotÃ¡ra: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Hiba az Ã¼zenet kÃ¼ldÃ©sekor: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "A GSocketControlMessage nem tÃ¡mogatott Windowson"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Hiba az Ã¼zenet fÃ¡jl eltÃ¡volÃtÃ¡sa fogadÃ¡sakor: %s"
diff --git a/po/hy.po b/po/hy.po
index 344be6a..4bde765 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2006-03-03 16:24+0000\n"
 "Last-Translator: Norayr Chilingaryan <norik freenet am>\n"
 "Language-Team: Armenian <norik freenet am>\n"
@@ -1122,7 +1122,7 @@ msgstr ""
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 #, fuzzy
 msgid "Cancellable initialization not supported"
 msgstr "Õ?Õ«Õ´Õ¾Õ¸Õ¬Õ«Õ¯ Õ°Õ²Õ¸Ö?Õ´Õ¶Õ¥Ö?Õ¨ Õ¹Õ¥Õ¶ Õ¡ÕºÕ¡Õ°Õ¸Õ¾Õ¾Õ¸Ö?Õ´"
@@ -1914,107 +1914,111 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr ""
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr ""
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "'%s' Ö?Õ¡ÕµÕ¬Õ¨ Õ¯Õ¡Ö?Õ¤Õ¡Õ¬Õ¸Ö? Õ½ÕÕ¡Õ¬Õ? %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "Õ?Õ« Õ°Õ¡Õ»Õ¸Õ²Õ¾Õ¥Õ¬ Õ½Õ¿Õ¥Õ²Õ®Õ¥Õ¬ Ö?Õ¡ÕµÕ¬ '%s'Õ? %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "'%s' Ö?Õ¡ÕµÕ¬Õ¨ Õ¯Õ¡Ö?Õ¤Õ¡Õ¬Õ¸Ö? Õ½ÕÕ¡Õ¬Õ? %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "'%s' ÕºÕ¡Õ¶Õ¡Õ¯Õ¨ Õ¢Õ¡Ö?Õ¥Õ¬Õ¸Ö? Õ½ÕÕ¡Õ¬Õ? %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "'%s' Ö?Õ¡ÕµÕ¬Õ¨ Õ¯Õ¡Ö?Õ¤Õ¡Õ¬Õ¸Ö? Õ½ÕÕ¡Õ¬Õ? %s"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "'%s' Ö?Õ¡ÕµÕ¬Õ¨ Õ¯Õ¡Ö?Õ¤Õ¡Õ¬Õ¸Ö? Õ½ÕÕ¡Õ¬Õ? %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Õ?Õ« Õ°Õ¡Õ»Õ¸Õ²Õ¾Õ¥Õ¬ Õ½Õ¿Õ¥Õ²Õ®Õ¥Õ¬ Ö?Õ¡ÕµÕ¬ '%s'Õ? %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "'%s' Ö?Õ¡ÕµÕ¬Õ¨ Õ¯Õ¡Ö?Õ¤Õ¡Õ¬Õ¸Ö? Õ½ÕÕ¡Õ¬Õ? %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "'%s' Ö?Õ¡ÕµÕ¬Õ¨ Õ¯Õ¡Ö?Õ¤Õ¡Õ¬Õ¸Ö? Õ½ÕÕ¡Õ¬Õ? %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "'%s' Ö?Õ¡ÕµÕ¬Õ¨ Õ¯Õ¡Ö?Õ¤Õ¡Õ¬Õ¸Ö? Õ½ÕÕ¡Õ¬Õ? %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "'%s' Ö?Õ¡ÕµÕ¬Õ¨ Õ¯Õ¡Ö?Õ¤Õ¡Õ¬Õ¸Ö? Õ½ÕÕ¡Õ¬Õ? %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr ""
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "'%s' Ö?Õ¡ÕµÕ¬Õ¨ Õ¯Õ¡Ö?Õ¤Õ¡Õ¬Õ¸Ö? Õ½ÕÕ¡Õ¬Õ? %s"
diff --git a/po/id.po b/po/id.po
index 090e6c4..cfbe72b 100644
--- a/po/id.po
+++ b/po/id.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2005-08-30 22:41+0300\n"
 "Last-Translator: Mohammad DAMT <mdamt bisnisweb com>\n"
 "Language-Team: Indonesia <sukarelawan gnome linux or id>\n"
@@ -1190,7 +1190,7 @@ msgstr "Rangkaian byte dalam input konversi tidak benar"
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 #, fuzzy
 msgid "Cancellable initialization not supported"
 msgstr "Link simbolik tidak didukung oleh sistem"
@@ -1987,107 +1987,111 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Pilihan tidak diketahui %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr ""
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "Error saat membaca file '%s': %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "Gagal saat membuat file '%s': %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, fuzzy, c-format
 msgid "could not get remote address: %s"
 msgstr "Gagal untuk merubah moda berkas: waitpid() gagal: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "Error saat membaca file '%s': %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "Error saat melakukan konversi: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "Error saat membaca file '%s': %s"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "Error saat membaca file '%s': %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Gagal saat membuat file '%s': %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "Error saat membaca file '%s': %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "Error saat membaca file '%s': %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "Error saat membaca file '%s': %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "Error saat membaca file '%s': %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr ""
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "Error saat membaca file '%s': %s"
diff --git a/po/is.po b/po/is.po
index 14a07a4..c66caef 100644
--- a/po/is.po
+++ b/po/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib 2.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2003-08-18 18:05+0000\n"
 "Last-Translator: Richard Allen <ra ra is>\n"
 "Language-Team: is <is li org>\n"
@@ -1152,7 +1152,7 @@ msgstr "Ã?gild bÃ¦taruna Ã Ãlagi umbreytingar"
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 #, fuzzy
 msgid "Cancellable initialization not supported"
 msgstr "TÃ¡kntengi eru ekki studd"
@@ -1947,107 +1947,111 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr ""
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr ""
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "Villa viÃ° lestur skrÃ¡arinnar '%s': %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "gat ekki bÃºiÃ° til skrÃ¡na '%s': %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, fuzzy, c-format
 msgid "could not get remote address: %s"
 msgstr "Gat ekki frÃ¡tekiÃ° %lu bÃ¦ti til aÃ° lesa skrÃ¡na \"%s\""
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "Villa viÃ° lestur skrÃ¡arinnar '%s': %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "Villa viÃ° umbreytingu: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "Villa viÃ° lestur skrÃ¡arinnar '%s': %s"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "Villa viÃ° lestur skrÃ¡arinnar '%s': %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "gat ekki bÃºiÃ° til skrÃ¡na '%s': %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "Villa viÃ° lestur skrÃ¡arinnar '%s': %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "Villa viÃ° lestur skrÃ¡arinnar '%s': %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "Villa viÃ° lestur skrÃ¡arinnar '%s': %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "Villa viÃ° lestur skrÃ¡arinnar '%s': %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr ""
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "Villa viÃ° lestur skrÃ¡arinnar '%s': %s"
diff --git a/po/it.po b/po/it.po
index 29e2ac3..038f683 100644
--- a/po/it.po
+++ b/po/it.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib 2.21.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-03-06 01:03+0100\n"
 "Last-Translator: Luca Ferretti <lferrett gnome org>\n"
 "Language-Team: Italian <tp lists linux it>\n"
@@ -1271,7 +1271,7 @@ msgstr "Sequenza multi-byte non valida in ingresso"
 msgid "Not enough space in destination"
 msgstr "Spazio non sufficiente nella destinazione"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "Inizializzazione annullabile non supportata"
 
@@ -2090,107 +2090,111 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Opzione %s sconosciuta"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "Socket non valido, non inizializzato"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Socket non valido, inizializzazione non riuscita a causa di: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "Il socket Ã¨ giÃ  chiuso"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "creazione di GSocket da FD: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Impossibile creare il socket: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "Ã? stato specificato un protocollo sconosciuto"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "impossibile ottenere l'indirizzo locale: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "impossibile ottenere l'indirizzo remoto: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "impossibile restare in ascolto: %s"
 
 # oppure "nell'eseguire il binding" ??
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Errore nel legarsi all'indirizzo: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Errore nell'accettare la connessione: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "Errore nel connettersi: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "Connessione in corso"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "Errore nel connettersi: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Impossibile ottenere l'errore in sospeso: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Errore nel ricevere i dati: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Errore nell'inviare i dati: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Errore nel chiudere il socket: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "In attesa della condizione del socket: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Errore nell'inviare il messaggio: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage non supportato su Windows"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Errore nel ricevere il messaggio: %s"
diff --git a/po/ja.po b/po/ja.po
index c936fac..4d703c6 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2009-09-05 22:30+0900\n"
 "Last-Translator: Takayuki KUSANO <AE5T-KSN asahi-net or jp>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
@@ -1170,7 +1170,7 @@ msgstr "å¤?æ??ã??ã??å?¥å??ã?«ç?¡å?¹ã?ªã??ã?¤ã??ã?®ä¸¦ã?³ã??ã??ã??ã?¾ã??"
 msgid "Not enough space in destination"
 msgstr "ã?½ã?±ã??ã??ã?»ã?¢ã??ã?¬ã?¹ã??ä½?æ??ã??ã??ã??ã??ã?«å??å??ã?ªç©ºã??ã??ã??ã??ã?¾ã??ã??"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "ã?ã?£ã?³ã?»ã?«å?¯è?½ã?ªå??æ??å??ã?¯ã?µã??ã?¼ã??ã??ã??ã?¦ã??ã?¾ã??ã??"
 
@@ -1973,106 +1973,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "%s ã?¯ä¸?æ??ã?ªã?ªã??ã?·ã?§ã?³ã?§ã??"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "ç?¡å?¹ã?ªã?½ã?±ã??ã??ã?§ã??ã??å??æ??å??ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "ç?¡å?¹ã?ªã?½ã?±ã??ã??ã?§ã??ã??å??æ??å??ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "ã?½ã?¼ã?¹ã?¯æ?¢ã?«é??ã??ã??ã??ã?¦ã??ã?¾ã??"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "ã??ã?¡ã?¤ã?«ã??ã?£ã?¹ã?¯ã?ªã??ã?¿ GSocket ã??ä½?æ??: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "ã?½ã?±ã??ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "ä¸?æ??ã?ªã??ã?ã??ã?³ã?«ã??æ??å®?ã??ã??ã?¾ã??ã??"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "ã?ã?¼ã?«ã?«ã?®ã?¢ã??ã?¬ã?¹ã??å??å¾?ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "ã?ªã?¢ã?¼ã??ã?®ã?¢ã??ã?¬ã?¹ã??å??å¾?ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "listen ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "ã?¢ã??ã?¬ã?¹ã?« bind æ??ã?«ã?¨ã?©ã?¼: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "æ?¥ç¶?ã?? accept ã??ã??æ??ã?«ã?¨ã?©ã?¼: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "æ?¥ç¶?ã?¨ã?©ã?¼: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "æ?¥ç¶?ä¸"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "æ?¥ç¶?ä¸ã?«ã?¨ã?©ã?¼: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "ã?¨ã?©ã?¼ã??ã??ã?³ã??ã?£ã?³ã?°ã?§ã??ã?¾ã??ã??ï¼? %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "ã??ã?¼ã?¿ã?®å??ä¿¡æ??ã?«ã?¨ã?©ã?¼: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "ã??ã?¼ã?¿ã?®é??ä¿¡æ??ã?«ã?¨ã?©ã?¼: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "ã?½ã?±ã??ã??ã??é??ã??ã??é??ã?«ã?¨ã?©ã?¼: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "ã?½ã?±ã??ã??ã?®æ??å®?ã??ã??ã??ç?¶æ??ã?? wait: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ä¸ã?«ã?¨ã?©ã?¼ï¼? %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage ã?¯ Windows ã?§ã?¯ã?µã??ã?¼ã??ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??å??ä¿¡ä¸ã?«ã?¨ã?©ã?¼: %s"
diff --git a/po/ka.po b/po/ka.po
index 37016a7..66252b3 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ka\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2007-09-14 12:15+0200\n"
 "Last-Translator: Vladimer Sichinava á??á??á??á??á??á??á??á?  á?¡á??á?á??á??á??á??á?? <vsichi gnome org>\n"
 "Language-Team: Georgian <http://mail.gnome.org/mailman/listinfo/gnome-ge-";
@@ -1176,7 +1176,7 @@ msgstr "á?¨á??á?¢á??á??á??á?? á?¢á??á?¥á?¡á?¢á?¨á?? á??á??á??á?¢á??á??á??á?¡ á??
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 #, fuzzy
 msgid "Cancellable initialization not supported"
 msgstr "á?¡á??á??á??á??á??á?£á? á?? á??á??á??á??á??á?¡ á??á??á??á??á?§á??á??á??á??á?? á??á? á??á?? á? á??á??á??á??á??á??á??á?£á??á??"
@@ -1974,107 +1974,111 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "á?£á?ªá??á??á??á?? á??á??á? á??á??á??á?¢á? á?? %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr ""
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "á?¤á??á??á??á??á?¡ \"%s\" á?¬á??á??á??á??á?®á??á??á?¡ á?¨á??á?ªá??á??á??á??: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "á??á??á?  á??á?¥á??á??á?? '%s' á?¤á??á??á??á?¡: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "á?¤á??á??á??á??á?¡ \"%s\" á?¬á??á??á??á??á?®á??á??á?¡ á?¨á??á?ªá??á??á??á??: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "á??á??á? á??á??á?¥á??á??á??á?¡ á?¨á??á?ªá??á??á??á??: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "á?¤á??á??á??á??á?¡ \"%s\" á?¬á??á??á??á??á?®á??á??á?¡ á?¨á??á?ªá??á??á??á??: %s"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "á?¤á??á??á??á??á?¡ \"%s\" á?¬á??á??á??á??á?®á??á??á?¡ á?¨á??á?ªá??á??á??á??: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "á??á??á?  á??á?¥á??á??á?? '%s' á?¤á??á??á??á?¡: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "á?¤á??á??á??á??á?¡ \"%s\" á?¬á??á??á??á??á?®á??á??á?¡ á?¨á??á?ªá??á??á??á??: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "á?¤á??á??á??á??á?¡ \"%s\" á?¬á??á??á??á??á?®á??á??á?¡ á?¨á??á?ªá??á??á??á??: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "á?¤á??á??á??á??á?¡ \"%s\" á?¬á??á??á??á??á?®á??á??á?¡ á?¨á??á?ªá??á??á??á??: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "á?¤á??á??á??á??á?¡ \"%s\" á?¬á??á??á??á??á?®á??á??á?¡ á?¨á??á?ªá??á??á??á??: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr ""
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "á?¤á??á??á??á??á?¡ \"%s\" á?¬á??á??á??á??á?®á??á??á?¡ á?¨á??á?ªá??á??á??á??: %s"
diff --git a/po/kn.po b/po/kn.po
index 816b7af..f457158 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib.master.kn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-04-22 16:09+0530\n"
 "Last-Translator: Shankar Prasad <svenkate redhat com>\n"
 "Language-Team: kn-IN <>\n"
@@ -1167,7 +1167,7 @@ msgstr "à²ªà²°à²¿à²µà²°à³?à²¤à²¿à²¤ à²?à²¦à²¾à²¨à²¦à²²à³?à²²à²¿à²¨ à²¬à³?à²?à³?
 msgid "Not enough space in destination"
 msgstr "à²¸à²¾à²?à³?à²?à³?â?? à²µà²¿à²³à²¾à²¸à²?à³?à²?à²¾à²?à²¿ à²¸à²¾à²?à²·à³?à²?à³? à²¸à³?à²¥à²³à²µà²¿à²²à³?à²²"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "à²°à²¦à³?à²¦à³?à²?à³?à²³à²¿à²¸à²¬à²¹à³?à²¦à²¾à²¦ à²?à²°à²?à²à²?à³?à²?à³? à²¬à³?à²?à²¬à²²à²µà²¿à²²à³?à²²"
 
@@ -1958,106 +1958,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "à²?à³?à²¤à³?à²¤à²¿à²°à²¦ à²?à²¯à³?à²?à³? %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "à²?à²®à²¾à²¨à³?à²¯à²µà²¾à²¦ à²¸à²¾à²?à³?à²?à³?, à²?à²°à²?à²à²¿à²¸à²²à²¾à²?à²¿à²²à³?à²²"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "à²?à²®à²¾à²¨à³?à²¯à²µà²¾à²¦ à²¸à²¾à²?à³?à²?à³?, à²?à²°à²?à²à²¿à²¸à³?à²µà²¿à²?à³?à²¯à³? à²µà²¿à²«à²²à²?à³?à²?à²¡à²¿à²¦à³? à²?à²?à³?à²?à²¦à²°à³?: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "à²¸à²¾à²?à³?à²?à³? à²?à²?à²¾à²?à²²à³? à²®à³?à²?à³?à²?à²²à³?à²ªà²?à³?à²?à²¿à²¦à³?"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "fd à²?à²?à²¦ GSocket à²?à²¨à³?à²¨à³? à²°à²?à²¿à²¸à²²à²¾à²?à³?à²¤à³?à²¤à²¿à²¦à³?: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "à²¸à²¾à²?à³?à²?à³?â?? à²?à²¨à³?à²¨à³? à²°à²?à²¿à²¸à²²à³? à²¸à²¾à²§à³?à²¯à²µà²¾à²?à²¿à²²à³?à²²: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "à²?à²?à³?à²?à²¾à²¤à²µà²¾à²¦ à²ªà³?à²°à³?à²?à³?à²?à²¾à²²à³? à²?à²¨à³?à²¨à³? à²¸à³?à²?à²¿à²¸à²²à²¾à²?à²¿à²¦à³?"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "à²¸à³?à²¥à²³à³?à²¯ à²µà²¿à²³à²¾à²¸à²µà²¨à³?à²¨à³? à²ªà²¡à³?à²¯à²²à³? à²¸à²¾à²§à³?à²¯à²µà²¾à²?à²¿à²²à³?à²²: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "à²¦à³?à²°à²¸à³?à²¥ à²µà²¿à²³à²¾à²¸à²µà²¨à³?à²¨à³? à²ªà²¡à³?à²¯à²²à³? à²¸à²¾à²§à³?à²¯à²µà²¾à²?à²¿à²²à³?à²²: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "à²?à²²à²¿à²¸à²²à³? à²¸à²¾à²§à³?à²¯à²µà²¾à²?à²¿à²²à³?à²²: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "à²µà²¿à²³à²¾à²¸à²?à³?à²?à³? à²¬à²¦à³?à²¦à²µà²¾à²?à²¿à²°à³?à²µà²²à³?à²²à²¿ à²¦à³?à²·: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "à²¸à²?à²ªà²°à³?à²?à²µà²¨à³?à²¨à³? à²?à²?à²?à³?à²?à²°à²¿à²¸à³?à²µà²¾à²? à²¦à³?à²·: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "à²¸à²?à²ªà²°à³?à²?à²¸à²¾à²§à²¿à²¸à³?à²µà²²à³?à²²à²¿ à²¦à³?à²·: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "à²¸à²?à²ªà²°à³?à²?à²µà³? à²ªà³?à²°à²?à²¤à²¿à²¯à²²à³?à²²à²¿à²¦à³?"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "à²¸à²?à²ªà²°à³?à²? à²¸à²¾à²§à²¿à²¸à³?à²µà²²à³?à²²à²¿ à²¦à³?à²·: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "à²¬à²¾à²?à²¿ à²?à²°à³?à²µ à²¦à³?à²·à²µà²¨à³?à²¨à³? à²ªà²¡à³?à²¯à²²à³? à²¸à²¾à²§à³?à²¯à²µà²¾à²?à²¿à²²à³?à²²: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "à²¦à²¤à³?à²¤à²¾à²?à²¶à²µà²¨à³?à²¨à³? à²¸à³?à²µà³?à²?à²°à²¿à²¸à³?à²µà²²à³?à²²à²¿ à²¦à³?à²·: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "à²¦à²¤à³?à²¤à²¾à²?à²¶à²µà²¨à³?à²¨à³? à²?à²³à²¿à²¸à³?à²µà²²à³?à²²à²¿ à²¦à³?à²·: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "à²¦à²¤à³?à²¤à²¾à²?à²¶à²µà²¨à³?à²¨à³? à²®à³?à²?à³?à²?à³?à²µà²²à³?à²²à²¿ à²¦à³?à²·: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "à²¸à²¾à²?à³?à²?à³?â?? à²¸à³?à²¥à²¿à²¤à²¿à²?à²¾à²?à²¿ à²?à²¾à²¯à²²à²¾à²?à³?à²¤à³?à²¤à²¿à²¦à³?: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "à²¸à²?à²¦à³?à²¶à²µà²¨à³?à²¨à³? à²?à²³à³?à²¹à²¿à²¸à³?à²µà²²à³?à²²à²¿ à²¦à³?à²·: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "à²µà²¿à²?à²¡à³?à²¸à³?â??à²¨à²²à³?à²²à²¿ GSocketControlMessage à²¬à³?à²?à²¬à²²à²¿à²¤à²µà²¾à²?à²¿à²²à³?à²²"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "à²¸à²?à²¦à³?à²¶à²µà²¨à³?à²¨à³? à²ªà²¡à³?à²¯à³?à²µà²²à³?à²²à²¿ à²¦à³?à²·: %s"
diff --git a/po/ko.po b/po/ko.po
index 9d2718c..f0897c9 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-02-16 03:42+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu debian org>\n"
 "Language-Team: GNOME Korea <gnome-kr googlegroups com>\n"
@@ -1167,7 +1167,7 @@ msgstr "ì??ë ¥ì??ì?? ì??ëª»ë?? ë©?í?° ë°?ì?´í?¸ ì??í??ì?¤ê°? ë¶?ì??ì ?í?©ë??ë?¤"
 msgid "Not enough space in destination"
 msgstr "ë??ì??ì?? ê³µê°?ì?´ ë¶?ì¡±í?©ë??ë?¤"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "ì·¨ì?? ê°?ë?¥í?? ì´?ê¸°í??ë¥¼ ì§?ì??í??ì§? ì??ì?µë??ë?¤"
 
@@ -1958,106 +1958,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "ì?? ì?? ì??ë?? ì?µì?? %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "ì?¬ë°?ë¥¸ ì??ì¼?ì?´ ì??ë??ë??ë?¤. ì´?ê¸°í??ë??ì§? ì??ì??ì?µë??ë?¤"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "ì?¬ë°?ë¥¸ ì??ì¼?ì?´ ì??ë??ë??ë?¤. ì´?ê¸°í??ê°? ë?¤ì?? ì?´ì? ë¡? ì?¤í?¨í??ì?µë??ë?¤: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "ì??ì¼?ì?? ì?´ë¯¸ ë?«ì??ì?µë??ë?¤"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "í??ì?¼ ë??ì?¤í?¬ë¦½í?°ì??ì?? GSocketì?? ë§?ë??ë?? ì¤?: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "ì??ì¼?ì?? ë§?ë?¤ ì?? ì??ì?µë??ë?¤: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "ì?? ì?? ì??ë?? í??ë¡?í? ì½?ì?? ì§?ì ?í??ì?µë??ë?¤"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "ë¡?ì»¬ ì£¼ì??ë¥¼ ì??ì??ë?¼ ì?? ì??ì?µë??ë?¤: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "ì??ê²© ì£¼ì??ë¥¼ ì??ì??ë?¼ ì?? ì??ì?µë??ë?¤: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "ì?°ê²°ì?? ë°?ì?? ì?? ì??ì?µë??ë?¤: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "ì£¼ì??ì?? ì?°ê²°í??ë??ë?° ì?¤ë¥?: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "ì?°ê²°ì?? ë°?ì??ë?¤ì?´ë??ë?° ì?¤ë¥?: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "ì?°ê²°í??ë??ë?° ì?¤ë¥?: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "ì?°ê²°ì?´ ì§?í?? ì¤?ì??ë??ë?¤"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "ì?°ê²°í??ë??ë?° ì?¤ë¥?: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "ë°?ë¦° ì?¤ë¥?ë¥¼ ì??ì??ë?¼ ì?? ì??ì?µë??ë?¤: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "ë?°ì?´í?°ë¥¼ ë°?ë??ë?° ì?¤ë¥?: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "ë?°ì?´í?°ë¥¼ ë³´ë?´ë??ë?° ì?¤ë¥?: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "ì??ì¼?ì?? ë?«ë??ë?° ì?¤ë¥?: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "ì??ì¼? ì¡°ê±´ì?? ê¸°ë?¤ë¦¬ë?? ì¤?: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "ë©?ì??ì§?ë¥¼ ë³´ë?´ë?? ì¤? ì?¤ë¥?: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "ì??ë??ì?°ì¦?ì??ì??ë?? GSocketControlMessageë¥¼ ì§?ì??í??ì§? ì??ì?µë??ë?¤"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "ë©?ì??ì§?ë¥¼ ë°?ë??ë?° ì?¤ë¥?: %s"
diff --git a/po/ku.po b/po/ku.po
index a63bac1..c1e22ea 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib.glib-2-8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2006-04-20 17:33+0000\n"
 "Last-Translator: Erdal Ronahi <erdal ronahi gmail com>\n"
 "Language-Team: Kurdish <gnu-ku-wergerandin lists sourceforge net>\n"
@@ -1121,7 +1121,7 @@ msgstr ""
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr ""
 
@@ -1912,107 +1912,111 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "VebijÃªrka nenas %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr ""
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "Di xwendina dosyeya '%s' de Ã§ewtÃ®: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "Vekirina dosiya '%s' serneket: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "Di xwendina dosyeya '%s' de Ã§ewtÃ®: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "Di xwendina dosyeya '%s' de Ã§ewtÃ®: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "Di xwendina dosyeya '%s' de Ã§ewtÃ®: %s"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "Di xwendina dosyeya '%s' de Ã§ewtÃ®: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Vekirina dosiya '%s' serneket: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "Di xwendina dosyeya '%s' de Ã§ewtÃ®: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "Di xwendina dosyeya '%s' de Ã§ewtÃ®: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "Di xwendina dosyeya '%s' de Ã§ewtÃ®: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "Di xwendina dosyeya '%s' de Ã§ewtÃ®: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr ""
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "Di xwendina dosyeya '%s' de Ã§ewtÃ®: %s"
diff --git a/po/lt.po b/po/lt.po
index fda0467..577cf16 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-03-05 11:16+0200\n"
 "Last-Translator: Rimas Kudelis <rq akl lt>\n"
 "Language-Team: Lithuanian <komp_lt konferencijos lt>\n"
@@ -1179,7 +1179,7 @@ msgstr "Klaidinga baitÅ³ seka Ä¯vestyje"
 msgid "Not enough space in destination"
 msgstr "Nepakanka paskirties vietos"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "AtÅ¡aukiamas inicijavimas nepalaikomas"
 
@@ -1973,106 +1973,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "NeÅ¾inoma parinktis %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "Netinkamas lizdas, nepavyko inicijuoti"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Netinkamas lizdas, nepavyko inicijuoti: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "Lizdas jau uÅ¾vertas"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "iÅ¡ fd kuriamas GSocket: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Nepavyko sukurti lizdo: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "Nurodytas neÅ¾inomas protokolas"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "nepavyko gauto lokalaus adreso: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "nepavyko gauti nuotolinio adreso: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "nepavyko klausytis: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Susiejimo su adresu klaida: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Klaida priimant ryÅ¡Ä¯: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "Klaida prisijungiant: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "Prisijungiama"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "Klaida prisijungiant: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Nepavyko gauti laukianÄ?ios klaidos: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Klaida priimant duomenis: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Klaida siunÄ?iant duomenis: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Klaida uÅ¾veriant lizdÄ?: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Laukiama lizdo bÅ«senos: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Klaida siunÄ?iant praneÅ¡imÄ?: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "â??Windowsâ?? sistemoje â??GSocketControlMessageâ?? nepalaikoma"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Klaida priimant praneÅ¡imÄ?: %s"
diff --git a/po/lv.po b/po/lv.po
index 5b5a356..d898f1c 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2002-12-19 01:04+0200\n"
 "Last-Translator: Artis Trops <hornet navigator lv>\n"
 "Language-Team: Latvian <ll10nt os lv>\n"
@@ -1160,7 +1160,7 @@ msgstr "Nepareiza baitu secÄ«ba konversijas ievadÄ?"
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr ""
 
@@ -1951,107 +1951,111 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr ""
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr ""
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "KÄ¼Å«da nolasot failu '%s': %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "NeizdevÄ?s izveidot failu '%s': %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, fuzzy, c-format
 msgid "could not get remote address: %s"
 msgstr "NevarÄ?ju atrast %lu baitus, lai nolasÄ«tu failu \"%s\""
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "KÄ¼Å«da nolasot failu '%s': %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "KÄ¼Å«da konversÄ?jot: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "KÄ¼Å«da nolasot failu '%s': %s"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "KÄ¼Å«da nolasot failu '%s': %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "NeizdevÄ?s izveidot failu '%s': %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "KÄ¼Å«da nolasot failu '%s': %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "KÄ¼Å«da nolasot failu '%s': %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "KÄ¼Å«da nolasot failu '%s': %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "KÄ¼Å«da nolasot failu '%s': %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr ""
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "KÄ¼Å«da nolasot failu '%s': %s"
diff --git a/po/mai.po b/po/mai.po
index 5342d36..939ac71 100644
--- a/po/mai.po
+++ b/po/mai.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2009-02-27 17:15+0530\n"
 "Last-Translator: Rajesh Ranjan <rranjan redhat com>\n"
 "Language-Team: maithili <maithili.sf.net>\n"
@@ -1152,7 +1152,7 @@ msgstr "à¤ªà¤°à¤¿à¤µà¤°à¥?à¤¤à¤¨ à¤?à¤¨à¤ªà¥?à¤?à¤®à¥? à¤?à¤µà¥?à¤§ à¤¬à¤¾à¤?à¤?
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 #, fuzzy
 msgid "Cancellable initialization not supported"
 msgstr "à¤?à¤ªà¤°à¥?à¤¶à¤¨ à¤¸à¤®à¤°à¥?à¤¥à¤¿à¤¤ à¤¨à¤¹à¤¿ à¤?à¤?à¤¿"
@@ -1950,109 +1950,113 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "à¤?à¤¨à¤?à¤¾à¤¨ à¤µà¤¿à¤?à¤²à¥?à¤ª %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 #, fuzzy
 msgid "Socket is already closed"
 msgstr "à¤¸à¥?à¤°à¥?à¤¤ à¤¸à¥?à¤?à¥?à¤°à¥?à¤® à¤ªà¤¹à¤¿à¤¨à¥?à¤¸à¤? à¤¬à¤¨à¥?à¤¨ à¤?à¤?à¤¿"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "à¤«à¤¾à¤?à¤² à¤ªà¤¢à¤¬à¤¾à¤®à¥? à¤¤à¥?à¤°à¥?à¤?à¤¿: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "à¤?à¥?à¤°à¥?à¤¶ à¤¨à¤¿à¤°à¥?à¤¦à¥?à¤¶à¤¿à¤?à¤¾ %s à¤¬à¤¨à¤¾à¤¬à¥?à¤®à¥? à¤¤à¥?à¤°à¥?à¤?à¤¿: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "à¤«à¤¾à¤?à¤²à¤®à¥? à¤²à¤¿à¤?à¤¬à¤¾à¤®à¥? à¤¤à¥?à¤°à¥?à¤?à¤¿: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "à¤ªà¤°à¤¿à¤µà¤°à¥?à¤¤à¤¨à¤? à¤¦à¥?à¤°à¤¾à¤¨ à¤¤à¥?à¤°à¥?à¤?à¤¿: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "à¤«à¤¾à¤?à¤²à¤?à¥?à¤? à¤?à¤¾à¤?à¤¬à¤¾à¤®à¥? à¤¤à¥?à¤°à¥?à¤?à¤¿: %s"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "à¤«à¤¾à¤?à¤²à¤?à¥?à¤? à¤?à¥?à¤²à¤¬à¤¾à¤®à¥? à¤¤à¥?à¤°à¥?à¤?à¤¿: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "à¤«à¤¾à¤?à¤²à¤?à¥?à¤? à¤°à¤¦à¥?à¤¦à¥?à¤®à¥? à¤à¥?à¤?à¤¬à¤¾à¤®à¥? à¤¤à¥?à¤°à¥?à¤?à¤¿: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "à¤«à¤¾à¤?à¤² à¤¹à¤?à¤¾à¤¬à¥? à¤®à¥? à¤¤à¥?à¤°à¥?à¤?à¤¿: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "à¤«à¤¾à¤?à¤²à¤?à¥?à¤? à¤?à¥?à¤²à¤¬à¤¾à¤®à¥? à¤¤à¥?à¤°à¥?à¤?à¤¿: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "à¤«à¤¾à¤?à¤² à¤¬à¤¨à¥?à¤¨ à¤?à¤°à¤¬à¤¾à¤®à¥? à¤¤à¥?à¤°à¥?à¤?à¤¿: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "à¤«à¤¾à¤?à¤²à¤?à¥?à¤? à¤?à¥?à¤²à¤¬à¤¾à¤®à¥? à¤¤à¥?à¤°à¥?à¤?à¤¿: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 #, fuzzy
 msgid "GSocketControlMessage not supported on windows"
 msgstr "à¤¸à¤?à¤¯à¥?à¤?à¤¨ à¤ªà¤°à¤¿à¤µà¤°à¥?à¤¤à¤¨ win32 à¤ªà¤° à¤¸à¤®à¤°à¥?à¤¥à¤¿à¤¤ à¤¨à¤¹à¤¿ à¤?à¤?à¤¿"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "à¤«à¤¾à¤?à¤² à¤¹à¤?à¤¾à¤¬à¥? à¤®à¥? à¤¤à¥?à¤°à¥?à¤?à¤¿: %s"
diff --git a/po/mg.po b/po/mg.po
index 964b600..9e78919 100644
--- a/po/mg.po
+++ b/po/mg.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLIB VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2007-03-03 19:00+0300\n"
 "Last-Translator: Fanomezana Rajaonarisoa <fano isvtec com>\n"
 "Language-Team: MALAGASY <i18n-malagasy-gnome gna org>\n"
@@ -1192,7 +1192,7 @@ msgstr "Tsy mitombina filaharan'ny byte amin'ny zavatra ovaina"
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 #, fuzzy
 msgid "Cancellable initialization not supported"
 msgstr "Tsy raisina an-tÃ nana ny rohy misolotena"
@@ -1991,107 +1991,111 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Safidy %s tsy fantatra"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr ""
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "Nisy olana teo am-pamakiana ny rakitra '%s': %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "Tsy voaforona ny rakitra '%s': %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "Nisy olana teo am-pamakiana ny rakitra '%s': %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "Nisy olana teo am-panovana: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "Nisy olana teo am-pamakiana ny rakitra '%s': %s"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "Nisy olana teo am-pamakiana ny rakitra '%s': %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Tsy voaforona ny rakitra '%s': %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "Nisy olana teo am-pamakiana ny rakitra '%s': %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "Nisy olana teo am-pamakiana ny rakitra '%s': %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "Nisy olana teo am-pamakiana ny rakitra '%s': %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "Nisy olana teo am-pamakiana ny rakitra '%s': %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr ""
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "Nisy olana teo am-pamakiana ny rakitra '%s': %s"
diff --git a/po/mk.po b/po/mk.po
index 896c583..abd2ac6 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib.HEAD.mk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2008-02-04 04:11+0100\n"
 "Last-Translator: Jovan Naumovski <jovan lugola net>\n"
 "Language-Team: Macedonian <mkde-l10n lists sourceforge net>\n"
@@ -1185,7 +1185,7 @@ msgstr "Ð?ÐµÐ²Ð°Ð»Ð¸Ð´Ð½Ð° Ñ?ÐµÐºÐ²ÐµÐ½Ñ?Ð° Ð½Ð° Ð±Ð°Ñ?Ñ?Ð¸ Ð²Ð¾ Ð²Ð»ÐµÐ·Ð¾Ñ? Ð½
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 #, fuzzy
 msgid "Cancellable initialization not supported"
 msgstr "Ð?Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ?Ð°Ñ?Ð° Ð½Ðµ Ðµ Ð¿Ð¾Ð´Ð´Ñ?Ð¶Ð°Ð½Ð°"
@@ -1990,109 +1990,113 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Ð?ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ?Ð° Ð¾Ð¿Ñ?Ð¸Ñ?Ð° â??%sâ??Â·"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 #, fuzzy
 msgid "Socket is already closed"
 msgstr "Ð?Ð·Ð²Ð¾Ñ?Ð¾Ñ? Ð½Ð° Ñ?Ñ?Ñ?Ð¸Ð¼Ð¾Ñ? Ð²ÐµÑ?Ðµ Ðµ Ð·Ð°Ñ?Ð²Ð¾Ñ?ÐµÐ½"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð¸Ñ?Ð°Ñ?ÐµÑ?Ð¾ Ð¾Ð´ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°Ñ?Ð°: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "Ð?Ðµ Ñ?Ñ?Ð¿ÐµÐ°Ð² Ð´Ð° ÐºÑ?ÐµÐ¸Ñ?Ð°Ð¼ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ð¼ Ð·Ð° Ñ?Ñ?Ð±Ñ?Ðµ %s: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð²Ð¾ Ð·Ð°Ð¿Ð¸Ñ?Ñ?Ð²Ð°Ñ?ÐµÑ?Ð¾ Ð²Ð¾ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°Ñ?Ð°: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ ÐºÐ¾Ð½Ð²ÐµÑ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?ÐºÑ?Ð°Ñ?Ñ?Ð²Ð°Ñ?ÐµÑ?Ð¾ Ð½Ð° Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°Ñ?Ð°: %s"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð²Ð¾ Ð¾Ñ?Ð²Ð¾Ñ?Ð°Ñ?ÐµÑ?Ð¾ Ð½Ð° Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ñ?Ð¸Ð¼Ð¾Ñ?: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Ð?Ðµ Ñ?Ñ?Ð¿ÐµÐ°Ð² Ð´Ð° Ñ?Ð° Ð¿Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð°Ð¼ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°Ñ?Ð° Ð²Ð¾ Ñ?Ñ?Ð±Ñ?ÐµÑ?Ð¾: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¾Ñ?Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ð²Ð°Ñ?ÐµÑ?Ð¾ Ð½Ð° Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°Ñ?Ð°: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð²Ð¾ Ð¾Ñ?Ð²Ð¾Ñ?Ð°Ñ?ÐµÑ?Ð¾ Ð½Ð° Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ñ?Ð¸Ð¼Ð¾Ñ?: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð²Ð¾ Ð·Ð°Ñ?Ð²Ð¾Ñ?Ð°Ñ?ÐµÑ?Ð¾ Ð½Ð° Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°Ñ?Ð°: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð²Ð¾ Ð¾Ñ?Ð²Ð¾Ñ?Ð°Ñ?ÐµÑ?Ð¾ Ð½Ð° Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ñ?Ð¸Ð¼Ð¾Ñ?: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 #, fuzzy
 msgid "GSocketControlMessage not supported on windows"
 msgstr "Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ð¸Ñ?Ðµ Ð½Ð° Ð°Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ñ?Ð¸Ð¸ Ð½Ðµ Ñ?Ðµ Ð¿Ð¾Ð´Ð´Ñ?Ð¶Ð°Ð½Ð¸ Ð½Ð° win32"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¾Ñ?Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ð²Ð°Ñ?ÐµÑ?Ð¾ Ð½Ð° Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°Ñ?Ð°: %s"
diff --git a/po/ml.po b/po/ml.po
index a628231..e36afcd 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib.master.ml\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2009-09-20 20:08+0530\n"
 "Last-Translator: \n"
 "Language-Team:  <en li org>\n"
@@ -1160,7 +1160,7 @@ msgstr "à´®à´¾à´±àµ?à´±à´? à´µà´°àµ?à´¤àµ?à´¤àµ?à´¨àµ?à´¨ à´?à´¨àµ?â??à´ªàµ?à´?
 msgid "Not enough space in destination"
 msgstr "à´¸àµ?à´?àµ?à´?à´±àµ?à´±àµ? à´µà´¿à´²à´¾à´¸à´¤àµ?à´¤à´¿à´¨àµ?àµ? à´?à´µà´¶àµ?à´¯à´®àµ?à´³àµ?à´³ à´¸àµ?à´¥à´²à´? à´²à´àµ?à´¯à´®à´²àµ?à´²"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "à´±à´¦àµ?à´¦à´¾à´?àµ?à´?àµ?à´µà´¾à´¨àµ?â?? à´¸à´¾à´§à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨ à´?à´¨àµ?à´·àµ?à´¯à´²àµ?à´¸àµ?à´·à´¨àµ?â?? à´ªà´¿à´¨àµ?à´¤àµ?à´£à´¯àµ?à´?àµ?à´?àµ?à´¨àµ?à´¨à´¿à´²àµ?à´²"
 
@@ -1953,106 +1953,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "à´?à´ªà´°à´¿à´?à´¿à´¤à´®à´¾à´¯ à´?à´ªà´¾à´§à´¿ %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "à´¤àµ?à´±àµ?à´±à´¾à´¯ à´¸àµ?à´?àµ?à´?à´±àµ?à´±àµ?, à´?à´°à´?à´à´¿à´?àµ?à´?à´¿à´?àµ?à´?à´¿à´²àµ?à´²"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "à´¤àµ?à´±àµ?à´±à´¾à´¯ à´¸àµ?à´?àµ?à´?à´±àµ?à´±àµ?, à´?à´°à´?à´à´¿à´?àµ?à´?à´¾à´¤àµ?à´¤à´¿à´¤à´¿à´¨àµ?à´³àµ?à´³ à´?à´¾à´°à´£à´?: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "à´¸àµ?à´?àµ?à´?à´±àµ?à´±àµ? à´¨à´¿à´²à´µà´¿à´²àµ?â?? à´?à´?à´?àµ?à´?à´¿à´°à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨àµ?"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "fd-à´²àµ?â?? à´¨à´¿à´¨àµ?à´¨àµ?à´? GSocket à´?à´£àµ?à´?à´¾à´?àµ?à´?àµ?à´¨àµ?à´¨àµ?: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "à´¸àµ?à´?àµ?à´?à´±àµ?à´±àµ? à´?à´£àµ?à´?à´¾à´?àµ?à´?àµ?à´µà´¾à´¨àµ?â?? à´¸à´¾à´§àµ?à´¯à´®à´²àµ?à´²: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "à´?à´ªà´°à´¿à´?à´¿à´¤à´®à´¾à´¯ à´?àµ?à´´àµ?à´µà´´à´?àµ?à´?à´? à´¨à´²àµ?â??à´?à´¿à´¯à´¿à´°à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨àµ?"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "à´²àµ?à´?àµ?à´?à´²àµ?â?? à´µà´¿à´²à´¾à´¸à´? à´²à´àµ?à´¯à´®à´¾à´?àµ?à´?àµ?à´µà´¾à´¨àµ?â?? à´¸à´¾à´§àµ?à´¯à´®à´²àµ?à´²: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "à´±à´¿à´®àµ?à´?àµ?à´?àµ? à´µà´¿à´²à´¾à´¸à´? à´²à´àµ?à´¯à´®à´¾à´?àµ?à´?àµ?à´µà´¾à´¨àµ?â?? à´¸à´¾à´§àµ?à´¯à´®à´²àµ?à´²: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "à´¶àµ?à´°à´¦àµ?à´§à´¿à´?àµ?à´?àµ?à´µà´¾à´¨àµ?â?? à´¸à´¾à´§àµ?à´¯à´®à´²àµ?à´²: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "à´µà´¿à´²à´¾à´¸à´¤àµ?à´¤à´¿à´²àµ?à´?àµ?à´?àµ? à´¬àµ?à´¨àµ?â??à´¡àµ? à´?àµ?à´¯àµ?à´¯àµ?à´¨àµ?à´¨à´¤à´¿à´²àµ?â?? à´ªà´¿à´¶à´?àµ?: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "à´?à´£à´?àµ?à´·à´¨àµ?â?? à´¸àµ?à´µàµ?à´?à´°à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨à´¤à´¿à´²àµ?â?? à´ªà´¿à´¶à´?àµ? : %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "à´?à´£à´?àµ?à´?àµ? à´?àµ?à´¯àµ?à´¯àµ?à´¨àµ?à´¨à´¤à´¿à´²àµ?â?? à´ªà´¿à´¶à´?àµ?: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "à´?à´£à´?àµ?à´·à´¨àµ?â?? à´ªàµ?à´°àµ?à´?à´¤à´¿à´¯à´¿à´²àµ?â??"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "à´?à´£à´?àµ?à´?àµ? à´?àµ?à´¯àµ?à´¯àµ?à´¨àµ?à´¨à´¤à´¿à´²àµ?â?? à´ªà´¿à´¶à´?àµ? : %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "à´¬à´¾à´?àµ?à´?à´¿à´¯àµ?à´³àµ?à´³ à´ªà´¿à´¶à´?àµ? à´²à´àµ?à´¯à´®à´¾à´?àµ?à´?àµ?à´µà´¾à´¨àµ?â?? à´¸à´¾à´§àµ?à´¯à´®à´¾à´¯à´¿à´²àµ?à´²: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "à´¡àµ?à´±àµ?à´±à´¾ à´²à´àµ?à´¯à´®à´¾à´?àµ?à´?àµ?à´¨àµ?à´¨à´¤à´¿à´²àµ?â?? à´ªà´¿à´¶à´?àµ?: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "à´¡àµ?à´±àµ?à´±à´¾ à´?à´¯à´¯àµ?à´?àµ?à´?àµ?à´¨àµ?à´¨à´¤à´¿à´²àµ?â?? à´ªà´¿à´¶à´?àµ? : %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "à´¸àµ?à´?àµ?à´?à´±àµ?à´±àµ? à´?à´?à´¯àµ?à´?àµ?à´?àµ?à´¨àµ?à´¨à´¤à´¿à´²àµ?â?? à´ªà´¿à´¶à´?àµ? : %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "à´¸àµ?à´?àµ?à´?à´±àµ?à´±àµ? à´?à´µà´¸àµ?à´¥à´¯àµ?à´?àµ?à´?à´¾à´¯à´¿ à´?à´¾à´¤àµ?à´¤à´¿à´°à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨àµ?: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "à´¸à´¨àµ?à´¦àµ?à´¶à´? à´?à´¯à´¯àµ?à´?àµ?à´?àµ?à´¨àµ?à´¨à´¤à´¿à´²àµ?â?? à´ªà´¿à´¶à´?àµ? : %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage à´µà´¿à´¨àµ?â??à´¡àµ?à´¸à´¿à´²àµ?â?? à´ªà´¿à´¨àµ?à´¤àµ?à´£à´¯àµ?à´?àµ?à´?àµ?à´¨àµ?à´¨à´¿à´²àµ?à´²"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "à´¸à´¨àµ?à´¦àµ?à´¶à´? à´²à´à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨à´¤à´¿à´²àµ?â?? à´ªà´¿à´¶à´?àµ?: %s"
diff --git a/po/mn.po b/po/mn.po
index 30b77bf..5c35218 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2005-05-30 01:07-0800\n"
 "Last-Translator: Ð?Ð°Ð´Ñ?Ð°Ð» <badral openmn org>\n"
 "Language-Team: Mongolian <openmn-translation lists sf net>\n"
@@ -1187,7 +1187,7 @@ msgstr "Ð¥Ó©Ñ?Ð²Ò¯Ò¯Ð»Ñ?Ð»Ñ?Ð¸Ð¹Ð½ Ð¾Ñ?Ð¾Ð»Ñ?Ð¾Ð´ Ñ?Ò¯Ñ?Ð¸Ð½Ð³Ò¯Ð¹ Ð±Ð°Ð¹Ñ? Ð´Ð°
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 #, fuzzy
 msgid "Cancellable initialization not supported"
 msgstr "Ð¡Ð¸Ð¼Ð²Ð¾Ð»Ð¸Ðº Ñ?Ð¾Ð»Ð±Ð¾Ð¾Ñ? Ð´Ñ?Ð¼Ð¶Ð¸Ð³Ð´Ñ?Ñ?Ð³Ò¯Ð¹"
@@ -1984,107 +1984,111 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Ð¢Ð¾Ð´Ð¾Ñ?Ñ?Ð¾Ð¹Ð³Ò¯Ð¹ Ñ?Ñ?Ð³Ð° %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr ""
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "Ð¤Ð°Ð¹Ð» Â»%sÂ« -Ñ?Ð³ Ñ?Ð½Ñ?Ð¸Ð¶ Ð±Ð°Ð¹Ñ?Ð°Ð´ Ð°Ð»Ð´Ð°Ð°: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "Â»%sÂ« Ñ?Ð°Ð¹Ð» Ò¯Ò¯Ñ?Ð³Ñ?Ð³Ð´Ñ?Ñ?Ð½Ð³Ò¯Ð¹: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, fuzzy, c-format
 msgid "could not get remote address: %s"
 msgstr "%lu Ð±Ð°Ð¹Ñ?Ñ?Ñ?Ð´Ñ?Ð³ Â»%sÂ« Ñ?Ð°Ð¹Ð»Ñ?Ð³ Ñ?Ð½Ñ?Ð¸Ñ?Ð´Ð°Ð° Ð±Ð°Ð¹Ñ?Ð»Ñ?Ñ?Ð»Ð¶ Ñ?Ð°Ð´Ñ?Ð°Ð½Ð³Ò¯Ð¹"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "Ð¤Ð°Ð¹Ð» Â»%sÂ« -Ñ?Ð³ Ñ?Ð½Ñ?Ð¸Ð¶ Ð±Ð°Ð¹Ñ?Ð°Ð´ Ð°Ð»Ð´Ð°Ð°: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "Ð¥Ó©Ñ?Ð²Ò¯Ò¯Ð»Ð¶ Ð±Ð°Ð¹Ñ?Ð°Ð´ Ð°Ð»Ð´Ð°Ð°: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "Ð¤Ð°Ð¹Ð» Â»%sÂ« -Ñ?Ð³ Ñ?Ð½Ñ?Ð¸Ð¶ Ð±Ð°Ð¹Ñ?Ð°Ð´ Ð°Ð»Ð´Ð°Ð°: %s"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "Ð¤Ð°Ð¹Ð» Â»%sÂ« -Ñ?Ð³ Ñ?Ð½Ñ?Ð¸Ð¶ Ð±Ð°Ð¹Ñ?Ð°Ð´ Ð°Ð»Ð´Ð°Ð°: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Â»%sÂ« Ñ?Ð°Ð¹Ð» Ò¯Ò¯Ñ?Ð³Ñ?Ð³Ð´Ñ?Ñ?Ð½Ð³Ò¯Ð¹: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "Ð¤Ð°Ð¹Ð» Â»%sÂ« -Ñ?Ð³ Ñ?Ð½Ñ?Ð¸Ð¶ Ð±Ð°Ð¹Ñ?Ð°Ð´ Ð°Ð»Ð´Ð°Ð°: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "Ð¤Ð°Ð¹Ð» Â»%sÂ« -Ñ?Ð³ Ñ?Ð½Ñ?Ð¸Ð¶ Ð±Ð°Ð¹Ñ?Ð°Ð´ Ð°Ð»Ð´Ð°Ð°: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "Ð¤Ð°Ð¹Ð» Â»%sÂ« -Ñ?Ð³ Ñ?Ð½Ñ?Ð¸Ð¶ Ð±Ð°Ð¹Ñ?Ð°Ð´ Ð°Ð»Ð´Ð°Ð°: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "Ð¤Ð°Ð¹Ð» Â»%sÂ« -Ñ?Ð³ Ñ?Ð½Ñ?Ð¸Ð¶ Ð±Ð°Ð¹Ñ?Ð°Ð´ Ð°Ð»Ð´Ð°Ð°: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr ""
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "Ð¤Ð°Ð¹Ð» Â»%sÂ« -Ñ?Ð³ Ñ?Ð½Ñ?Ð¸Ð¶ Ð±Ð°Ð¹Ñ?Ð°Ð´ Ð°Ð»Ð´Ð°Ð°: %s"
diff --git a/po/mr.po b/po/mr.po
index 922a560..77803da 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-04-15 15:42+0530\n"
 "Last-Translator: Sandeep Shedmake <sshedmak redhat com>\n"
 "Language-Team: Marathi <maajhe-sanganak freelists org>\n"
@@ -1143,7 +1143,7 @@ msgstr "à¤?à¤?à¤ªà¥?à¤?à¤®à¤§à¥?à¤² à¤?à¤ªà¥?à¤°à¥?à¤£ à¤®à¤²à¥?à¤?à¤¿à¤¬à¤¾à¤?
 msgid "Not enough space in destination"
 msgstr "à¤²à¤?à¥?à¤·à¥?à¤¯à¤®à¤§à¥?à¤¯à¥? à¤?à¤¤à¤¿à¤°à¥?à¤?à¥?à¤¤ à¤?à¤¾à¤?à¤¾ à¤?à¤¢à¤³à¤²à¥? à¤¨à¤¾à¤¹à¥?"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "à¤°à¤¦à¥?à¤¦ à¤?à¤°à¤£à¥?à¤¯à¤¾à¤?à¥?à¤?à¥? à¤ªà¥?à¤°à¤¾à¤°à¤?à¤ à¤¸à¤®à¤°à¥?à¤¥à¥?à¤¤ à¤¨à¤¾à¤¹à¥?"
 
@@ -1930,106 +1930,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "à¤?à¤ªà¤°à¤¿à¤?à¥?à¤¤ à¤ªà¤°à¥?à¤¯à¤¾à¤¯ %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "à¤?à¤µà¥?à¤§ à¤¸à¥?à¤?à¥?à¤?, à¤¸à¥?à¤°à¥? à¤?à¥?à¤²à¥? à¤¨à¤¾à¤¹à¥?"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "à¤?à¤µà¥?à¤§ à¤¸à¥?à¤?à¥?à¤?, à¤?à¤¾à¤°à¤£à¤¾à¤¸à¥?à¤¤à¤µ à¤?à¤ªà¤¯à¤¶à¥?: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "à¤¸à¥?à¤?à¥?à¤? à¤?à¤§à¤¿à¤ªà¤¾à¤¸à¥?à¤¨ à¤¬à¤?à¤¦ à¤?à¤¹à¥?"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "fd à¤ªà¤¾à¤¸à¥?à¤¨ GSocket à¤¬à¤¨à¤µà¤¤ à¤?à¤¹à¥?: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "à¤¸à¥?à¤?à¥?à¤? à¤¨à¤¿à¤°à¥?à¤®à¤¾à¤£ à¤?à¤°à¤£à¥? à¤?à¤¶à¤?à¥?à¤¯: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "à¤?à¤ªà¤°à¤¿à¤?à¥?à¤¤ à¤ªà¥?à¤°à¥?à¤?à¥?à¤?à¥?à¤² à¤¨à¤¿à¤°à¥?à¤¦à¥?à¤¶à¥?à¤¤ à¤?à¥?à¤²à¥?"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "à¤¸à¥?à¤¥à¤¾à¤¨à¥?à¤¯ à¤ªà¤¤à¥?à¤¤à¤¾ à¤ªà¥?à¤°à¤¾à¤ªà¥?à¤¤ à¤?à¤°à¤£à¥?à¤¯à¤¾à¤¸ à¤?à¤¶à¤?à¥?à¤¯: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "à¤¦à¥?à¤°à¤¸à¥?à¤¥ à¤ªà¤¤à¥?à¤¤à¤¾ à¤ªà¥?à¤°à¤¾à¤ªà¥?à¤¤ à¤?à¤°à¤£à¥?à¤¯à¤¾à¤¸ à¤?à¤¶à¤?à¥?à¤¯: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "à¤?à¤?à¤£à¥? à¤?à¤¶à¤?à¥?à¤¯: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "à¤ªà¤¤à¥?à¤¤à¥?à¤¯à¤¾à¤¶à¥? à¤¬à¤¾à¤?à¤§à¤£à¥? à¤?à¤°à¤¤à¥?à¤µà¥?à¤³à¥? à¤¤à¥?à¤°à¥?à¤?à¥?: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "à¤¤à¥?à¤°à¥?à¤?à¥? à¤¸à¥?à¤µà¥?à¤?à¤¾à¤°à¤¤à¥?à¤µà¥?à¤³à¥? à¤¤à¥?à¤°à¥?à¤?à¥?: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "à¤?à¥?à¤³à¤µà¤£à¥?à¤µà¥?à¤³à¥? à¤¤à¥?à¤°à¥?à¤?à¥?: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "à¤?à¥?à¤³à¤µà¤£à¥? à¤?à¤¾à¤²à¥? à¤?à¤¹à¥?"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "à¤?à¥?à¤³à¤µà¤£à¥?à¤µà¥?à¤³à¥? à¤¤à¥?à¤°à¥?à¤?à¥?: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "à¤¸à¥?à¤¥à¤¾à¤?à¥?à¤¤ à¤¤à¥?à¤°à¥?à¤?à¥? à¤ªà¥?à¤°à¤¾à¤ªà¥?à¤¤ à¤?à¤°à¤£à¥? à¤?à¤¶à¤?à¥?à¤¯: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "à¤¡à¤¾à¤?à¤¾ à¤ªà¥?à¤°à¤¾à¤ªà¥?à¤¤ à¤?à¤°à¤¤à¥?à¤µà¥?à¤³à¥? à¤¤à¥?à¤°à¥?à¤?à¥?: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "à¤¡à¤¾à¤?à¤¾ à¤ªà¤¾à¤ à¤µà¤¤à¥?à¤µà¥?à¤³à¥? à¤¤à¥?à¤°à¥?à¤?à¥?: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "à¤¸à¥?à¤?à¥?à¤? à¤¬à¤?à¤¦ à¤?à¤°à¤¤à¥?à¤µà¥?à¤³à¥? à¤¤à¥?à¤°à¥?à¤?à¥?: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "à¤¸à¥?à¤?à¥?à¤? à¤?à¤?à¤?à¥? à¤ªà¥?à¤°à¤¤à¤¿à¤?à¥?à¤·à¤¾ à¤?à¤°à¤¤ à¤?à¤¹à¥?: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "à¤«à¤¾à¤?à¤² à¤ªà¤¾à¤ à¤µà¤¤à¥?à¤µà¥?à¤³à¥? à¤¤à¥?à¤°à¥?à¤?à¥?: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage windows à¤µà¤° à¤¸à¤®à¤°à¥?à¤¥à¥?à¤¤ à¤¨à¤¾à¤¹à¥?"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "à¤¸à¤?à¤¦à¥?à¤¶ à¤ªà¥?à¤°à¤¾à¤ªà¥?à¤¤ à¤?à¤°à¤¤à¥?à¤µà¥?à¤³à¥? à¤¤à¥?à¤°à¥?à¤?à¥?: %s"
diff --git a/po/ms.po b/po/ms.po
index dab53f7..de94fcb 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2004-02-03 02:11+0730\n"
 "Last-Translator: Hasbullah Bin Pit <sebol my-penguin org>\n"
 "Language-Team: Projek Gabai <gabai-penyumbang lists sourceforge org>\n"
@@ -1158,7 +1158,7 @@ msgstr "Turutan byte tidak sah pada penukaran iput"
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 #, fuzzy
 msgid "Cancellable initialization not supported"
 msgstr "Pautan simbolik tidak disokong"
@@ -1953,107 +1953,111 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr ""
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr ""
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "Ralat membaca fail '%s': %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "Gagal mencipta fail %s': %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, fuzzy, c-format
 msgid "could not get remote address: %s"
 msgstr "Tak dapat memperuntukkan  %lu byte untuk membaca fail \"%s\""
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "Ralat membaca fail '%s': %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "Ralat semasa penukaran: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "Ralat membaca fail '%s': %s"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "Ralat membaca fail '%s': %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Gagal mencipta fail %s': %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "Ralat membaca fail '%s': %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "Ralat membaca fail '%s': %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "Ralat membaca fail '%s': %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "Ralat membaca fail '%s': %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr ""
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "Ralat membaca fail '%s': %s"
diff --git a/po/nb.po b/po/nb.po
index 31da6fd..0c8f587 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib 2.23.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-03-04 22:56+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian bokmal <i18n-nb lister ping uio no>\n"
@@ -1164,7 +1164,7 @@ msgstr "Ugyldig multibytesekvens i inndata"
 msgid "Not enough space in destination"
 msgstr "Ikke nok plass i mÃ¥l"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "Avbrytbar initiering er ikke stÃ¸ttet"
 
@@ -1953,106 +1953,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Ukjent flagg %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "Ugyldig plugg, ikke initiert"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Ugyldig plugg, initiering feilet pga: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "Pluggen er allerede lukket"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "lager GSocket fra fd: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Kunne ikke lage plugg: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "Ukjent protokoll ble oppgitt"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "kunne ikke hente lokal adresse: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "kunne ikke hente ekstern adresse: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "kunne ikke lytte: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Feil ved binding til adresse: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Feil ved godkjenning av tilkobling: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "Feil under tilkobling: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "Tilkobling pÃ¥gÃ¥r"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "Feil under tilkobling: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Kan ikke hente utestÃ¥ende feil: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Feil ved mottak av data: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Feil ved sending av data: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Feil ved lukking av plugg: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Venter pÃ¥ tilstand for plugg: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Feil ved sending av melding: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage er ikke stÃ¸ttet pÃ¥ windows"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Feil ved mottak av melding: %s"
diff --git a/po/nds.po b/po/nds.po
index a6c618b..a0ec186 100644
--- a/po/nds.po
+++ b/po/nds.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-03-18 13:53+0100\n"
 "Last-Translator: Nils-Christoph Fiedler <fiedler medienkompanie de>\n"
 "Language-Team: Low German <nds-lowgerman lists sourceforge net>\n"
@@ -1120,7 +1120,7 @@ msgstr ""
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr ""
 
@@ -1907,106 +1907,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Unbekannte Optschoon %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr ""
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr ""
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr ""
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr ""
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "Fehler bi'm Verbinnen:"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr ""
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr ""
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr ""
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr ""
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr ""
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr ""
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr ""
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr ""
diff --git a/po/ne.po b/po/ne.po
index 1ca337a..534867c 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib.glib-2-10.ne\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2006-04-27 00:00+0545\n"
 "Last-Translator: Shyam Krishna Bal <shyamkrishna_bal yahoo com>\n"
 "Language-Team: Nepali <info mpp org np>\n"
@@ -1161,7 +1161,7 @@ msgstr "à¤°à¥?à¤ªà¤¾à¤¨à¥?à¤¤à¤°à¤£ à¤?à¤?à¤¤à¤®à¤¾ à¤?à¤µà¥?à¤§ à¤¬à¤¾à¤?à¤? 
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 #, fuzzy
 msgid "Cancellable initialization not supported"
 msgstr "à¤¸à¤¾à¤?à¤?à¥?à¤¤à¤¿à¤? à¤¸à¤®à¥?à¤¬à¤¨à¥?à¤§ à¤¸à¤®à¤°à¥?à¤¥à¤¨ à¤?à¤°à¤¿à¤?à¤¨"
@@ -1958,107 +1958,111 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "à¤?à¤?à¥?à¤?à¤¾à¤¤ à¤µà¤¿à¤?à¤²à¥?à¤ª %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr ""
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "'%s' à¤«à¤¾à¤?à¤² à¤ªà¤¢à¥?à¤¦à¤¾ à¤¤à¥?à¤°à¥?à¤?à¤¿ : %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "'%s' à¤«à¤¾à¤?à¤² à¤¸à¤¿à¤°à¥?à¤?à¤¨à¤¾ à¤?à¤°à¥?à¤¨ à¤?à¤¸à¤«à¤²: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "'%s' à¤«à¤¾à¤?à¤² à¤ªà¤¢à¥?à¤¦à¤¾ à¤¤à¥?à¤°à¥?à¤?à¤¿ : %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "à¤°à¥?à¤ªà¤¾à¤¨à¥?à¤¤à¤°à¤£ à¤?à¤µà¤§à¤¿à¤®à¤¾ à¤¤à¥?à¤°à¥?à¤?à¤¿: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "'%s' à¤«à¤¾à¤?à¤² à¤ªà¤¢à¥?à¤¦à¤¾ à¤¤à¥?à¤°à¥?à¤?à¤¿ : %s"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "'%s' à¤«à¤¾à¤?à¤² à¤ªà¤¢à¥?à¤¦à¤¾ à¤¤à¥?à¤°à¥?à¤?à¤¿ : %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "'%s' à¤«à¤¾à¤?à¤² à¤¸à¤¿à¤°à¥?à¤?à¤¨à¤¾ à¤?à¤°à¥?à¤¨ à¤?à¤¸à¤«à¤²: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "'%s' à¤«à¤¾à¤?à¤² à¤ªà¤¢à¥?à¤¦à¤¾ à¤¤à¥?à¤°à¥?à¤?à¤¿ : %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "'%s' à¤«à¤¾à¤?à¤² à¤ªà¤¢à¥?à¤¦à¤¾ à¤¤à¥?à¤°à¥?à¤?à¤¿ : %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "'%s' à¤«à¤¾à¤?à¤² à¤ªà¤¢à¥?à¤¦à¤¾ à¤¤à¥?à¤°à¥?à¤?à¤¿ : %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "'%s' à¤«à¤¾à¤?à¤² à¤ªà¤¢à¥?à¤¦à¤¾ à¤¤à¥?à¤°à¥?à¤?à¤¿ : %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr ""
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "'%s' à¤«à¤¾à¤?à¤² à¤ªà¤¢à¥?à¤¦à¤¾ à¤¤à¥?à¤°à¥?à¤?à¤¿ : %s"
diff --git a/po/nl.po b/po/nl.po
index 96cdec8..7d52acd 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2009-02-23 14:07+0100\n"
 "Last-Translator: Wouter Bolsterlee <wbolster gnome org>\n"
 "Language-Team: Dutch <vertaling vrijschrift org>\n"
@@ -1230,7 +1230,7 @@ msgid "Not enough space in destination"
 msgstr ""
 
 # niet ondersteund/niet mogelijk
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 #, fuzzy
 msgid "Cancellable initialization not supported"
 msgstr "De bewerking is niet mogelijk"
@@ -2070,115 +2070,119 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Onbekende optie %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
 # bronstroom/datastroom van de bron
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 #, fuzzy
 msgid "Socket is already closed"
 msgstr "Datastroom is al gesloten"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "Fout bij het lezen van bestand: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "Kan de prullenbakmap %s niet aanmaken: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "Fout bij het schrijven naar bestand: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "Fout tijdens omzetten: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "Fout bij het afkappen bestand: %s"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
 # openen/lezen
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "Fout bij het openen van bestand: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Kan het bestand â??%sâ?? niet naar de prullenbak verplaatsen"
 
 # volledig verwijderen/definitief verwijderen/verwijderen
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "Fout bij het verwijderen van bestand: %s"
 
 # openen/lezen
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "Fout bij het openen van bestand: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "Fout bij het sluiten van bestand: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
 # openen/lezen
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "Fout bij het openen van bestand: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 #, fuzzy
 msgid "GSocketControlMessage not supported on windows"
 msgstr "associatiewijzigingen niet mogelijk op win32"
 
 # volledig verwijderen/definitief verwijderen/verwijderen
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "Fout bij het verwijderen van bestand: %s"
diff --git a/po/nn.po b/po/nn.po
index 004ed5d..b3f2399 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2008-02-24 17:33+0100\n"
 "Last-Translator: Ã?smund SkjÃ¦veland <aasmunds ulrik uio no>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn lister ping uio no>\n"
@@ -1162,7 +1162,7 @@ msgstr "Ugyldig bytesekvens i inndata for konvertering"
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 #, fuzzy
 msgid "Cancellable initialization not supported"
 msgstr "Operasjonen er ikkje stÃ¸tta"
@@ -1965,109 +1965,113 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Ukjend val Â«%sÂ»"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 #, fuzzy
 msgid "Socket is already closed"
 msgstr "Kjeldestraumen er allereie stengt"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "Feil ved lesing frÃ¥ fila: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "Klarte ikkje Ã¥ laga papirkorgmappa %s: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "Feil ved skriving til fila: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "Feil under konvertering: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "Feil ved trunkering av fila: %s"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "Feil ved opning av fila: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Klarte ikkje Ã¥ kassera fila: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "Feil under fjerning av fila: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "Feil ved opning av fila: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "Feil ved stenging av fila: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "Feil ved opning av fila: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 #, fuzzy
 msgid "GSocketControlMessage not supported on windows"
 msgstr "Ã¥ endra assosiasjonar er ikkje stÃ¸tta pÃ¥ win32"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "Feil under fjerning av fila: %s"
diff --git a/po/oc.po b/po/oc.po
index 816d6bf..3c9b771 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: oc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2008-04-23 10:42+0200\n"
 "Last-Translator: Yannig Marchegay (Kokoyaya) <yannig marchegay org>\n"
 "Language-Team: Occitan <ubuntu-l10n-oci lists ubuntu com>\n"
@@ -1122,7 +1122,7 @@ msgstr ""
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr ""
 
@@ -1909,107 +1909,111 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr ""
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr ""
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr ""
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr ""
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "Error de lectura del fichiÃ¨r '%s' : %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "Error al moment de crear lo repertÃ²ri : %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "Error al moment de crear lo repertÃ²ri : %s"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "Error al moment de crear lo repertÃ²ri : %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr ""
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "Error de lectura del fichiÃ¨r '%s' : %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "Error al moment de crear lo repertÃ²ri : %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "Error de lectura del fichiÃ¨r '%s' : %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "Error de lectura del fichiÃ¨r '%s' : %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr ""
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "Error de lectura del fichiÃ¨r '%s' : %s"
diff --git a/po/or.po b/po/or.po
index 0a645c7..df18eeb 100644
--- a/po/or.po
+++ b/po/or.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib.master.or\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2009-09-15 16:20+0530\n"
 "Last-Translator: Manoj Kumar Giri <mgiri redhat com>\n"
 "Language-Team: Oriya <oriya-it googlegroups com>\n"
@@ -1166,7 +1166,7 @@ msgstr "à¬°à?à¬ªà¬¾à¬¨à?à¬¤à¬°à¬£ à¬¨à¬¿à¬¬à?à¬¶à?à¬° à¬?à¬¬à?à¬§ à¬¬à¬¾à¬?
 msgid "Not enough space in destination"
 msgstr "à¬¸à¬?à?à¬? à¬ à¬¿à¬?à¬£à¬¾ à¬ªà¬¾à¬?à¬? à¬¯à¬¥à?à¬·à?à¬? à¬¸à?à¬¥à¬¾à¬¨ à¬¨à¬¾à¬¹à¬¿à¬?"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "à¬¬à¬¾à¬¤à¬¿à¬²à¬¯à?à¬?à?à? à¬ªà?à¬°à¬¾à¬°à¬®à?à¬à¬¿à¬?à¬°à¬£ à¬¸à¬®à¬°à?à¬¥à¬¿à¬¤ à¬¨à?à¬¹à¬?"
 
@@ -1959,106 +1959,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "à¬?à¬?à¬£à¬¾ à¬ªà¬¸à¬¨à?à¬¦ %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "à¬?à¬¬à?à¬§ à¬¸à¬?à?à¬?, à¬?à¬°à¬®à?à¬ à¬¹à?à¬?à¬¨à¬¾à¬¹à¬¿à¬?"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "à¬?à¬¬à?à¬§ à¬¸à¬?à?à¬?, à¬?à¬¹à¬¾ à¬¯à?à¬?à?à¬? à¬ªà?à¬°à¬¾à¬°à¬®à?à¬à¬¿à¬?à¬°à¬£ à¬¬à¬¿à¬«à¬³ à¬¹à?à¬?à¬?à¬¿: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "à¬¸à¬?à?à¬? à¬ªà?à¬°à?à¬¬à¬°à? à¬¬à¬¨à?à¬¦à¬¹à?à¬?à¬¯à¬¾à¬?à¬?à¬¿"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "fd à¬°à? GSocket à¬¨à¬¿à¬°à?à¬®à¬¾à¬£ à¬?à¬°à?à¬?à¬?à¬¿ : %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "à¬¸à¬?à?à¬? à¬¨à¬¿à¬°à?à¬®à¬¾à¬£ à¬?à¬°à¬¿à¬¬à¬¾à¬°à? à¬?à¬¸à¬®à¬°à?à¬¥: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "à¬?à¬?à¬£à¬¾ à¬ªà?à¬°à¬?à?à¬?à¬²à¬?à? à¬?à¬²à?à¬²à?à¬? à¬?à¬°à¬¾à¬¯à¬¾à¬?à¬?à¬¿"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "à¬¸à?à¬¥à¬¾à¬¨à?à? à¬ à¬¿à¬?à¬£à¬¾ à¬ªà¬¾à¬?à¬²à¬¾ à¬¨à¬¾à¬¹à¬¿à¬?: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "à¬¸à?à¬¦à?à¬° à¬ à¬¿à¬?à¬£à¬¾ à¬ªà¬¾à¬?à¬²à¬¾ à¬¨à¬¾à¬¹à¬¿à¬?: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "à¬¶à?à¬£à¬¿ à¬ªà¬¾à¬°à¬¿à¬²à¬¾ à¬¨à¬¾à¬¹à¬¿à¬?: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "à¬ à¬¿à¬?à¬£à¬¾ à¬¸à¬¹à¬¿à¬¤ à¬¬à¬¾à¬¨à?à¬§à¬¿à¬¬à¬¾à¬°à? à¬¤à?à¬°à?à¬?à¬¿: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "à¬¸à¬?à¬¯à?à¬? à¬?à?à¬°à¬¹à¬£ à¬?à¬°à¬¿à¬¬à¬¾à¬°à? à¬¤à?à¬°à?à¬?à¬¿: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "à¬¸à¬?à¬¯à?à¬? à¬?à¬°à¬¿à¬¬à¬¾à¬°à? à¬¤à?à¬°à?à¬?à¬¿: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "à¬¸à¬?à¬¯à?à¬? à¬?à?à¬°à¬¿à?à¬¾ à¬?à¬¾à¬²à¬¿à¬?à¬?à¬¿"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "à¬¸à¬?à¬¯à?à¬? à¬?à¬°à¬¿à¬¬à¬¾à¬°à? à¬¤à?à¬°à?à¬?à¬¿: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "à¬¬à¬?à?à¬¾ à¬¤à?à¬°à?à¬?à¬¿ à¬ªà¬¾à¬?à¬¬à¬¾à¬°à? à¬?à¬¸à¬®à¬°à?à¬¥: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "à¬¤à¬¥à?à? à¬?à?à¬°à¬¹à¬£ à¬?à¬°à¬¿à¬¬à¬¾à¬°à? à¬¤à?à¬°à?à¬?à¬¿: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "à¬¤à¬¥à?à? à¬ªà¬ à¬¾à¬?à¬¬à¬¾à¬°à? à¬¤à?à¬°à?à¬?à¬¿: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "à¬¸à¬?à?à¬? à¬¬à¬¨à?à¬¦à¬?à¬°à¬¿à¬¬à¬¾à¬°à? à¬¤à?à¬°à?à¬?à¬¿: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "à¬¸à¬?à?à¬? à¬?à¬¬à¬¸à?à¬¥à¬¾ à¬ªà¬¾à¬?à¬? à¬?à¬ªà?à¬?à?à¬·à¬¾ à¬?à¬°à¬¿à¬?à¬?à¬¿: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "à¬¸à¬¨à?à¬¦à?à¬¶ à¬ªà¬ à¬¾à¬?à¬¬à¬¾à¬°à? à¬¤à?à¬°à?à¬?à¬¿: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage windows à¬°à? à¬¸à¬®à¬°à?à¬¥à¬¿à¬¤ à¬¨à?à¬¹à¬?"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "à¬¸à¬¨à?à¬¦à?à¬¶ à¬?à?à¬°à¬¹à¬£ à¬?à¬°à¬¿à¬¬à¬¾à¬°à? à¬¤à?à¬°à?à¬?à¬¿: %s"
diff --git a/po/pa.po b/po/pa.po
index 370d9d6..a55e5d9 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-03-19 08:18+0530\n"
 "Last-Translator: A S Alam <aalam users sf net>\n"
 "Language-Team: Punjabi/Panjabi <kde-i18n-doc kde org>\n"
@@ -1145,7 +1145,7 @@ msgstr "à¨?à©°à¨ªà©?à©±à¨? à¨µà¨¿à©±à¨? à¨?à¨§à©?à¨°à¨¾ à¨®à¨²à¨?à©?à¨¬à¨¾à¨?à¨?
 msgid "Not enough space in destination"
 msgstr "à¨?à¨¿à¨?à¨¾à¨£à©? à¨?à©±à¨¤à©? à¨²à©?à©?à©?à¨¦à©? à¨¥à¨¾à¨? à¨¨à¨¹à©?à¨?"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "à¨°à©±à¨¦à¨?à¨°à¨¨à¨¯à©?à¨? à¨¸à¨¼à©?à¨°à©? à¨²à¨? à¨¸à¨¹à¨¾à¨?à¨? à¨¨à¨¹à©?à¨?"
 
@@ -1932,106 +1932,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "à¨?à¨£à¨?à¨¾à¨£ à¨?à©?à¨£ %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "à¨?à¨²à¨¤ à¨¸à¨¾à¨?à¨?, à¨¸à¨¼à©?à¨°à©? à¨¨à¨¹à©?à¨? à¨?à©?à¨¤à¨¾ à¨?à¨¾ à¨¸à¨?à¨¦à¨¾"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "à¨?à¨²à¨¤ à¨¸à¨¾à¨?à¨?, %s: à¨?à¨°à¨?à©? à¨¸à¨¼à©?à¨°à©? à¨?à¨°à¨¨ à¨²à¨? à¨«à©?à¨²à©?à¨¹"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "à¨¸à¨¾à¨?à¨? à¨ªà¨¹à¨¿à¨²à¨¾à¨? à¨¹à©? à¨¬à©°à¨¦ à¨¹à©?"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "fd à¨¤à©?à¨? à¨?à©?à¨¸à¨¾à¨?à¨? à¨¬à¨£à¨¾à¨? à¨?à¨¾ à¨°à¨¹à©? à¨¹à©?: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "à¨¸à¨¾à¨?à¨? à¨¬à¨£à¨¾à¨?à¨£ à¨²à¨? à¨?à¨¸à¨®à¨°à©±à¨¥: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "à¨?à¨£à¨?à¨¾à¨£ à¨ªà¨°à©?à¨?à©?à¨?à¨¾à¨² à¨¦à¨¿à©±à¨¤à¨¾ à¨?à¨¿à¨?"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "à¨²à©?à¨?à¨² à¨?à¨¡à¨°à©?à©±à¨¸ à¨¨à¨¹à©?à¨? à¨²à¨¿à¨? à¨?à¨¾ à¨¸à¨?à¨¿à¨?: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "à¨°à¨¿à¨®à©?à¨? à¨?à¨¡à¨°à©?à©±à¨¸ à¨¨à¨¹à©?à¨? à¨²à¨¿à¨? à¨?à¨¾ à¨¸à¨?à¨¿à¨?: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "à¨¸à©?à¨£à¨¿à¨? à¨¨à¨¹à©?à¨? à¨?à¨¾ à¨¸à¨?à¨¿à¨?: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "à¨?à¨¡à¨°à©?à©±à¨¸ à¨¸à¨¬à©°à¨§à¨¿à¨¤ à¨?à¨°à¨¨ à¨¦à©?à¨°à¨¾à¨¨ à¨?à¨²à¨¤à©?: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "à¨?à©?à¨¨à©?à¨?à¨¸à¨¼à¨¨ à¨®à¨¨à¨?à¨¼à©?à¨° à¨?à¨°à¨¨ à¨¦à©?à¨°à¨¾à¨¨ à¨?à¨²à¨¤à©?: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "à¨?à©?à¨¨à©?à¨?à¨? à¨?à¨°à¨¨ à¨¦à©?à¨°à¨¾à¨¨ à¨?à¨²à¨¤à©?: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "à¨?à©?à¨¨à©?à¨?à¨¸à¨¼à¨¨ à¨?à¨¾à¨°à©? à¨¹à©?"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "à¨?à©?à¨¨à©?à¨?à¨? à¨?à¨°à¨¨ à¨¦à©?à¨°à¨¾à¨¨ à¨?à¨²à¨¤à©?: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "à¨¬à¨¾à¨?à©? à¨?à¨²à¨¤à©? à¨²à©?à¨£ à¨²à¨? à¨?à¨¸à¨®à¨°à©±à¨¥: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "à¨¡à¨¾à¨?à¨¾ à¨²à©?à¨£ à¨¦à©?à¨°à¨¾à¨¨ à¨?à¨²à¨¤à©?: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "à¨¡à¨¾à¨?à¨¾ à¨à©?à¨?à¨£ à¨¦à©?à¨°à¨¾à¨¨ à¨?à¨²à¨¤à©?: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "à¨¸à¨¾à¨?à¨? à¨¬à©°à¨¦ à¨?à¨°à¨¨ à¨¦à©?à¨°à¨¾à¨¨ à¨?à¨²à¨¤à©?: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "à¨¸à¨¾à¨?à¨? à¨¸à¨¼à¨°à¨¤ à¨²à¨? à¨?à¨¡à©?à¨? à¨?à¨¾à¨°à©?: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "à¨¸à©?à¨¨à©?à¨¹à¨¾ à¨à©?à¨?à¨£ à¨¦à©?à¨°à¨¾à¨¨ à¨?à¨²à¨¤à©?: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "à¨µà¨¿à©°à¨¡à©?à¨?à¨¼ à¨?à©±à¨¤à©? GSocketControlMessage à¨¸à¨¹à¨¾à¨?à¨? à¨¨à¨¹à©?à¨? à¨¹à©?"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "à¨¸à©?à¨¨à©?à¨¹à¨¾ à¨²à©?à¨£ à¨¦à©?à¨°à¨¾à¨¨ à¨?à¨²à¨¤à©?: %s"
diff --git a/po/pl.po b/po/pl.po
index 7827117..8e5d61b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-03-08 10:50+0100\n"
 "Last-Translator: Tomasz Dominikowski <dominikowski gmail com>\n"
 "Language-Team: Polish <gnomepl aviary pl>\n"
@@ -1222,7 +1222,7 @@ msgstr "NiepeÅ?na sekwencja wielu bajtÃ³w na wejÅ?ciu"
 msgid "Not enough space in destination"
 msgstr "Brak wystarczajÄ?cej iloÅ?ci miejsca w miejscu docelowym"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "Zainicjowanie, ktÃ³re moÅ¼na anulowaÄ? nie jest obsÅ?ugiwane"
 
@@ -2016,106 +2016,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Nieznana opcja %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "NieprawidÅ?owe gniazdo, nie zainicjowano"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "NieprawidÅ?owe gniazdo, zainicjowanie siÄ? nie powiodÅ?o z powodu: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "Gniazdo jest juÅ¼ zamkniÄ?te"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "tworzenie GSocket z fd: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Nie moÅ¼na utworzyÄ? gniazda: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "OkreÅ?lono nieznany protokÃ³Å?"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "nie moÅ¼na uzyskaÄ? lokalnego adresu: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "nie moÅ¼na uzyskaÄ? zdalnego adresu: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "nie moÅ¼na nasÅ?uchiwaÄ?: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "BÅ?Ä?d podczas dowiÄ?zywania do adresu: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "BÅ?Ä?d podczas akceptowania poÅ?Ä?czenia: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "BÅ?Ä?d podczas Å?Ä?czenia: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "Trwa poÅ?Ä?czenie"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "BÅ?Ä?d podczas poÅ?Ä?czenia: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Nie moÅ¼na uzyskaÄ? oczekujÄ?cego bÅ?Ä?du: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "BÅ?Ä?d podczas pobierania danych: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "BÅ?Ä?d podczas wysyÅ?ania danych: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "BÅ?Ä?d podczas zamykania gniazda: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Oczekiwanie na warunek gniazda: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "BÅ?Ä?d podczas wysyÅ?ania komunikatu: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage nie jest obsÅ?ugiwane w Windows"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "BÅ?Ä?d podczas pobierania komunikatu: %s"
diff --git a/po/ps.po b/po/ps.po
index 876c058..f842b66 100644
--- a/po/ps.po
+++ b/po/ps.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib.head\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2009-04-12 17:07-0800\n"
 "Last-Translator: \n"
 "Language-Team: Pashto <pathanisation googlegroups com>\n"
@@ -1122,7 +1122,7 @@ msgstr ""
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 #, fuzzy
 msgid "Cancellable initialization not supported"
 msgstr "Ú?Ø§Ø± Ù?Ù? Ù?Ù?Ù? Ú©Ù?Ú?Ù?"
@@ -1912,107 +1912,111 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "%s Ù?Ø§Ù¾Û?Ú?Ù?Ø¯Ù?Û? ØºÙ?Ø±Ø§Ù?Û?"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr ""
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "%s :Ø¯Ù?ØªÙ?Û? Ù?Ù? Ù?Ù?Ø³ØªÙ?Ù? Ú©Û? Ø³ØªÙ?Ù?Ø²Ù?"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "%s :Ø¯Ù?ØªÙ?Û? Ø¬Ù?Ú?Ù?Ù?Ù? Ú©Û? Ù¾Ø§ØªÛ? Ø±Ø§ØºÛ? '%s' Ø¯"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "%s :Ù¾Ø± Ø¯Ù?ØªÙ?Û? Ù?Ù?Ú©Ù?Ù? Ú©Û? Ø³ØªÙ?Ù?Ø²Ù?"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "%s :Ø¯ Ø§Ú?Ù?Ù?Û? Ù¾Ø± Ù?Ù?Ø§Ù? Ø³ØªÙ?Ù?Ø²Ù?"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "%s :Ø¯Ù?ØªÙ?Ù? Ù¾Ø±Ø§Ù?Ù?Ø³ØªÙ?Ù? Ú©Û? Ø³ØªÙ?Ù?Ø²Ù?"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "%s :Ø¯Ù?ØªÙ?Ù? Ù¾Ø±Ø§Ù?Ù?Ø³ØªÙ?Ù? Ú©Û? Ø³ØªÙ?Ù?Ø²Ù?"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr ""
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "%s :Ø¯Ù?ØªÙ?Û? Ú?Ù?Ú«Ù?Ù?Ù? Ú©Û? Ø³ØªÙ?Ù?Ø²Ù?"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "%s :Ø¯Ù?ØªÙ?Ù? Ù¾Ø±Ø§Ù?Ù?Ø³ØªÙ?Ù? Ú©Û? Ø³ØªÙ?Ù?Ø²Ù?"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "%s :Ø¯Ù?ØªÙ?Ù? Ø¨Ù?Ø¯Ù?Ù?Ù? Ú©Û? Ø³ØªÙ?Ù?Ø²Ù?"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "%s :Ø¯Ù?ØªÙ?Ù? Ù¾Ø±Ø§Ù?Ù?Ø³ØªÙ?Ù? Ú©Û? Ø³ØªÙ?Ù?Ø²Ù?"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr ""
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "%s :Ø¯Ù?ØªÙ?Û? Ú?Ù?Ú«Ù?Ù?Ù? Ú©Û? Ø³ØªÙ?Ù?Ø²Ù?"
diff --git a/po/pt.po b/po/pt.po
index 2b9ab3c..973fe8a 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.30\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-03-08 02:30+0000\n"
 "Last-Translator: Duarte Loreto <happyguy_pt hotmail com>\n"
 "Language-Team: Portuguese <gnome_pt yahoogroups com>\n"
@@ -1180,7 +1180,7 @@ msgstr "SequÃªncia multibyte invÃ¡lida na entrada"
 msgid "Not enough space in destination"
 msgstr "EspaÃ§o insuficiente no destino"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "NÃ£o Ã© suportada a inicializaÃ§Ã£o cancelÃ¡vel"
 
@@ -1973,106 +1973,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "OpÃ§Ã£o %s desconhecida"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "Socket invÃ¡lido, nÃ£o inicializado"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Socket invÃ¡lido, a inicializaÃ§Ã£o falhou devido a: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "Socket jÃ¡ estÃ¡ fechado"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "a criar o GSocket do fd: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Incapaz de criar socket: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "Foi especificado um protocolo desconhecido"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "Incapaz de obter o endereÃ§o local: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "Incapaz de obter o endereÃ§o remoto(): %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "incapaz de escutar: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Erro ao ligar-se ao endereÃ§o: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Erro ao aceitar a ligaÃ§Ã£o: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "Erro ao se ligar: %s"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "LigaÃ§Ã£o em curso"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "Erro ao se ligar: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Incapaz de obter o erro pendente: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Erro ao receber os dados: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Erro ao enviar os dados: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Erro ao fechar o socket: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "A aguardar pela condiÃ§Ã£o do socket: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Erro ao enviar a mensagem: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage nÃ£o Ã© suportada em windows"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Erro ao receber a mensagem: %s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 830764b..ebc9b4b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-03-04 17:12-0300\n"
 "Last-Translator: Jonh Wendell <jwendell gnome org>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list gnome org>\n"
@@ -1189,7 +1189,7 @@ msgstr "SeqÃ¼Ãªncia de bytes incompleta na entrada"
 msgid "Not enough space in destination"
 msgstr "Sem espaÃ§o suficiente no destino"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "Sem suporte a inicializaÃ§Ã£o cancelÃ¡vel"
 
@@ -1982,106 +1982,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "OpÃ§Ã£o %s desconhecida"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "Soquete invÃ¡lido, nÃ£o inicializado"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Soquete invÃ¡lido, inicializaÃ§Ã£o falhou devido a: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "O soquete jÃ¡ estÃ¡ fechado"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "Criando GSocket a partir do fd: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "NÃ£o Ã© possÃvel criar soquete: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "Foi especificado um protocolo desconhecido"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "nÃ£o foi possÃvel obter endereÃ§o local: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "nÃ£o foi possÃvel obter endereÃ§o remoto: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "nÃ£o foi possÃvel escutar: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Erro ao vincular ao endereÃ§o: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Erro ao aceitar a conexÃ£o: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "Erro ao conectar: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "ConexÃ£o em progresso"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "Erro ao conectar: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "NÃ£o Ã© possÃvel obter erro pendente: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Erro ao receber dados: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Erro ao enviar dados: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Erro ao fechar soquete: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Aguardando pela condiÃ§Ã£o do soquete: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Erro ao abrir enviar mensagem: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "nÃ£o hÃ¡ suporte a GSocketControlMessage no windows"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Erro ao receber mensagem: %s"
diff --git a/po/ro.po b/po/ro.po
index 9496158..6f03a1e 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-03-18 22:47+0200\n"
 "Last-Translator: MiÈ?u Moldovan <dumol gnome ro>\n"
 "Language-Team: Romanian GNOME Team <gnomero-list lists sourceforge net>\n"
@@ -1182,7 +1182,7 @@ msgstr "SecvenÈ?Ä? de octeÈ?i incompletÄ? la intrare"
 msgid "Not enough space in destination"
 msgstr "SpaÈ?iu insuficient Ã®n destinaÈ?ie"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "IniÈ?ializarea Ã®ntreruptibilÄ? nu este implementatÄ?"
 
@@ -1978,106 +1978,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "OpÈ?iune necunoscutÄ? %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "Socket nevalid (neiniÈ?ializat)"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Socket nevalid, iniÈ?ializarea a eÈ?uat din urmÄ?toarea cauzÄ?: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "Socket-ul este deja Ã®nchis"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "se creeazÄ? GSocket din fd: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Nu s-a putut crea socket-ul: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "S-a specificat un protocol necunoscut"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "nu s-a putut obÈ?ine adresa localÄ?: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "nu s-a putut obÈ?ine adresa la distanÈ?Ä?: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "nu s-a putut asculta: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Eroare la asocierea adresei: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Eroare la acceptarea conexiunii: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "Eroare la conectare: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "Conectare Ã®n progres"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "Eroare la conectare: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Nu s-a putut obÈ?ine eroarea Ã®n aÈ?teptare: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Eroare la primirea datelor: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Eroare la trimiterea datelor: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Eroare la Ã®nchiderea socket-ului: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Se aÈ?teaptÄ? condiÈ?ia socket-ului: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Eroare la trimiterea mesajului: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage nu e implementat Ã®n Windows"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Eroare la primirea mesajului: %s"
diff --git a/po/ru.po b/po/ru.po
index 7684b38..75b1097 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-03-05 15:48+0200\n"
 "Last-Translator: Leonid Kanter <leon asplinux ru>\n"
 "Language-Team: Russian <ru li org>\n"
@@ -1199,7 +1199,7 @@ msgstr "Ð?ÐµÐ¿Ð¾Ð»Ð½Ð°Ñ? Ð¼Ð½Ð¾Ð³Ð¾Ð±Ð°Ð¹Ñ?Ð¾Ð²Ð°Ñ? Ð¿Ð¾Ñ?Ð»ÐµÐ´Ð¾Ð²Ð°Ñ?ÐµÐ»Ñ?Ð½
 msgid "Not enough space in destination"
 msgstr "Ð?ÐµÐ´Ð¾Ñ?Ñ?Ð°Ñ?Ð¾Ñ?Ð½Ð¾ Ð¼ÐµÑ?Ñ?Ð° Ð´Ð»Ñ? Ñ?ÐµÐ·Ñ?Ð»Ñ?Ñ?Ð°Ñ?Ð°"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "Ð?Ñ?ÐµÑ?Ñ?Ð²Ð°ÐµÐ¼Ð°Ñ? Ð¸Ð½Ð¸Ñ?Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ?Ð¸Ñ? Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÑ?Ñ?Ñ?"
 
@@ -1996,106 +1996,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Ð?ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ? %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "Ð?ÐµÐ´Ð¾Ð¿Ñ?Ñ?Ñ?Ð¸Ð¼Ñ?Ð¹ Ñ?Ð¾ÐºÐµÑ?, Ð½Ðµ Ð¸Ð½Ð¸Ñ?Ð¸Ð°Ð»Ð¸Ð·Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¾"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Ð?ÐµÐ´Ð¾Ð¿Ñ?Ñ?Ñ?Ð¸Ð¼Ñ?Ð¹ Ñ?Ð¾ÐºÐµÑ?, Ð¸Ð½Ð¸Ñ?Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ?Ð¸Ñ? Ð½Ðµ Ñ?Ð´Ð°Ð»Ð°Ñ?Ñ? Ð¿Ð¾ Ð¿Ñ?Ð¸Ñ?Ð¸Ð½Ðµ: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "Ð¡Ð¾ÐºÐµÑ? Ñ?Ð¶Ðµ Ð·Ð°ÐºÑ?Ñ?Ñ?"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "Ñ?Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ GSocket Ð¸Ð· fd: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð¾Ð·Ð´Ð°Ñ?Ñ? Ñ?Ð¾ÐºÐµÑ?: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "Ð£ÐºÐ°Ð·Ð°Ð½ Ð½ÐµÐ¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ð¹ Ð¿Ñ?Ð¾Ñ?Ð¾ÐºÐ¾Ð»"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "Ð½Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð»Ð¾ÐºÐ°Ð»Ñ?Ð½Ñ?Ð¹ Ð°Ð´Ñ?ÐµÑ?: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "Ð½Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ñ?Ð´Ð°Ð»ÐµÐ½Ð½Ñ?Ð¹ Ð°Ð´Ñ?ÐµÑ?: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "Ð½Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ð»Ñ?Ñ?Ð°Ñ?Ñ?: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Ð?Ñ?Ð¾Ð¸Ð·Ð¾Ñ?Ð»Ð° Ð¾Ñ?Ð¸Ð±ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð²Ñ?Ð·Ñ?Ð²Ð°Ð½Ð¸Ð¸ Ðº Ð°Ð´Ñ?ÐµÑ?Ñ?: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Ð?Ñ?Ð¾Ð¸Ð·Ð¾Ñ?Ð»Ð° Ð¾Ñ?Ð¸Ð±ÐºÐ° Ð¿Ñ?Ð¸ Ð¾Ð´Ð¾Ð±Ñ?ÐµÐ½Ð¸Ð¸ Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ñ?: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "Ð?Ñ?Ð¾Ð¸Ð·Ð¾Ñ?Ð»Ð° Ð¾Ñ?Ð¸Ð±ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ð¸:"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "Ð¡Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ð²Ñ?Ð¿Ð¾Ð»Ð½Ñ?ÐµÑ?Ñ?Ñ?"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "Ð?Ñ?Ð¾Ð¸Ð·Ð¾Ñ?Ð»Ð° Ð¾Ñ?Ð¸Ð±ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ð¸: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¾Ð¶Ð¸Ð´Ð°Ñ?Ñ?Ñ?Ñ? Ð¾Ñ?Ð¸Ð±ÐºÑ?: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Ð?Ñ?Ð¾Ð¸Ð·Ð¾Ñ?Ð»Ð° Ð¾Ñ?Ð¸Ð±ÐºÐ° Ð¿Ñ?Ð¸ Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ð¸ Ð´Ð°Ð½Ð½Ñ?Ñ?: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Ð?Ñ?Ð¾Ð¸Ð·Ð¾Ñ?Ð»Ð° Ð¾Ñ?Ð¸Ð±ÐºÐ° Ð¿Ñ?Ð¸ Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ð»ÐµÐ½Ð¸Ð¸ Ð´Ð°Ð½Ð½Ñ?Ñ?: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Ð?Ñ?Ð¾Ð¸Ð·Ð¾Ñ?Ð»Ð° Ð¾Ñ?Ð¸Ð±ÐºÐ° Ð¿Ñ?Ð¸ Ð·Ð°ÐºÑ?Ñ?Ñ?Ð¸Ð¸ Ñ?Ð¾ÐºÐµÑ?Ð°: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Ð?Ð¶Ð¸Ð´Ð°Ð½Ð¸Ðµ Ñ?Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð¸Ñ? Ñ?Ð¾ÐºÐµÑ?Ð°: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Ð?Ñ?Ð¾Ð¸Ð·Ð¾Ñ?Ð»Ð° Ð¾Ñ?Ð¸Ð±ÐºÐ° Ð¿Ñ?Ð¸ Ð¾Ñ?Ð¿Ñ?Ð°Ð²Ð»ÐµÐ½Ð¸Ð¸ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ?: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ?Ð¶Ð¸Ð²Ð°ÐµÑ?Ñ?Ñ? Ð² Windows"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Ð?Ñ?Ð¾Ð¸Ð·Ð¾Ñ?Ð»Ð° Ð¾Ñ?Ð¸Ð±ÐºÐ° Ð¿Ñ?Ð¸ Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ð¸ Ñ?Ð¾Ð¾Ð±Ñ?ÐµÐ½Ð¸Ñ?: %s"
diff --git a/po/rw.po b/po/rw.po
index 4eb37d9..eb5278d 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib 2.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2005-03-28 19:34-0700\n"
 "Last-Translator: Steve Murphy <murf e-tools com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw lists sourceforge net>\n"
@@ -1183,7 +1183,7 @@ msgstr "Bayite in Ihindurangero Iyinjiza"
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 #, fuzzy
 msgid "Cancellable initialization not supported"
 msgstr "amahuza OYA"
@@ -2002,116 +2002,120 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Ihitamo ritazwi:"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr ""
 
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
 # svtools/source\misc\errtxt.src:RID_ERRHDL.ERRCODE_SFX_DOLOADFAILED.text
-#: gio/gsocket.c:413
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "Ikosa mu gusoma idosiye"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "Kuri Kurema IDOSIYE"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, fuzzy, c-format
 msgid "could not get remote address: %s"
 msgstr "Kuri IDOSIYE Byanze"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
 # svtools/source\misc\errtxt.src:RID_ERRHDL.ERRCODE_SFX_DOLOADFAILED.text
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "Ikosa mu gusoma idosiye"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "Ihindurangero"
 
 # svtools/source\misc\errtxt.src:RID_ERRHDL.ERRCODE_SFX_DOLOADFAILED.text
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "Ikosa mu gusoma idosiye"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
 # svtools/source\misc\errtxt.src:RID_ERRHDL.ERRCODE_SFX_DOLOADFAILED.text
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "Ikosa mu gusoma idosiye"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Kuri Kurema IDOSIYE"
 
 # svtools/source\misc\errtxt.src:RID_ERRHDL.ERRCODE_SFX_DOLOADFAILED.text
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "Ikosa mu gusoma idosiye"
 
 # svtools/source\misc\errtxt.src:RID_ERRHDL.ERRCODE_SFX_DOLOADFAILED.text
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "Ikosa mu gusoma idosiye"
 
 # svtools/source\misc\errtxt.src:RID_ERRHDL.ERRCODE_SFX_DOLOADFAILED.text
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "Ikosa mu gusoma idosiye"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
 # svtools/source\misc\errtxt.src:RID_ERRHDL.ERRCODE_SFX_DOLOADFAILED.text
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "Ikosa mu gusoma idosiye"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr ""
 
 # svtools/source\misc\errtxt.src:RID_ERRHDL.ERRCODE_SFX_DOLOADFAILED.text
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "Ikosa mu gusoma idosiye"
diff --git a/po/si.po b/po/si.po
index 2b3aef3..d31f52b 100644
--- a/po/si.po
+++ b/po/si.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib.si\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2007-06-20 14:56+0530\n"
 "Last-Translator: Danishka Navin <snavin redhat com>\n"
 "Language-Team: Sinhala <en li org>\n"
@@ -1129,7 +1129,7 @@ msgstr "à¶´à¶»à·?à·?à¶»à·?à¶à¶± à¶´à·?â??à¶»à¶°à·?à¶°à·? à¶à·?à·? à·?à·?à·?à¶¯
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 #, fuzzy
 msgid "Cancellable initialization not supported"
 msgstr "à·?à¶?à¶?à·?à¶à·?à¶à·?à¶¸à¶? à¶´à·?à¶»à·?à¶? à·?à·?à·?à¶º à¶¯à¶?à·?à¶±à¶±à·?à¶±à·? à¶±à·?à¶"
@@ -1924,107 +1924,111 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "%s à¶±à·?à¶¯à¶±à·?à¶±à·? à·?à·?à¶?à¶½à·?à¶´à¶ºà¶?à·?"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr ""
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "'%s' à¶?à·?à¶±à·?à·? à¶?à·?à¶ºà·?à·?à¶¸ à¶¯à·?à·? à·?à·?à·?à¶à¶ºà·?: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "'%s' à¶?à·?à¶±à·?à·? à¶±à·?à¶»à·?à¶¸à·?à¶«à¶º à¶¯à·?à·? à·?à·?à·?à¶à¶ºà·?: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "'%s' à¶?à·?à¶±à·?à·? à¶?à·?à¶ºà·?à·?à¶¸ à¶¯à·?à·? à·?à·?à·?à¶à¶ºà·?: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "à¶´à¶»à·?à·?à¶»à·?à¶à¶±à¶ºà·?à¶¯à·? à¶¯à·?à·?à¶ºà¶?à·? : %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "'%s' à¶?à·?à¶±à·?à·? à¶?à·?à¶ºà·?à·?à¶¸ à¶¯à·?à·? à·?à·?à·?à¶à¶ºà·?: %s"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "'%s' à¶?à·?à¶±à·?à·? à¶?à·?à¶ºà·?à·?à¶¸ à¶¯à·?à·? à·?à·?à·?à¶à¶ºà·?: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "'%s' à¶?à·?à¶±à·?à·? à¶±à·?à¶»à·?à¶¸à·?à¶«à¶º à¶¯à·?à·? à·?à·?à·?à¶à¶ºà·?: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "'%s' à¶?à·?à¶±à·?à·? à¶?à·?à¶ºà·?à·?à¶¸ à¶¯à·?à·? à·?à·?à·?à¶à¶ºà·?: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "'%s' à¶?à·?à¶±à·?à·? à¶?à·?à¶ºà·?à·?à¶¸ à¶¯à·?à·? à·?à·?à·?à¶à¶ºà·?: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "'%s' à¶?à·?à¶±à·?à·? à¶?à·?à¶ºà·?à·?à¶¸ à¶¯à·?à·? à·?à·?à·?à¶à¶ºà·?: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "'%s' à¶?à·?à¶±à·?à·? à¶?à·?à¶ºà·?à·?à¶¸ à¶¯à·?à·? à·?à·?à·?à¶à¶ºà·?: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr ""
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "'%s' à¶?à·?à¶±à·?à·? à¶?à·?à¶ºà·?à·?à¶¸ à¶¯à·?à·? à·?à·?à·?à¶à¶ºà·?: %s"
diff --git a/po/sk.po b/po/sk.po
index ad2adee..1c90921 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2008-03-15 15:01+0100\n"
 "Last-Translator: Marcel Telka <marcel telka sk>\n"
 "Language-Team: Slovak <sk-i18n lists linux sk>\n"
@@ -1170,7 +1170,7 @@ msgstr "NeplatnÃ¡ sekvencia bajtov na vstupe prevodu"
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 #, fuzzy
 msgid "Cancellable initialization not supported"
 msgstr "NepodporovanÃ¡ operÃ¡cia"
@@ -1974,108 +1974,112 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "NeznÃ¡ma voÄ¾by %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 #, fuzzy
 msgid "Socket is already closed"
 msgstr "ZdrojovÃ½ prÃºd je uÅ¾ zatvorenÃ½"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "Chyba pri Ä?ÃtanÃ zo sÃºboru: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "Nepodarilo sa vytvoriÅ¥ sÃºbor '%s': %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "Chyba pri zÃ¡pise do sÃºboru: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "Chyba poÄ?as prevodu: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "Chyba pri Ä?ÃtanÃ sÃºboru '%s': %s"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "Chyba pri otvÃ¡ranÃ sÃºboru: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Nepodarilo sa vytvoriÅ¥ sÃºbor '%s': %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "Chyba pri odstraÅ?ovanÃ sÃºboru: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "Chyba pri otvÃ¡ranÃ sÃºboru: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "Chyba pri zatvÃ¡ranÃ sÃºboru: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "Chyba pri otvÃ¡ranÃ sÃºboru: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr ""
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "Chyba pri odstraÅ?ovanÃ sÃºboru: %s"
diff --git a/po/sl.po b/po/sl.po
index a76a0d2..51a8d26 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-03-05 07:21+0100\n"
 "Last-Translator: Matej UrbanÄ?iÄ? <mateju svn gnome org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si googlegroups com>\n"
@@ -1176,7 +1176,7 @@ msgstr "Neveljavno veÄ?bitno zaporedje na vhodu"
 msgid "Not enough space in destination"
 msgstr "Ni dovolj prostora za cilju"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "Dejanje prekinitve zagona ni podprto"
 
@@ -1966,106 +1966,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Neznana moÅ¾nost %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "Neveljaven vtiÄ?, ni zagnano"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Neveljaven vtiÄ?, zaganjanje ni uspelo zaradi: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "VtiÄ? je Å¾e zaprt"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "ustvarjanje GSocet preko fd: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Ni mogoÄ?e ustvariti vtiÄ?a: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "DoloÄ?en je neznan protokol"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "ni mogoÄ?e pridobiti krajevnega naslova: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "ni mogoÄ?e pridobiti oddaljenega naslova: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "ni mogoÄ?e slediti: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Napaka vezanjem na naslov: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Napaka med sprejemanjem povezave: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "Napaka med obrezovanjem:"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "Povezava v teku"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "Napaka med povezovanjem: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Ni mogoÄ?e pridobiti Ä?akajoÄ?e napake: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Napaka med prejemanjem podatkov: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Napaka med poÅ¡iljanjem podatkov: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Napaka med zapiranjem vtiÄ?a: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Ä?akanje na stanje vtiÄ?a: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Napaka med poÅ¡iljanjem sporoÄ?ila: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage ni podprto na windows sistemih"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Napaka med prejemanjem sporoÄ?ila: %s"
diff --git a/po/sq.po b/po/sq.po
index f23fb06..74c4ca7 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2008-08-18 10:19+0200\n"
 "Last-Translator: Laurent Dhima <laurenti alblinux net>\n"
 "Language-Team: albanian <gnome-albanian-perkthyesit lists sourceforge net>\n"
@@ -1270,7 +1270,7 @@ msgid "Not enough space in destination"
 msgstr ""
 
 # (pofilter) isfuzzy: Check if the unit has been marked fuzzy.
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 #, fuzzy
 msgid "Cancellable initialization not supported"
 msgstr "Veprimi nuk suportohet"
@@ -2255,52 +2255,56 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Opcion i panjohur %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
 # (pofilter) untranslated: checks whether a string has been translated at all
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 #, fuzzy
 msgid "Socket is already closed"
 msgstr "Stream burues Ã«shtÃ« i mbyllur"
 
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
 # (pofilter) variables: translation contains variables not in original: %s, %s
 # (pofilter) isfuzzy: Check if the unit has been marked fuzzy.
 # (pofilter) singlequoting: checks whether singlequoting is consistent between the two strings
 # (pofilter) printf: checks whether printf format strings match
-#: gio/gsocket.c:413
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "Gabim gjatÃ« leximit nga file: %s"
 
 # (pofilter) isfuzzy: Check if the unit has been marked fuzzy.
 # (pofilter) singlequoting: checks whether singlequoting is consistent between the two strings
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "I pamundur krijimi i directory koshit \"%s\": %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
@@ -2309,12 +2313,12 @@ msgstr ""
 # (pofilter) isfuzzy: Check if the unit has been marked fuzzy.
 # (pofilter) singlequoting: checks whether singlequoting is consistent between the two strings
 # (pofilter) printf: checks whether printf format strings match
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "Gabim gjatÃ« shkrimit tek file: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "Gabim gjatÃ« konvertimit: %s"
@@ -2323,12 +2327,12 @@ msgstr "Gabim gjatÃ« konvertimit: %s"
 # (pofilter) isfuzzy: Check if the unit has been marked fuzzy.
 # (pofilter) singlequoting: checks whether singlequoting is consistent between the two strings
 # (pofilter) printf: checks whether printf format strings match
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "Gabim gjatÃ« ndarjes sÃ« file: %s"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
@@ -2336,7 +2340,7 @@ msgstr ""
 # (pofilter) isfuzzy: Check if the unit has been marked fuzzy.
 # (pofilter) singlequoting: checks whether singlequoting is consistent between the two strings
 # (pofilter) printf: checks whether printf format strings match
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "Gabim gjatÃ« hapjes sÃ« file: %s"
@@ -2345,7 +2349,7 @@ msgstr "Gabim gjatÃ« hapjes sÃ« file: %s"
 # (pofilter) isfuzzy: Check if the unit has been marked fuzzy.
 # (pofilter) singlequoting: checks whether singlequoting is consistent between the two strings
 # (pofilter) printf: checks whether printf format strings match
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "E pamundur hedhja nÃ« kosh e file: %s"
@@ -2354,7 +2358,7 @@ msgstr "E pamundur hedhja nÃ« kosh e file: %s"
 # (pofilter) isfuzzy: Check if the unit has been marked fuzzy.
 # (pofilter) singlequoting: checks whether singlequoting is consistent between the two strings
 # (pofilter) printf: checks whether printf format strings match
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "Gabim gjatÃ« fshirjes sÃ« file: %s"
@@ -2363,7 +2367,7 @@ msgstr "Gabim gjatÃ« fshirjes sÃ« file: %s"
 # (pofilter) isfuzzy: Check if the unit has been marked fuzzy.
 # (pofilter) singlequoting: checks whether singlequoting is consistent between the two strings
 # (pofilter) printf: checks whether printf format strings match
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "Gabim gjatÃ« hapjes sÃ« file: %s"
@@ -2372,12 +2376,12 @@ msgstr "Gabim gjatÃ« hapjes sÃ« file: %s"
 # (pofilter) isfuzzy: Check if the unit has been marked fuzzy.
 # (pofilter) singlequoting: checks whether singlequoting is consistent between the two strings
 # (pofilter) printf: checks whether printf format strings match
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "Gabim gjatÃ« mbylljes sÃ« file: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
@@ -2386,13 +2390,13 @@ msgstr ""
 # (pofilter) isfuzzy: Check if the unit has been marked fuzzy.
 # (pofilter) singlequoting: checks whether singlequoting is consistent between the two strings
 # (pofilter) printf: checks whether printf format strings match
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "Gabim gjatÃ« hapjes sÃ« file: %s"
 
 # (pofilter) untranslated: checks whether a string has been translated at all
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 #, fuzzy
 msgid "GSocketControlMessage not supported on windows"
 msgstr "ndryshimi i shoqÃ«rimeve nuk suportohet nÃ« win32"
@@ -2401,7 +2405,7 @@ msgstr "ndryshimi i shoqÃ«rimeve nuk suportohet nÃ« win32"
 # (pofilter) isfuzzy: Check if the unit has been marked fuzzy.
 # (pofilter) singlequoting: checks whether singlequoting is consistent between the two strings
 # (pofilter) printf: checks whether printf format strings match
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "Gabim gjatÃ« fshirjes sÃ« file: %s"
diff --git a/po/sr.po b/po/sr.po
index 199c944..beb7822 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-03-09 20:28+0100\n"
 "Last-Translator: Ð?Ð¸Ð»Ð¾Ñ? Ð?Ð¾Ð¿Ð¾Ð²Ð¸Ñ? <gpopac gmail com>\n"
 "Language-Team: Serbian <gnome prevod org>\n"
@@ -1170,7 +1170,7 @@ msgstr "Ð?ÐµÐ¿Ð¾Ñ?Ð¿Ñ?Ð½ Ð½Ð¸Ð· Ð±Ð°Ñ?Ñ?Ð¾Ð²Ð° Ð½Ð° Ñ?Ð»Ð°Ð·Ñ?"
 msgid "Not enough space in destination"
 msgstr "Ð?ÐµÐ¼Ð° Ð´Ð¾Ð²Ð¾Ñ?Ð½Ð¾ Ð¼ÐµÑ?Ñ?Ð° Ñ? Ð¾Ð´Ñ?ÐµÐ´Ð¸Ñ?Ñ?Ñ?"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð½Ð¾ Ð¿Ð¾ÐºÑ?ÐµÑ?Ð°Ñ?Ðµ Ñ?Ð· Ð¼Ð¾Ð³Ñ?Ñ?Ð½Ð¾Ñ?Ñ? Ð¿Ñ?ÐµÐºÐ¸Ð´Ð°"
 
@@ -1957,106 +1957,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Ð?ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ?Ð° Ð¾Ð¿Ñ?Ð¸Ñ?Ð° %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "Ð?ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð° Ñ?Ñ?Ð¸Ñ?Ð½Ð¸Ñ?Ð°, Ð½Ð¸Ñ?Ðµ Ð¿Ð¾ÐºÑ?ÐµÐ½Ñ?Ñ?Ð¾"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Ð?ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð° Ñ?Ñ?Ð¸Ñ?Ð½Ð¸Ñ?Ð°, Ð¿Ð¾ÐºÑ?ÐµÑ?Ð°Ñ?Ðµ Ð½Ð¸Ñ?Ðµ Ñ?Ñ?Ð¿ÐµÐ»Ð¾ Ð·Ð±Ð¾Ð³: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "Ð£Ñ?Ð¸Ñ?Ð½Ð¸Ñ?Ð° Ñ?Ðµ Ð²ÐµÑ? Ð·Ð°Ñ?Ð²Ð¾Ñ?ÐµÐ½Ð°"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "Ð¿Ñ?Ð°Ð²Ð¸Ð¼ GSocket Ð¸Ð· fd: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Ð?Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ð¼ Ñ?Ñ?Ð¸Ñ?Ð½Ð¸Ñ?Ñ?: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "Ð?Ð°Ð´Ð°Ñ? Ñ?Ðµ Ð½ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ?Ð¸ Ð¿Ñ?Ð¾Ñ?Ð¾ÐºÐ¾Ð»"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "Ð½Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ð´Ð¾Ð±Ð¸Ñ?ÐµÐ¼ Ð»Ð¾ÐºÐ°Ð»Ð½Ñ? Ð°Ð´Ñ?ÐµÑ?Ñ?: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "Ð½Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ð´Ð¾Ð±Ð¸Ñ?ÐµÐ¼ Ñ?Ð´Ð°Ñ?ÐµÐ½Ñ? Ð°Ð´Ñ?ÐµÑ?Ñ?: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "Ð½Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ñ?Ð»Ñ?Ñ?Ð°Ð¼: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Ð³Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ñ? Ð½Ð° Ð°Ð´Ñ?ÐµÑ?Ñ?: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Ð³Ñ?ÐµÑ?ÐºÐ° Ñ? Ð¿Ñ?Ð¸Ñ?Ð²Ð°Ñ?Ð°Ñ?Ñ? Ð²ÐµÐ·Ðµ: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ñ? Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ñ?: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "Ð?Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ðµ Ñ?Ðµ Ñ? Ñ?Ð¾ÐºÑ?"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ñ? Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ñ?: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Ð?Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ð´Ð¾Ð±Ð¸Ñ?ÐµÐ¼ Ð³Ñ?ÐµÑ?ÐºÑ? Ð½Ð° Ñ?ÐµÐºÐ°Ñ?Ñ?: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ñ? Ð¿Ñ?Ð¸Ð¼Ð°Ñ?Ñ? Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ°: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ñ? Ñ?Ð»Ð°Ñ?Ñ? Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ°: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ñ? Ð·Ð°Ñ?Ð²Ð°Ñ?Ð°Ñ?Ñ? Ñ?Ñ?Ð¸Ñ?Ð½Ð¸Ñ?Ðµ: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Ð§ÐµÐºÐ°Ð¼ Ñ?Ñ?Ð»Ð¾Ð² Ñ?Ñ?Ð¸Ñ?Ð½Ð¸Ñ?Ðµ: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð»Ð°Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð½Ð¾ Ñ? Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð¸Ð¼Ð°"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¿Ñ?Ð¸Ð¼Ð°Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ: %s"
diff --git a/po/sr ije po b/po/sr ije po
index c7aab4f..3aa879e 100644
--- a/po/sr ije po
+++ b/po/sr ije po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2004-04-29 01:11+0200\n"
 "Last-Translator: Bojan Suzic <bojans teol net>\n"
 "Language-Team: Serbian (sr) <serbiagnome-lista nongnu org>\n"
@@ -1174,7 +1174,7 @@ msgstr "Ð?ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð½ Ð½Ð¸Ð· Ð±Ð°Ñ?Ñ?Ð¾Ð²Ð° Ñ? Ñ?Ð»Ð°Ð·Ñ? ÐºÐ¾Ñ?Ð¸ Ð¿Ñ?Ðµ
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 #, fuzzy
 msgid "Cancellable initialization not supported"
 msgstr "Ð¡Ð¸Ð¼Ð±Ð¾Ð»Ð¸Ñ?ÐºÐµ Ð²ÐµÐ·Ðµ Ð½Ð¸Ñ?Ñ? Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð½Ðµ"
@@ -1969,108 +1969,112 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr ""
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr ""
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð¸Ñ?Ð°Ñ?Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ â??%sâ??: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "Ð?Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ð¼ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ? â??%sâ??: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
 # bug: plural-forms
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, fuzzy, c-format
 msgid "could not get remote address: %s"
 msgstr "Ð?Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ð¾Ð±ÐµÐ·Ð±Ñ?ÐµÐ´Ð¸Ð¼ %lu Ð±Ð°Ñ?Ñ?Ð¾Ð²Ð° Ð·Ð° Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ â??%sâ??"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð¸Ñ?Ð°Ñ?Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ â??%sâ??: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¿Ñ?ÐµÑ?Ð²Ð°Ñ?Ð°Ñ?Ñ?: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð¸Ñ?Ð°Ñ?Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ â??%sâ??: %s"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð¸Ñ?Ð°Ñ?Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ â??%sâ??: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Ð?Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ð¼ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ? â??%sâ??: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð¸Ñ?Ð°Ñ?Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ â??%sâ??: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð¸Ñ?Ð°Ñ?Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ â??%sâ??: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð¸Ñ?Ð°Ñ?Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ â??%sâ??: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð¸Ñ?Ð°Ñ?Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ â??%sâ??: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr ""
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð¸Ñ?Ð°Ñ?Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ â??%sâ??: %s"
diff --git a/po/sr latin po b/po/sr latin po
index 6818865..85b4e14 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-03-09 20:28+0100\n"
 "Last-Translator: MiloÅ¡ PopoviÄ? <gpopac gmail com>\n"
 "Language-Team: Serbian <gnome prevod org>\n"
@@ -1171,7 +1171,7 @@ msgstr "Nepotpun niz bajtova na ulazu"
 msgid "Not enough space in destination"
 msgstr "Nema dovoljno mesta u odrediÅ¡tu"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "Nije podrÅ¾ano pokretanje uz moguÄ?nost prekida"
 
@@ -1958,106 +1958,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Nepoznata opcija %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "Neispravna utiÄ?nica, nije pokrenuto"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Neispravna utiÄ?nica, pokretanje nije uspelo zbog: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "UtiÄ?nica je veÄ? zatvorena"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "pravim GSocket iz fd: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Ne mogu da napravim utiÄ?nicu: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "Zadat je nepoznati protokol"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "ne mogu da dobijem lokalnu adresu: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "ne mogu da dobijem udaljenu adresu: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "ne mogu da sluÅ¡am: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "greÅ¡ka pri povezivanju na adresu: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "greÅ¡ka u prihvatanju veze: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "GreÅ¡ka u povezivanju: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "Povezivanje je u toku"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "GreÅ¡ka u povezivanju: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Ne mogu da dobijem greÅ¡ku na Ä?ekanju: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "GreÅ¡ka u primanju podataka: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "GreÅ¡ka u slanju podataka: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "GreÅ¡ka u zatvaranju utiÄ?nice: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Ä?ekam uslov utiÄ?nice: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "GreÅ¡ka pri slanju poruke: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage nije podrÅ¾ano u prozorima"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "GreÅ¡ka pri primanju poruke: %s"
diff --git a/po/sv.po b/po/sv.po
index 5c8b3fa..a0726c0 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-03-06 00:28+0100\n"
 "Last-Translator: Daniel Nylander <po danielnylander se>\n"
 "Language-Team: Swedish <tp-sv listor tp-sv se>\n"
@@ -1181,7 +1181,7 @@ msgstr "OfullstÃ¤ndig flerbytesekvens i inmatning"
 msgid "Not enough space in destination"
 msgstr "Inte tillrÃ¤ckligt med utrymme i mÃ¥let"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "Avbrytningsbar initiering stÃ¶ds inte"
 
@@ -1971,106 +1971,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "OkÃ¤nd flagga %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "Ogiltigt uttag, inte initierat"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Ogiltigt uttag, initiering misslyckades pÃ¥ grund av: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "Uttaget Ã¤r redan stÃ¤ngt"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "skapar GSocket frÃ¥n fd: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Kunde inte skapa uttag: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "OkÃ¤nt protokoll angavs"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "kunde inte fÃ¥ lokal adress: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "Kunde inte fÃ¥ fjÃ¤rradress: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "kunde inte lyssna: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Fel vid bindning till adress: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Fel vid godkÃ¤nnande av anslutning: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "Fel vid anslutning: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "AnslutningsfÃ¶rsÃ¶k pÃ¥gÃ¥r"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "Fel vid anslutning: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Kunde inte fÃ¥ tag pÃ¥ vÃ¤ntande fel: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Fel vid mottagning av data: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Fel vid sÃ¤ndning av data: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Fel vid stÃ¤ngning av uttag: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "VÃ¤ntar pÃ¥ uttagstillstÃ¥nd: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Fel vid sÃ¤ndning av meddelande: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage stÃ¶ds inte pÃ¥ Windows"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Fel vid mottagning av meddelande: %s"
diff --git a/po/ta.po b/po/ta.po
index 744826e..be2e312 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib.master.ta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2009-09-17 15:47+0530\n"
 "Last-Translator: \n"
 "Language-Team:  <en li org>\n"
@@ -1177,7 +1177,7 @@ msgstr "à®¨à®¿à®²à¯? à®®à®¾à®±à¯?à®±à®¿à®¯à®¿à®©à¯? à®?à®³à¯?à®³à¯?à®?à¯?à®?à¯?
 msgid "Not enough space in destination"
 msgstr "à®?à®¾à®?à¯?à®?à¯?à®?à¯? à®®à¯?à®?à®µà®°à®¿à®?à¯?à®?à¯? à®ªà¯?à®¤à®¿à®¯ à®?à®?à®®à¯? à®?à®²à¯?à®²à¯?"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "à®°à®¤à¯?à®¤à¯?à®?à¯?à®¯à¯?à®¯à®?à¯?à®?à¯?à®?à®¿à®¯ à®¤à¯?à®µà®?à¯?à®?à¯?à®¤à®²à¯? à®¤à¯?à®£à¯?à®ªà¯?à®°à®¿à®µà®¤à®¿à®²à¯?à®²à¯?"
 
@@ -1970,106 +1970,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "à®¤à¯?à®°à®¿à®¯à®¾à®¤ à®µà®¿à®°à¯?à®ªà¯?à®ªà®®à¯? %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "à®¤à®µà®±à®¾à®© à®?à®¾à®?à¯?à®?à¯?à®?à¯?, à®¤à¯?à®µà®?à¯?à®?à®ªà¯?à®ªà®?à®µà®¿à®²à¯?à®²à¯?"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "à®¤à®µà®±à®¾à®© à®?à®¾à®?à¯?à®?à¯?à®?à¯?, à®?à®¤à®©à®¾à®²à¯? à®¤à¯?à®µà®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "à®?à®¾à®?à¯?à®?à¯?à®?à¯? à®?à®±à¯?à®?à®©à®µà¯? à®®à¯?à®?à®ªà¯?à®ªà®?à¯?à®?à®¤à¯?"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "GSocketà®? fdà®?à®²à®¿à®°à¯?à®¨à¯?à®¤à¯? à®?à®°à¯?à®µà®¾à®?à¯?à®?à¯?à®?à®¿à®±à®¤à¯?: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "à®?à®¾à®?à¯?à®?à¯?à®?à¯?à®?à¯? à®?à®°à¯?à®µà®¾à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "à®¤à¯?à®°à®¿à®¯à®¾à®¤ à®¨à¯?à®±à®¿à®®à¯?à®±à¯? à®?à¯?à®±à®¿à®ªà¯?à®ªà®¿à®?à®ªà¯?à®ªà®?à¯?à®?à¯?à®³à¯?à®³à®¤à¯?"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "à®?à®³à¯?à®³à®®à¯? à®®à¯?à®?à®µà®°à®¿à®¯à¯? à®ªà¯?à®± à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "à®¤à¯?à®²à¯? à®®à¯?à®?à®µà®°à®¿à®¯à¯? à®ªà¯?à®± à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "à®?à¯?à®?à¯?à®? à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "à®®à¯?à®?à®µà®°à®¿à®¯à¯? à®ªà®¿à®£à¯?à®?à¯?à®?à¯?à®®à¯? à®ªà¯?à®¤à¯? à®ªà®¿à®´à¯?: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "à®?à®£à¯?à®ªà¯?à®ªà¯? à®?à®±à¯?à®?à¯?à®®à¯? à®ªà¯?à®¤à¯? à®ªà®¿à®´à¯?: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "à®?à®£à¯?à®?à¯?à®?à¯?à®®à¯? à®ªà¯?à®¤à¯? à®ªà®¿à®´à¯?:"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "à®?à®£à¯?à®ªà¯?à®ªà¯? à®?à¯?à®¯à®²à®¿à®²à¯?à®³à¯?à®³à®¤à¯?"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "à®?à®£à¯?à®?à¯?à®?à¯?à®®à¯? à®ªà¯?à®¤à¯? à®ªà®¿à®´à¯?: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "à®µà®¿à®?à¯?à®ªà¯?à®ªà®?à¯?à®? à®ªà®¿à®´à¯?à®¯à¯?à®ªà¯? à®ªà¯?à®± à®®à¯?à®?à®¿à®¯à®µà®¿à®²à¯?à®²à¯?: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "à®¤à®°à®µà¯?à®ªà¯? à®ªà¯?à®±à¯?à®®à¯? à®ªà¯?à®¤à¯? à®ªà®¿à®´à¯?: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "à®¤à®°à®µà¯? à®?à®©à¯?à®ªà¯?à®ªà¯?à®®à¯? à®ªà¯?à®¤à¯? à®ªà®¿à®´à¯?: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "à®?à®¾à®?à¯?à®?à¯?à®?à¯?à®?à¯? à®®à¯?à®?à¯?à®®à¯? à®ªà¯?à®¤à¯? à®ªà®¿à®´à¯?: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "à®?à®¾à®?à¯?à®?à¯?à®?à¯? à®¨à®¿à®²à¯?à®?à¯?à®?à®¾à®? à®?à®¾à®¤à¯?à®¤à®¿à®°à¯?à®?à¯?à®?à®¿à®±à®¤à¯?: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "à®?à¯?à®¯à¯?à®¤à®¿ à®?à®©à¯?à®ªà¯?à®ªà¯?à®®à¯? à®ªà¯?à®¤à¯? à®ªà®¿à®´à¯?: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage windowsà®?à®²à¯? à®¤à¯?à®£à¯?à®ªà¯?à®°à®¿à®µà®¤à®¿à®²à¯?à®²à¯?"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "à®?à¯?à®¯à¯?à®¤à®¿ à®ªà¯?à®±à¯?à®®à¯? à®ªà¯?à®¤à¯? à®ªà®¿à®´à¯?: %s"
diff --git a/po/te.po b/po/te.po
index 0838030..101c574 100644
--- a/po/te.po
+++ b/po/te.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib.master.te\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2009-09-17 14:15+0530\n"
 "Last-Translator: Krishna Babu K <kkrothap redhat com>\n"
 "Language-Team: Telugu <en li org>\n"
@@ -1153,7 +1153,7 @@ msgstr "à°?à°?à±?à°¬à°¡à°¿ à°¬à±?à°?à±? à°?à±?à°°à°®à°?à°¨à±? à°ªà°°à°¿à°µà°°à±?
 msgid "Not enough space in destination"
 msgstr "à°¸à°¾à°?à±?à°?à±? à°?à°¿à°°à±?à°¨à°¾à°®à°¾ à°?à±?à°°à°?à±? à°¸à°°à°¿à°ªà±?à°µà±?à°¨à°?à°¤ à°?à°¾à°?à°¾à°²à±?à°¦à±?"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "à°°à°¦à±?à°¦à±?à°?à±?à°¯à°?à°²à°¿à°?à°¿à°¨ à°¸à°¿à°¦à±?à°¦à±?à°?à°°à°£ à°®à°¦à±?à°¦à°¤à±?à°¯à°¬à°¡à°¦à±?"
 
@@ -1946,106 +1946,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "à°¤à±?à°²à°¿à°¯à°¨à°¿  à°?à°?à±?à°?à°¾à°ªà±?à°°à±?à°µà°?à°®à±? %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "à°?à±?à°²à±?à°²à°¨à°¿ à°¸à°¾à°?à±?à°?à±?, à°¸à°¿à°¦à±?à°¦à°ªà°°à°?à°²à±?à°¦à±?"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "à°?à±?à°²à±?à°²à°¨à°¿ à°¸à°¾à°?à±?à°?à±?, à°¦à±?à°¨à°¿ à°?à°¾à°°à°£à°?à°?à°¾ à°¸à°¦à±?à°¦à±?à°?à°°à°£ à°µà°¿à°«à°²à°®à±?à°?à°¦à°¿: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "à°¸à°¾à°?à±?à°?à±? à°¯à°¿à°ªà±?à°ªà°?à°¿à°?à±? à°®à±?à°¯à°¬à°¡à°¿à°?à°¦à°¿"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "fd à°¨à±?à°?à°¡à°¿ GSocket à°¸à±?à°·à±?à°?à°¿à°¸à±?à°¤à±?à°?à°¦à°¿: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "à°¸à°¾à°?à±?à°?à±?â??à°¨à±? à°¸à±?à°·à±?à°?à°¿à°?à°?à°²à±?à°? à°ªà±?à°¯à°¿à°?à°¦à°¿: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "à°¤à±?à°²à°¿à°¯à°¨à°¿ à°ªà±?à°°à±?à°?à±?à°?à°¾à°²à±? à°¤à±?à°²à±?à°ªà°¬à°¡à°¿à°?à°¦à°¿"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "à°¸à±?à°¥à°¾à°¨à°¿à°? à°?à°¿à°°à±?à°¨à°¾à°®à°¾à°¨à±? à°ªà±?à°?à°¦à°²à±?à°? à°ªà±?à°¯à°¿à°?à°¦à°¿: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "à°¦à±?à°°à°¸à±?à°¥ à°?à°¿à°°à±?à°¨à°¾à°®à°¾à°¨à±? à°ªà±?à°?à°¦à°²à±?à°? à°ªà±?à°¯à°¿à°?à°¦à°¿: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "%s à°µà°¿à°¨à°²à±?à°? à°ªà±?à°¯à°¿à°?à°¦à°¿"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "à°?à°¿à°°à±?à°¨à°¾à°®à°¾à°?à±? à°¬à°?à°¦à°¨à°? à°?à°?à±?à°?à°²à±? à°¦à±?à°·à°®à±?: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "à°?à°¨à±?à°¸à°?à°§à°¾à°¨à°®à±?à°¨à±? à°?à°®à±?à°¦à°¿à°?à°?à±?à°?à°²à±? à°¦à±?à°·à°®à±?: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "à°?à°¨à±?à°¸à°?à°§à°¾à°¨à°®à°?à±?à°?à°²à±? à°¦à±?à°·à°®à±?:"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "à°?à°¨à±?à°¸à°?à°§à°¾à°¨à°®à±? à°ªà±?à°°à±?à°?à°¤à°¿à°²à±?à°µà±?à°?à°¦à°¿"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "%sà°?à±? à°?à°¨à±?à°¸à°?à°§à°¾à°¨à°®à°?à±?à°?à°²à±? à°¦à±?à°·à°®à±?"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "à°µà°¾à°¯à°¿à°¦à°¾à°µà±?à°¨à±?à°¨ à°¦à±?à°·à°®à±?à°¨à±? à°ªà±?à°?à°¦à°²à±?à°? à°ªà±?à°¯à°¿à°?à°¦à°¿: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "à°¡à°¾à°?à°¾ à°¸à±?à°µà±?à°?à°°à°¿à°?à°?à±?à°?à°²à±? à°¦à±?à°·à°®à±?: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "à°¡à°¾à°?à°¾ à°ªà°?à°ªà±?à°?à°²à±? à°¦à±?à°·à°®à±?: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "à°¸à°¾à°?à±?à°?à±? à°®à±?à°¯à±?à°?à°²à±? à°¦à±?à°·à°®à±?: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "à°¸à°¾à°?à±?à°?à±? à°ªà°°à°¿à°¸à±?à°¥à°¿à°¤à°¿ à°?à±?à°°à°?à±? à°µà±?à°?à°¿à°µà±?à°?à°¦à°¿: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "à°¸à°?à°¦à±?à°¶à°®à±?à°¨à±? à°ªà°?à°ªà±?à°?à°²à±? à°¦à±?à°·à°®à±?: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "à°µà°¿à°?à°¡à±?à°¸à±? à°¨à°?à°¦à±? GSocketControlMessage à°®à°¦à±?à°¦à°¤à±?à°¯à°¦à±?"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "à°¸à°?à°¦à±?à°¶à°®à±?à°¨à±? à°¸à±?à°µà±?à°?à°°à°¿à°?à°?à±?à°?à°²à±? à°¦à±?à°·à°®à±?: %s"
diff --git a/po/th.po b/po/th.po
index 4e2c9a2..2af737d 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib 2.14.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-04-06 14:40+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep linux thai net>\n"
 "Language-Team: Thai <thai-l10n googlegroups com>\n"
@@ -1133,7 +1133,7 @@ msgstr "à¸¡à¸µà¸¥à¸³à¸?à¸±à¸?à¹?à¸?à¸?à¹?à¸?à¸µà¹?à¹?à¸¡à¹?à¸ªà¸¡à¸?à¸¹à¸£à¸?à¹?
 msgid "Not enough space in destination"
 msgstr "à¸¡à¸µà¸?à¸µà¹?à¸§à¹?à¸²à¸?à¹?à¸¡à¹?à¸?à¸à¸?à¸µà¹?à¸?à¸¥à¸²à¸¢à¸?à¸²à¸?"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "à¹?à¸¡à¹?à¸£à¸à¸?à¸£à¸±à¸?à¸?à¸²à¸£à¸?à¸±à¹?à¸?à¸?à¹?à¸²à¹?à¸£à¸´à¹?à¸¡à¸?à¹?à¸?à¹?à¸?à¸?à¸¢à¸?à¹?à¸¥à¸´à¸?à¹?à¸?à¹?"
 
@@ -1920,106 +1920,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "à¹?à¸¡à¹?à¸£à¸¹à¹?à¸?à¸±à¸?à¸?à¸±à¸§à¹?à¸¥à¸·à¸à¸? %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "à¸?à¹?à¸à¸?à¹?à¸?à¹?à¸?à¸?à¸´à¸?à¸?à¸¥à¸²à¸? à¸¢à¸±à¸?à¹?à¸¡à¹?à¹?à¸?à¹?à¸?à¸±à¹?à¸?à¸?à¹?à¸²à¹?à¸£à¸´à¹?à¸¡à¸?à¹?à¸?"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "à¸?à¹?à¸à¸?à¹?à¸?à¹?à¸?à¸?à¸´à¸?à¸?à¸¥à¸²à¸? à¸?à¸±à¹?à¸?à¸?à¹?à¸²à¹?à¸£à¸´à¹?à¸¡à¸?à¹?à¸?à¹?à¸¡à¹?à¸ªà¸³à¹?à¸£à¹?à¸?à¹?à¸?à¸·à¹?à¸à¸?à¸?à¸²à¸?: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "à¸?à¹?à¸à¸?à¹?à¸?à¹?à¸?à¸?à¸¹à¸?à¸?à¸´à¸?à¹?à¸?à¹?à¸¥à¹?à¸§"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "à¸?à¸?à¸°à¸ªà¸£à¹?à¸²à¸? GSocket à¸?à¸²à¸? fd: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "à¸ªà¸£à¹?à¸²à¸?à¸?à¹?à¸à¸?à¹?à¸?à¹?à¸?à¹?à¸¡à¹?à¸ªà¸³à¹?à¸£à¹?à¸?: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "à¸¡à¸µà¸?à¸²à¸£à¸£à¸°à¸?à¸¸à¹?à¸?à¸£à¹?à¸?à¸?à¸à¸¥à¸?à¸µà¹?à¹?à¸¡à¹?à¸£à¸¹à¹?à¸?à¸±à¸?"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "à¹?à¸¡à¹?à¸ªà¸²à¸¡à¸²à¸£à¸?à¸«à¸²à¸?à¸µà¹?à¸à¸¢à¸¹à¹?à¸?à¸±à¹?à¸?à¸?à¸µà¹?à¹?à¸?à¹?: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "à¹?à¸¡à¹?à¸ªà¸²à¸¡à¸²à¸£à¸?à¸«à¸²à¸?à¸µà¹?à¸à¸¢à¸¹à¹?à¸?à¸±à¹?à¸?à¹?à¸?à¹?à¸?à¹?à¸?à¹?: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "à¹?à¸¡à¹?à¸ªà¸²à¸¡à¸²à¸£à¸? listen: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "à¹?à¸?à¸´à¸?à¸?à¹?à¸à¸?à¸´à¸?à¸?à¸¥à¸²à¸?à¸?à¸?à¸° bind à¸?à¸±à¸?à¸?à¸µà¹?à¸à¸¢à¸¹à¹?: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "à¹?à¸?à¸´à¸?à¸?à¹?à¸à¸?à¸´à¸?à¸?à¸¥à¸²à¸?à¸?à¸?à¸°à¸£à¸±à¸?à¸?à¸²à¸£à¹?à¸?à¸·à¹?à¸à¸¡à¸?à¹?à¸: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "à¹?à¸?à¸´à¸?à¸?à¹?à¸à¸?à¸´à¸?à¸?à¸¥à¸²à¸?à¸?à¸?à¸°à¹?à¸?à¸·à¹?à¸à¸¡à¸?à¹?à¸: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "à¸?à¸³à¸¥à¸±à¸?à¸à¸¢à¸¹à¹?à¸£à¸°à¸«à¸§à¹?à¸²à¸?à¹?à¸?à¸·à¹?à¸à¸¡à¸?à¹?à¸"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "à¹?à¸?à¸´à¸?à¸?à¹?à¸à¸?à¸´à¸?à¸?à¸¥à¸²à¸?à¸?à¸?à¸°à¹?à¸?à¸·à¹?à¸à¸¡à¸?à¹?à¸: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "à¹?à¸¡à¹?à¸ªà¸²à¸¡à¸²à¸£à¸?à¸à¹?à¸²à¸?à¸?à¹?à¸à¸?à¸´à¸?à¸?à¸¥à¸²à¸?à¸?à¸µà¹?à¸?à¸±à¹?à¸?à¸?à¹?à¸²à¸?à¸à¸¢à¸¹à¹?à¹?à¸?à¹?: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "à¹?à¸?à¸´à¸?à¸?à¹?à¸à¸?à¸´à¸?à¸?à¸¥à¸²à¸?à¸?à¸?à¸°à¸£à¸±à¸?à¸?à¹?à¸à¸¡à¸¹à¸¥: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "à¹?à¸?à¸´à¸?à¸?à¹?à¸à¸?à¸´à¸?à¸?à¸¥à¸²à¸?à¸?à¸?à¸°à¸¥à¹?à¸?à¸?à¹?à¸à¸¡à¸¹à¸¥: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "à¹?à¸?à¸´à¸?à¸?à¹?à¸à¸?à¸´à¸?à¸?à¸¥à¸²à¸?à¸?à¸?à¸°à¸?à¸´à¸?à¸?à¹?à¸à¸?à¹?à¸?à¹?à¸?: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "à¸?à¸³à¸¥à¸±à¸?à¸£à¸à¹?à¸?à¸·à¹?à¸à¸?à¹?à¸?à¸?à¸à¸?à¸?à¹?à¸à¸?à¹?à¸?à¹?à¸?: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "à¹?à¸?à¸´à¸?à¸?à¹?à¸à¸?à¸´à¸?à¸?à¸¥à¸²à¸?à¸?à¸?à¸°à¸ªà¹?à¸?à¸?à¹?à¸à¸?à¸§à¸²à¸¡: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "à¹?à¸¡à¹?à¸£à¸à¸?à¸£à¸±à¸? GSocketControlMessage à¸?à¸?à¸§à¸´à¸?à¹?à¸?à¸§à¸ªà¹?"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "à¹?à¸?à¸´à¸?à¸?à¹?à¸à¸?à¸´à¸?à¸?à¸¥à¸²à¸?à¸?à¸?à¸°à¸£à¸±à¸?à¸?à¹?à¸à¸?à¸§à¸²à¸¡: %s"
diff --git a/po/tl.po b/po/tl.po
index cc901e8..6cd3e3b 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2005-12-01 17:31+0800\n"
 "Last-Translator: Eric Pareja <xenos upm edu ph>\n"
 "Language-Team: Tagalog <debian-tl banwa upm edu ph>\n"
@@ -1201,7 +1201,7 @@ msgstr "Hindi tanggap na byte sequence sa conversion input"
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 #, fuzzy
 msgid "Cancellable initialization not supported"
 msgstr "Hindi suportado ang mga symbolic link"
@@ -1999,107 +1999,111 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Hindi kilalang option %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr ""
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "Error sa pagbasa ng talaksang '%s': %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "Sawi ang paglikha ng talaksang '%s': %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, fuzzy, c-format
 msgid "could not get remote address: %s"
 msgstr "Hindi mapalitan ang modo ng talaksan: bigo ang waitpid(): %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "Error sa pagbasa ng talaksang '%s': %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "Error habang nagco-convert: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "Error sa pagbasa ng talaksang '%s': %s"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "Error sa pagbasa ng talaksang '%s': %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Sawi ang paglikha ng talaksang '%s': %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "Error sa pagbasa ng talaksang '%s': %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "Error sa pagbasa ng talaksang '%s': %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "Error sa pagbasa ng talaksang '%s': %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "Error sa pagbasa ng talaksang '%s': %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr ""
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "Error sa pagbasa ng talaksang '%s': %s"
diff --git a/po/tr.po b/po/tr.po
index c682428..58638f0 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2009-08-25 00:32+0300\n"
 "Last-Translator: Baris Cicek <baris teamforce name tr>\n"
 "Language-Team: Turkish <gnome-turk gnome org>\n"
@@ -1172,7 +1172,7 @@ msgstr "DÃ¶nÃ¼Å?Ã¼m girdisinde geÃ§ersiz bayt dizisi"
 msgid "Not enough space in destination"
 msgstr "Soket adresi iÃ§in yeterli alan yok"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "Ä°ptal edilebilir baÅ?latma desteklenmiyor"
 
@@ -1966,106 +1966,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Bilinmeyen seÃ§enek %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "GeÃ§ersiz soket, baÅ?latÄ±lmamÄ±Å?"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "GeÃ§ersiz soket, baÅ?latma baÅ?arÄ±sÄ±z oldu: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "Soket zaten kapalÄ±"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "fd'den GSocket oluÅ?turuluyor: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Soket oluÅ?turulamadÄ±: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "Bilinmeyen protokol belirtildi"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "yerel adres alÄ±namadÄ±: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "uzaktaki adres alÄ±namadÄ±: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "dinlenemedi: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Adrese baÄ?larken hata: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "BaÄ?lantÄ± kabul edilirken hata: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "BaÄ?larken hata:"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "BaÄ?lantÄ± devam ediyor"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "BaÄ?larken hata: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Bekleyen hata alÄ±namÄ±yor: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Veri alÄ±rken hata: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Veri gÃ¶nderirken hata: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Soket kapatÄ±lÄ±rken hata: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Soket durumu bekleniyor: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Mesaj gÃ¶nderme hatasÄ±: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage windows'ta desteklenmiyor"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Mesaj alma hatasÄ±: %s"
diff --git a/po/tt.po b/po/tt.po
index 0e261dd..cc87020 100644
--- a/po/tt.po
+++ b/po/tt.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgnome\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2005-11-09 13:19+0300\n"
 "Last-Translator: Albert FazlÃ <tatarish l10n gmail com>\n"
 "Language-Team: Tatarish <tatarish l10n gmail com>\n"
@@ -1118,7 +1118,7 @@ msgstr ""
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr ""
 
@@ -1910,107 +1910,111 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Bilgesez %s atlÄ± kÃ¶ylÃ¤mÃ¤"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr ""
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "'%s' biremen uqÄ±Ä?anda xata: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "'%s' biremen yasap bulmadÄ±: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, fuzzy, c-format
 msgid "could not get remote address: %s"
 msgstr "Birem Ä±sulÄ±n Ã¼zgÃ¤rtep bulmadÄ±: waitpid() uzmadÄ±: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "'%s' biremen uqÄ±Ä?anda xata: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "Ã?ylÃ¤ndergÃ¤ndÃ¤ xata Ã§Ä±qtÄ±: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "'%s' biremen uqÄ±Ä?anda xata: %s"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "'%s' biremen uqÄ±Ä?anda xata: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "'%s' biremen yasap bulmadÄ±: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "'%s' biremen uqÄ±Ä?anda xata: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "'%s' biremen uqÄ±Ä?anda xata: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "'%s' biremen uqÄ±Ä?anda xata: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "'%s' biremen uqÄ±Ä?anda xata: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr ""
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "'%s' biremen uqÄ±Ä?anda xata: %s"
diff --git a/po/uk.po b/po/uk.po
index 6b78a42..f03262b 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 20010-03-26 14:56+0300\n"
 "Last-Translator: Maxim Dziumanenko <dziumanenko gmail com>\n"
 "Language-Team: ukrainian <Ukrainian <uk li org>>\n"
@@ -1184,7 +1184,7 @@ msgstr "Ð?ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»Ñ?Ð½Ð° Ð±Ð°Ð³Ð°Ñ?Ð¾Ð±Ð°Ð¹Ñ?Ð¾Ð²Ð° Ð¿Ð¾Ñ?Ð»Ñ?Ð´Ð¾Ð²Ð½Ñ?Ñ?
 msgid "Not enough space in destination"
 msgstr "Ð?Ñ?Ð°ÐºÑ?Ñ? Ð¿Ñ?Ð¾Ñ?Ñ?Ð¾Ñ?Ñ? Ð´Ð»Ñ? Ñ?ÐµÐ·Ñ?Ð»Ñ?Ñ?Ð°Ñ?Ñ?"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "Ð?Ð½Ñ?Ñ?Ñ?Ð°Ð»Ñ?Ð·Ð°Ñ?Ñ?Ñ? Ð· Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ñ?Ñ?Ñ?Ñ? Ñ?ÐºÐ°Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ? Ð½Ðµ Ð¿Ñ?Ð´Ñ?Ñ?Ð¸Ð¼Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?"
 
@@ -1980,106 +1980,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Ð?ÐµÐ²Ñ?Ð´Ð¾Ð¼Ð¸Ð¹ Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ? %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "Ð?ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»Ñ?Ð½Ð¸Ð¹ Ñ?Ð¾ÐºÐµÑ?, Ð½Ðµ Ñ?Ð½Ñ?Ñ?Ñ?Ð°Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸Ð¹"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "Ð?ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»Ñ?Ð½Ð¸Ð¹ Ñ?Ð¾ÐºÐµÑ?, Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ñ?Ð½Ñ?Ñ?Ñ?Ð°Ð»Ñ?Ð·Ð°Ñ?Ñ?Ñ? Ñ?ÐµÑ?ÐµÐ· : %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "Ð¡Ð¾ÐºÐµÑ? Ð²Ð¶Ðµ Ð·Ð°ÐºÑ?Ð¸Ñ?Ð¸Ð¹"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "Ñ?Ñ?Ð²Ð¾Ñ?ÐµÐ½Ð½Ñ? GSocket Ð· fd: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "Ð?Ðµ Ð²Ð´Ð°Ñ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?Ð²Ð¾Ñ?Ð¸Ñ?Ð¸ Ñ?Ð¾ÐºÐµÑ?: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "Ð?ÐºÐ°Ð·Ð°Ð½Ð¾ Ð½ÐµÐ²Ñ?Ð´Ð¾Ð¼Ð¸Ð¹ Ð¿Ñ?Ð¾Ñ?Ð¾ÐºÐ¾Ð»"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "Ð½Ðµ Ð²Ð´Ð°Ñ?Ñ?Ñ?Ñ?Ñ? Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ñ?Ð¸ Ð»Ð¾ÐºÐ°Ð»Ñ?Ð½Ñ? Ð°Ð´Ñ?ÐµÑ?Ñ?: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "Ð½Ðµ Ð²Ð´Ð°Ñ?Ñ?Ñ?Ñ?Ñ? Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ñ?Ð¸ Ð²Ñ?Ð´Ð´Ð°Ð»ÐµÐ½Ñ? Ð°Ð´Ñ?ÐµÑ?Ñ?: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "Ð½Ðµ Ð²Ð´Ð°Ñ?Ñ?Ñ?Ñ?Ñ? Ð¿Ñ?Ð¾Ñ?Ð»Ñ?Ñ?Ð°Ñ?Ð¸: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Ð?Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ?Ð¸Ð²'Ñ?Ð·Ñ?Ð²Ð°Ð½Ð½Ñ? Ð´Ð¾ Ð°Ð´Ñ?ÐµÑ?Ð¸: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Ð?Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ?Ð¸ Ð¿Ñ?Ð¸Ð¹Ð½Ñ?Ñ?Ñ?Ñ? Ð·'Ñ?Ð´Ð½Ð°Ð½Ð½Ñ?: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "Ð?Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ?Ð¸ Ð·'Ñ?Ð´Ð½Ð°Ð½Ð½Ñ?:"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "Ð?'Ñ?Ð´Ð½Ð°Ð½Ð½Ñ? Ñ?Ñ?Ð¸Ð²Ð°Ñ?"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "Ð?Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ?Ð¸ Ð·'Ñ?Ð´Ð½Ð°Ð½Ð½Ñ?: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Ð?Ðµ Ð²Ð´Ð°Ñ?Ñ?Ñ?Ñ?Ñ? Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ñ?Ð¸ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÑ?, Ñ?Ð¾ Ð¾Ñ?Ñ?ÐºÑ?Ñ?: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Ð?Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ?Ð¸ Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ð½Ð½Ñ? Ð´Ð°Ð½Ð¸Ñ?: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Ð?Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ?Ð¸ Ð½Ð°Ð´Ñ?Ð¸Ð»Ð°Ð½Ð½Ñ? Ð´Ð°Ð½Ð¸Ñ?: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Ð?Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ?Ð¸ Ð·Ð°ÐºÑ?Ð¸Ð²Ð°Ð½Ð½Ñ? Ñ?Ð¾ÐºÐµÑ?Ñ?: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Ð?Ñ?Ñ?ÐºÑ?Ñ?Ñ?Ñ?Ñ?Ñ? Ñ?Ð¼Ð¾Ð²Ð° Ñ?Ð¾ÐºÐµÑ?Ñ?: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Ð?Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ?Ð¸ Ð½Ð°Ð´Ñ?Ð¸Ð»Ð°Ð½Ð½Ñ? Ð¿Ð¾Ð²Ñ?Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ?: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage Ð½Ðµ Ð¿Ñ?Ð´Ñ?Ñ?Ð¸Ð¼Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? Ñ? windows"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Ð?Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ?Ð¸ Ð¾Ñ?Ñ?Ð¸Ð¼Ð°Ð½Ð½Ñ? Ð¿Ð¾Ð²Ñ?Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ?: %s"
diff --git a/po/vi.po b/po/vi.po
index 66cd9bd..28e9752 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib 2.19.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-03-22 21:32+0930\n"
 "Last-Translator: Clytie Siddall <clytie riverland net au>\n"
 "Language-Team: Vietnamese <vi-VN googlegroups com>\n"
@@ -1171,7 +1171,7 @@ msgstr "Gáº·p dÃ¢y byte khÃ´ng hoÃ n thÃ nh trong Ä?áº§u vÃ o"
 msgid "Not enough space in destination"
 msgstr "KhÃ´ng Ä?á»§ khÃ´ng gian trong Ä?Ãch Ä?áº¿n"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "KhÃ´ng há»? trá»£ thao tÃ¡c khá»?i Ä?á»?ng cÃ³ thá»? huá»· bá»?"
 
@@ -1966,106 +1966,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "KhÃ´ng biáº¿t tÃ¹y chá»?n %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "á»? cáº¯m khÃ´ng há»£p lá»?, chÆ°a Ä?Æ°á»£c sÆ¡ khá»?i"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "á»? cáº¯m khÃ´ng há»£p lá»?, khá»?i Ä?á»?ng tháº¥t báº¡i vÃ¬: %s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "á»? cáº¯m Ä?Ã£ Ä?Æ°á»£c Ä?Ã³ng"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "táº¡o GSocket tá»« fd: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "KhÃ´ng thá»? táº¡o á»? cáº¯m: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "Lá»?i giao thá»©c khÃ´ng xÃ¡c Ä?á»?nh"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "khÃ´ng thá»? láº¥y Ä?á»?a chá»? cá»¥c bá»?: %s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "khÃ´ng thá»? láº¥y Ä?á»?a chá»? á»? xa: %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "khÃ´ng thá»? láº¯ng nghe: %s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "Lá»?i liÃªn káº¿t Ä?á»?a chá»?: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "Lá»?i cháº¥p nháºn káº¿t ná»?i: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "Lá»?i káº¿t ná»?i: "
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "Káº¿t ná»?i Ä?ang hÃ¬nh thÃ nh"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "Lá»?i káº¿t ná»?i: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "KhÃ´ng thá»? láº¥y lá»?i Ä?ang chá»?: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "Lá»?i nháºn dá»¯ liá»?u: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "Lá»?i gá»i dá»¯ liá»?u: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "Lá»?i Ä?Ã³ng á»? cáº¯m: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "Ä?ang chá»? á»? cáº¯m: %s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Lá»?i gá»i thÃ´ng Ä?iá»?p: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "GSocketControlMessage khÃ´ng Ä?Æ°á»£c há»? trá»£ trÃªn Windows"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "Lá»?i nháºn thÃ´ng Ä?iá»?p: %s"
diff --git a/po/wa.po b/po/wa.po
index 81475a6..9980551 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2004-05-03 14:40+0200\n"
 "Last-Translator: Pablo Saratxaga <pablo walon org>\n"
 "Language-Team: Walloon <linux-wa walon org>\n"
@@ -1135,7 +1135,7 @@ msgstr "Secwince d'Â octets nÃ©n valide e l'Â intrÃªye do cviersaedje"
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 #, fuzzy
 msgid "Cancellable initialization not supported"
 msgstr "LoyÃ©ns simbolikes nÃ©n sopoirtÃ©s"
@@ -1929,107 +1929,111 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr ""
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr ""
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "Ã?k n'Â a nÃ©n stÃ® tot lÃ©jhant l'Â fitchÃ® Â«%sÂ»: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "Dji n'Â a savou askepyÃ® l'Â fitchÃ® Â«%sÂ»: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, fuzzy, c-format
 msgid "could not get remote address: %s"
 msgstr "Dji n'Â a savou alouwer %lu octets po lÃ©re li fitchÃ® Â«%sÂ»"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "Ã?k n'Â a nÃ©n stÃ® tot lÃ©jhant l'Â fitchÃ® Â«%sÂ»: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "Ã?k n'Â a nÃ©n stÃ® tot cviersant: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "Ã?k n'Â a nÃ©n stÃ® tot lÃ©jhant l'Â fitchÃ® Â«%sÂ»: %s"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "Ã?k n'Â a nÃ©n stÃ® tot lÃ©jhant l'Â fitchÃ® Â«%sÂ»: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Dji n'Â a savou askepyÃ® l'Â fitchÃ® Â«%sÂ»: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "Ã?k n'Â a nÃ©n stÃ® tot lÃ©jhant l'Â fitchÃ® Â«%sÂ»: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "Ã?k n'Â a nÃ©n stÃ® tot lÃ©jhant l'Â fitchÃ® Â«%sÂ»: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "Ã?k n'Â a nÃ©n stÃ® tot lÃ©jhant l'Â fitchÃ® Â«%sÂ»: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "Ã?k n'Â a nÃ©n stÃ® tot lÃ©jhant l'Â fitchÃ® Â«%sÂ»: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr ""
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "Ã?k n'Â a nÃ©n stÃ® tot lÃ©jhant l'Â fitchÃ® Â«%sÂ»: %s"
diff --git a/po/xh.po b/po/xh.po
index 91b0aef..b55190c 100644
--- a/po/xh.po
+++ b/po/xh.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2005-02-08 12:31+0200\n"
 "Last-Translator: Canonical Ltd <translations canonical com>\n"
 "Language-Team: Xhosa <xh-translate ubuntu com>\n"
@@ -1198,7 +1198,7 @@ msgstr "Ulandelelwano olungasebenziyo lwe-byte kungeniso-lwazi yenguqulo"
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 #, fuzzy
 msgid "Cancellable initialization not supported"
 msgstr "Ikhonkco elingumfuziselo alixhaswanga"
@@ -1995,107 +1995,111 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "Ukhetho olungaziwayo %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr ""
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "Impazamo yokufunda ifayili '%s': %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "Akuphumelelekanga ukudala ifayili '%s': %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, fuzzy, c-format
 msgid "could not get remote address: %s"
 msgstr "Akwazekanga ukwaba %lu ii-byte ukufunda ifayili \"%s\""
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "Impazamo yokufunda ifayili '%s': %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "Impazamo ngelixa lenguqulo: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "Impazamo yokufunda ifayili '%s': %s"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "Impazamo yokufunda ifayili '%s': %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Akuphumelelekanga ukudala ifayili '%s': %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "Impazamo yokufunda ifayili '%s': %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "Impazamo yokufunda ifayili '%s': %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "Impazamo yokufunda ifayili '%s': %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "Impazamo yokufunda ifayili '%s': %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr ""
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "Impazamo yokufunda ifayili '%s': %s"
diff --git a/po/yi.po b/po/yi.po
index 0cf92d8..29d6684 100644
--- a/po/yi.po
+++ b/po/yi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2003-03-19\n"
 "Last-Translator: Raphael Finkel <raphael cs uky edu>\n"
 "Language-Team: Yiddish <raphael cs uky edu>\n"
@@ -1165,7 +1165,7 @@ msgstr "×?×?×?×?×¢×§×¡×?×§ ×?Ö·×?×?×¢×?×¢Ö¾×¡×¢×²Ö·×°×¢× ×¥ ×?×?×? ×¤Ö¿×?Ö·×¨×°
 msgid "Not enough space in destination"
 msgstr ""
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr ""
 
@@ -1956,107 +1956,111 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr ""
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr ""
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "×?×?×¨×?×¤Ö¿×?Ö·×? ×?×?×? ×?×²×¢× ×¢×? ×?×¢×§×¢ %s: %s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "× ×?×? ×?×¢×§×¢× ×? ×©×?Ö·×¤Ö¿×? ×?×¢×§×¢ %s: %s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, fuzzy, c-format
 msgid "could not get remote address: %s"
 msgstr "× ×?×? ×?×¢×§×¢× ×? ×?×±×¡×?×²×?×? %lu ×?Ö·×?×?×¢×?×¢×? ×¦×? ×?×²×¢× ×¢×? ×?×¢×§×¢ %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "×?×?×¨×?×¤Ö¿×?Ö·×? ×?×?×? ×?×²×¢× ×¢×? ×?×¢×§×¢ %s: %s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "×?×?×¨×?×¤Ö¿×?Ö·×? ×?×©×¢×ª ×¤Ö¿×?Ö·×¨×°×?Ö·× ×?×?×?× ×?: %s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 #, fuzzy
 msgid "Error connecting: "
 msgstr "×?×?×¨×?×¤Ö¿×?Ö·×? ×?×?×? ×?×²×¢× ×¢×? ×?×¢×§×¢ %s: %s"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "×?×?×¨×?×¤Ö¿×?Ö·×? ×?×?×? ×?×²×¢× ×¢×? ×?×¢×§×¢ %s: %s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "× ×?×? ×?×¢×§×¢× ×? ×©×?Ö·×¤Ö¿×? ×?×¢×§×¢ %s: %s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "×?×?×¨×?×¤Ö¿×?Ö·×? ×?×?×? ×?×²×¢× ×¢×? ×?×¢×§×¢ %s: %s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "×?×?×¨×?×¤Ö¿×?Ö·×? ×?×?×? ×?×²×¢× ×¢×? ×?×¢×§×¢ %s: %s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "×?×?×¨×?×¤Ö¿×?Ö·×? ×?×?×? ×?×²×¢× ×¢×? ×?×¢×§×¢ %s: %s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "×?×?×¨×?×¤Ö¿×?Ö·×? ×?×?×? ×?×²×¢× ×¢×? ×?×¢×§×¢ %s: %s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr ""
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "×?×?×¨×?×¤Ö¿×?Ö·×? ×?×?×? ×?×²×¢× ×¢×? ×?×¢×§×¢ %s: %s"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 896780c..4cbc5be 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2009-09-09 20:48+0800\n"
 "Last-Translator: Hinker <hinkerliu gmail com>\n"
 "Language-Team: Chinese/Simplified <i18n-translation lists linux net cn>\n"
@@ -1133,7 +1133,7 @@ msgstr "è½¬æ?¢è¾?å?¥ä¸å?ºç?°æ? æ??å?ç¬¦åº?å??"
 msgid "Not enough space in destination"
 msgstr "æ²¡æ??è¶³å¤?ç??ç©ºé?´å¥?æ?¥å?å?°å??"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "ä¸?æ?¯æ??å?¯æ?¤é??ç??å??å§?å??"
 
@@ -1929,106 +1929,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "æ?ªç?¥é??é¡¹ %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "æ? æ??ç??å¥?æ?¥å?ï¼?ä¸?è?½è¢«å??å§?å??"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "æ? æ??ç??å¥?æ?¥å?ï¼?å??å§?å??å¤±è´¥ç??å??å? æ?¯ï¼?%s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "å¥?æ?¥å?å·²ç»?å?³é?"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "ä»?æ??ä»¶æ??è¿°ç¬¦å??å»º GSocketï¼?%s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "æ? æ³?å??å»ºå¥?æ?¥å?ï¼?%s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "æ??å®?äº?æ?ªç?¥å??è®®"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "ä¸?è?½è?·å??æ?¬å?°å?°å??ï¼?%s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "ä¸?è?½è?·å??è¿?ç¨?å?°å??ï¼? %s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "æ? æ³?ç??å?¬ï¼?%s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "é??è¯¯ç»?å®?å?°å??ï¼?%s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "æ?¥å??è¿?æ?¥å?ºé??ï¼?%s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "è¿?æ?¥å?ºé?? :"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "æ£å?¨è¿?æ?¥"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "è¿?æ?¥å?ºé?? :%s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "æ? æ³?è?·å??æ?ªå?³ç??é??è¯¯ï¼?%s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "æ?¥æ?¶æ?°æ?®å?ºé??ï¼?%s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "å??é??æ?°æ?®å?ºé??ï¼?%s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "å?³é?å¥?æ?¥å?å?ºé??ï¼?%s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "ç?å¾?å¥?æ?¥å?ç?¶æ??ï¼?%s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "å??é??ä¿¡æ?¯å?ºé??ï¼?%s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "Windows ä¸?æ?¯æ?? GSocketControlMessage"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "æ?¥å??ä¿¡æ?¯å?ºé??ï¼?%s"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 4007284..a5d6e8c 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib 2.24.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-03-27 20:50+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
@@ -1130,7 +1130,7 @@ msgstr "å?¨è¼¸å?¥ä¸å?ºç?¾ä¸?å®?æ?´ç??å¤?ä½?å??çµ?æ¬¡åº?"
 msgid "Not enough space in destination"
 msgstr "å?¨ç?®ç??ç«¯ä¸æ²?æ??è¶³å¤ ç??ç©ºé??"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "ä¸?æ?¯æ?´å?¯å??æ¶?ç??å??å§?å??"
 
@@ -1917,106 +1917,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "æ?ªç?¥ç??é?¸é ? %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "ç?¡æ??ç?? socketï¼?å°?æ?ªå??å§?å??"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "ç?¡æ??ç?? socketï¼?å??å§?å??å¤±æ??å??å? ç?ºï¼?%s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "Socket å·²ç¶?é??é??"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "æ£å?¨å¾? fd å»ºç«? GSocketï¼?%s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "ç?¡æ³?å»ºç«? socketï¼?%s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "æ??å®?äº?ä¸?æ??ç??é??è¨?å??å®?"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "ç?¡æ³?å??å¾?æ?¬å?°ç«¯ä½?å??ï¼?%s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "ç?¡æ³?å??å¾?é? ç«¯ä½?å??ï¼?%s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "ç?¡æ³?è?½å??ï¼?%s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "ç¶?å®?è?³ä½?å??æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "æ?¥å??é?£ç·?æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "é?£ç·?é?¯èª¤ï¼?"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "é?£ç·?é?²è¡?ä¸"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "é?£ç·?é?¯èª¤ï¼?%s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "ç?¡æ³?å??å¾?æ?ªè??ç??ç??é?¯èª¤ï¼?%s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "æ?¥æ?¶è³?æ??æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "å?³é??è³?æ??æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "é??é?? socket æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "ç?å?? socket æ??æ³?ï¼?%s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "å?³é??è¨?æ?¯æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "è¦?çª?ä¸?æ?¯æ?´ GSocketControlMessage"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "å??å??é?µä»¶ç?¼ç??é?¯èª¤ï¼?%s"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 5cd23a3..26585c0 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib 2.24.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-22 21:59-0400\n"
+"POT-Creation-Date: 2010-04-23 20:25-0400\n"
 "PO-Revision-Date: 2010-03-27 14:14+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (traditional)\n"
@@ -1130,7 +1130,7 @@ msgstr "å?¨è¼¸å?¥ä¸å?ºç?¾ä¸?å®?æ?´ç??å¤?ä½?å??çµ?æ¬¡åº?"
 msgid "Not enough space in destination"
 msgstr "å?¨ç?®ç??ç«¯ä¸æ²?æ??è¶³å¤ ç??ç©ºé??"
 
-#: gio/gcharsetconverter.c:448 gio/gsocket.c:772
+#: gio/gcharsetconverter.c:448 gio/gsocket.c:811
 msgid "Cancellable initialization not supported"
 msgstr "ä¸?æ?¯æ?´å?¯å??æ¶?ç??å??å§?å??"
 
@@ -1917,106 +1917,110 @@ msgstr ""
 msgid "Unknown command '%s'\n"
 msgstr "æ?ªç?¥ç??é?¸é ? %s"
 
-#: gio/gsocket.c:277
+#: gio/gsocket.c:282
 msgid "Invalid socket, not initialized"
 msgstr "ç?¡æ??ç?? socketï¼?å°?æ?ªå??å§?å??"
 
-#: gio/gsocket.c:284
+#: gio/gsocket.c:289
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr "ç?¡æ??ç?? socketï¼?å??å§?å??å¤±æ??å??å? ç?ºï¼?%s"
 
-#: gio/gsocket.c:292
+#: gio/gsocket.c:297
 msgid "Socket is already closed"
 msgstr "Socket å·²ç¶?é??é??"
 
-#: gio/gsocket.c:413
+#: gio/gsocket.c:305 gio/gsocket.c:2616 gio/gsocket.c:2660
+msgid "Socket I/O timed out"
+msgstr ""
+
+#: gio/gsocket.c:427
 #, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "æ£å?¨å¾? fd å»ºç«? GSocketï¼?%s"
 
-#: gio/gsocket.c:447 gio/gsocket.c:461 gio/gsocket.c:1925
+#: gio/gsocket.c:461 gio/gsocket.c:475 gio/gsocket.c:2027
 #, c-format
 msgid "Unable to create socket: %s"
 msgstr "ç?¡æ³?å»ºç«? socketï¼?%s"
 
-#: gio/gsocket.c:447
+#: gio/gsocket.c:461
 msgid "Unknown protocol was specified"
 msgstr "æ??å®?äº?ä¸?æ??ç??é??è¨?å??å®?"
 
-#: gio/gsocket.c:1126
+#: gio/gsocket.c:1225
 #, c-format
 msgid "could not get local address: %s"
 msgstr "ç?¡æ³?å??å¾?æ?¬å?°ç«¯ä½?å??ï¼?%s"
 
-#: gio/gsocket.c:1159
+#: gio/gsocket.c:1258
 #, c-format
 msgid "could not get remote address: %s"
 msgstr "ç?¡æ³?å??å¾?é? ç«¯ä½?å??ï¼?%s"
 
-#: gio/gsocket.c:1217
+#: gio/gsocket.c:1316
 #, c-format
 msgid "could not listen: %s"
 msgstr "ç?¡æ³?è?½å??ï¼?%s"
 
-#: gio/gsocket.c:1291
+#: gio/gsocket.c:1390
 #, c-format
 msgid "Error binding to address: %s"
 msgstr "ç¶?å®?è?³ä½?å??æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: gio/gsocket.c:1411
+#: gio/gsocket.c:1510
 #, c-format
 msgid "Error accepting connection: %s"
 msgstr "æ?¥å??é?£ç·?æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: gio/gsocket.c:1524
+#: gio/gsocket.c:1623
 msgid "Error connecting: "
 msgstr "é?£ç·?é?¯èª¤ï¼?"
 
-#: gio/gsocket.c:1528
+#: gio/gsocket.c:1627
 msgid "Connection in progress"
 msgstr "é?£ç·?é?²è¡?ä¸"
 
-#: gio/gsocket.c:1533
+#: gio/gsocket.c:1632
 #, c-format
 msgid "Error connecting: %s"
 msgstr "é?£ç·?é?¯èª¤ï¼?%s"
 
-#: gio/gsocket.c:1573
+#: gio/gsocket.c:1675
 #, c-format
 msgid "Unable to get pending error: %s"
 msgstr "ç?¡æ³?å??å¾?æ?ªè??ç??ç??é?¯èª¤ï¼?%s"
 
-#: gio/gsocket.c:1669
+#: gio/gsocket.c:1771
 #, c-format
 msgid "Error receiving data: %s"
 msgstr "æ?¥æ?¶è³?æ??æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: gio/gsocket.c:1812
+#: gio/gsocket.c:1914
 #, c-format
 msgid "Error sending data: %s"
 msgstr "å?³é??è³?æ??æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: gio/gsocket.c:2004
+#: gio/gsocket.c:2106
 #, c-format
 msgid "Error closing socket: %s"
 msgstr "é??é?? socket æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: gio/gsocket.c:2481
+#: gio/gsocket.c:2609
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "ç?å?? socket æ??æ³?ï¼?%s"
 
-#: gio/gsocket.c:2720 gio/gsocket.c:2801
+#: gio/gsocket.c:2866 gio/gsocket.c:2947
 #, c-format
 msgid "Error sending message: %s"
 msgstr "å?³é??è¨?æ?¯æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: gio/gsocket.c:2745
+#: gio/gsocket.c:2891
 msgid "GSocketControlMessage not supported on windows"
 msgstr "è¦?çª?ä¸?æ?¯æ?´ GSocketControlMessage"
 
-#: gio/gsocket.c:3003 gio/gsocket.c:3141
+#: gio/gsocket.c:3149 gio/gsocket.c:3287
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "å??å??é?µä»¶ç?¼ç??é?¯èª¤ï¼?%s"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]