diff --git a/po/he.po b/po/he.po
index 9c6c3c4df..2f90f5ccf 100644
--- a/po/he.po
+++ b/po/he.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib.HEAD.he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-10 11:01+0200\n"
-"PO-Revision-Date: 2011-12-10 11:02+0200\n"
+"POT-Creation-Date: 2011-12-30 10:47+0200\n"
+"PO-Revision-Date: 2011-12-30 10:47+0200\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
 "Language-Team: Gezer (Hebrew)\n"
 "Language: he\n"
@@ -984,9 +984,9 @@ msgstr "Expected a GEmblem for GEmblemedIcon"
 #: ../gio/gfile.c:5048
 #: ../gio/gfile.c:5315
 #: ../gio/gfile.c:5380
-#: ../gio/gfile.c:7006
-#: ../gio/gfile.c:7096
-#: ../gio/gfile.c:7182
+#: ../gio/gfile.c:7008
+#: ../gio/gfile.c:7098
+#: ../gio/gfile.c:7184
 #: ../gio/win32/gwinhttpfile.c:439
 msgid "Operation not supported"
 msgstr "Operation not supported"
@@ -1050,12 +1050,12 @@ msgstr "Trash not supported"
 msgid "File names cannot contain '%c'"
 msgstr "File names cannot contain '%c'"
 
-#: ../gio/gfile.c:6065
+#: ../gio/gfile.c:6067
 #: ../gio/gvolume.c:332
 msgid "volume doesn't implement mount"
 msgstr "volume doesn't implement mount"
 
-#: ../gio/gfile.c:6176
+#: ../gio/gfile.c:6178
 msgid "No application is registered as handling this file"
 msgstr "No application is registered as handling this file"
 
@@ -1313,19 +1313,19 @@ msgid "<%s id='%s'> already specified"
 msgstr "<%s id='%s'> already specified"
 
 #: ../gio/glib-compile-schemas.c:1416
-#: ../gio/gmenumarkup.c:291
+#: ../gio/gmenumarkup.c:299
 #, c-format
 msgid "Element <%s> not allowed inside <%s>"
 msgstr "Element <%s> not allowed inside <%s>"
 
 #: ../gio/glib-compile-schemas.c:1420
-#: ../gio/gmenumarkup.c:296
+#: ../gio/gmenumarkup.c:304
 #, c-format
 msgid "Element <%s> not allowed at toplevel"
 msgstr "Element <%s> not allowed at toplevel"
 
 #: ../gio/glib-compile-schemas.c:1511
-#: ../gio/gmenumarkup.c:375
+#: ../gio/gmenumarkup.c:383
 #, c-format
 msgid "text may not appear inside <%s>"
 msgstr "text may not appear inside <%s>"
@@ -1847,18 +1847,18 @@ msgstr "Network unreachable"
 msgid "Host unreachable"
 msgstr "Host unreachable"
 
-#: ../gio/gnetworkmonitornetlink.c:94
-#: ../gio/gnetworkmonitornetlink.c:106
-#: ../gio/gnetworkmonitornetlink.c:117
+#: ../gio/gnetworkmonitornetlink.c:97
+#: ../gio/gnetworkmonitornetlink.c:109
+#: ../gio/gnetworkmonitornetlink.c:120
 #, c-format
 msgid "Could not create network monitor: %s"
 msgstr "Could not create network monitor: %s"
 
-#: ../gio/gnetworkmonitornetlink.c:126
+#: ../gio/gnetworkmonitornetlink.c:129
 msgid "Could not create network monitor: "
 msgstr "Could not create network monitor: "
 
-#: ../gio/gnetworkmonitornetlink.c:174
+#: ../gio/gnetworkmonitornetlink.c:177
 msgid "Could not get network status: "
 msgstr "Could not get network status: "
 
@@ -1900,79 +1900,79 @@ msgstr "Temporarily unable to resolve '%s'"
 msgid "Error resolving '%s'"
 msgstr "Error resolving '%s'"
 
-#: ../gio/gsettings-tool.c:60
-#, c-format
-msgid "Schema '%s' is not relocatable (path must not be specified)\n"
-msgstr "Schema '%s' is not relocatable (path must not be specified)\n"
-
-#: ../gio/gsettings-tool.c:65
-#: ../gio/gsettings-tool.c:82
+#: ../gio/gsettings-tool.c:53
+#: ../gio/gsettings-tool.c:74
 #, c-format
 msgid "No such schema '%s'\n"
 msgstr "No such schema '%s'\n"
 
-#: ../gio/gsettings-tool.c:77
+#: ../gio/gsettings-tool.c:59
+#, c-format
+msgid "Schema '%s' is not relocatable (path must not be specified)\n"
+msgstr "Schema '%s' is not relocatable (path must not be specified)\n"
+
+#: ../gio/gsettings-tool.c:80
 #, c-format
 msgid "Schema '%s' is relocatable (path must be specified)\n"
 msgstr "Schema '%s' is relocatable (path must be specified)\n"
 
-#: ../gio/gsettings-tool.c:92
+#: ../gio/gsettings-tool.c:94
 #, c-format
 msgid "Empty path given.\n"
 msgstr "Empty path given.\n"
 
-#: ../gio/gsettings-tool.c:98
+#: ../gio/gsettings-tool.c:100
 #, c-format
 msgid "Path must begin with a slash (/)\n"
 msgstr "Path must begin with a slash (/)\n"
 
-#: ../gio/gsettings-tool.c:104
+#: ../gio/gsettings-tool.c:106
 #, c-format
 msgid "Path must end with a slash (/)\n"
 msgstr "Path must end with a slash (/)\n"
 
-#: ../gio/gsettings-tool.c:110
+#: ../gio/gsettings-tool.c:112
 #, c-format
 msgid "Path must not contain two adjacent slashes (//)\n"
 msgstr "Path must not contain two adjacent slashes (//)\n"
 
-#: ../gio/gsettings-tool.c:131
+#: ../gio/gsettings-tool.c:133
 #, c-format
 msgid "No such key '%s'\n"
 msgstr "No such key '%s'\n"
 
-#: ../gio/gsettings-tool.c:504
+#: ../gio/gsettings-tool.c:500
 #, c-format
 msgid "The provided value is outside of the valid range\n"
 msgstr "The provided value is outside of the valid range\n"
 
-#: ../gio/gsettings-tool.c:533
+#: ../gio/gsettings-tool.c:529
 msgid "Print help"
 msgstr "Print help"
 
-#: ../gio/gsettings-tool.c:539
+#: ../gio/gsettings-tool.c:535
 msgid "List the installed (non-relocatable) schemas"
 msgstr "List the installed (non-relocatable) schemas"
 
-#: ../gio/gsettings-tool.c:545
+#: ../gio/gsettings-tool.c:541
 msgid "List the installed relocatable schemas"
 msgstr "List the installed relocatable schemas"
 
-#: ../gio/gsettings-tool.c:551
+#: ../gio/gsettings-tool.c:547
 msgid "List the keys in SCHEMA"
 msgstr "List the keys in SCHEMA"
 
-#: ../gio/gsettings-tool.c:552
-#: ../gio/gsettings-tool.c:558
-#: ../gio/gsettings-tool.c:595
+#: ../gio/gsettings-tool.c:548
+#: ../gio/gsettings-tool.c:554
+#: ../gio/gsettings-tool.c:591
 msgid "SCHEMA[:PATH]"
 msgstr "SCHEMA[:PATH]"
 
-#: ../gio/gsettings-tool.c:557
+#: ../gio/gsettings-tool.c:553
 msgid "List the children of SCHEMA"
 msgstr "List the children of SCHEMA"
 
-#: ../gio/gsettings-tool.c:563
+#: ../gio/gsettings-tool.c:559
 msgid ""
 "List keys and values, recursively\n"
 "If no SCHEMA is given, list all keys\n"
@@ -1980,46 +1980,46 @@ msgstr ""
 "List keys and values, recursively\n"
 "If no SCHEMA is given, list all keys\n"
 
-#: ../gio/gsettings-tool.c:565
+#: ../gio/gsettings-tool.c:561
 msgid "[SCHEMA[:PATH]]"
 msgstr "[SCHEMA[:PATH]]"
 
-#: ../gio/gsettings-tool.c:570
+#: ../gio/gsettings-tool.c:566
 msgid "Get the value of KEY"
 msgstr "Get the value of KEY"
 
-#: ../gio/gsettings-tool.c:571
-#: ../gio/gsettings-tool.c:577
-#: ../gio/gsettings-tool.c:589
-#: ../gio/gsettings-tool.c:601
+#: ../gio/gsettings-tool.c:567
+#: ../gio/gsettings-tool.c:573
+#: ../gio/gsettings-tool.c:585
+#: ../gio/gsettings-tool.c:597
 msgid "SCHEMA[:PATH] KEY"
 msgstr "SCHEMA[:PATH] KEY"
 
-#: ../gio/gsettings-tool.c:576
+#: ../gio/gsettings-tool.c:572
 msgid "Query the range of valid values for KEY"
 msgstr "Query the range of valid values for KEY"
 
-#: ../gio/gsettings-tool.c:582
+#: ../gio/gsettings-tool.c:578
 msgid "Set the value of KEY to VALUE"
 msgstr "Set the value of KEY to VALUE"
 
-#: ../gio/gsettings-tool.c:583
+#: ../gio/gsettings-tool.c:579
 msgid "SCHEMA[:PATH] KEY VALUE"
 msgstr "SCHEMA[:PATH] KEY VALUE"
 
-#: ../gio/gsettings-tool.c:588
+#: ../gio/gsettings-tool.c:584
 msgid "Reset KEY to its default value"
 msgstr "Reset KEY to its default value"
 
-#: ../gio/gsettings-tool.c:594
+#: ../gio/gsettings-tool.c:590
 msgid "Reset all keys in SCHEMA to their defaults"
 msgstr "Reset all keys in SCHEMA to their defaults"
 
-#: ../gio/gsettings-tool.c:600
+#: ../gio/gsettings-tool.c:596
 msgid "Check if KEY is writable"
 msgstr "Check if KEY is writable"
 
-#: ../gio/gsettings-tool.c:606
+#: ../gio/gsettings-tool.c:602
 msgid ""
 "Monitor KEY for changes.\n"
 "If no KEY is specified, monitor all keys in SCHEMA.\n"
@@ -2029,11 +2029,11 @@ msgstr ""
 "If no KEY is specified, monitor all keys in SCHEMA.\n"
 "Use ^C to stop monitoring.\n"
 
-#: ../gio/gsettings-tool.c:609
+#: ../gio/gsettings-tool.c:605
 msgid "SCHEMA[:PATH] [KEY]"
 msgstr "SCHEMA[:PATH] [KEY]"
 
-#: ../gio/gsettings-tool.c:613
+#: ../gio/gsettings-tool.c:609
 #, c-format
 msgid ""
 "Unknown command %s\n"
@@ -2042,10 +2042,10 @@ msgstr ""
 "Unknown command %s\n"
 "\n"
 
-#: ../gio/gsettings-tool.c:621
+#: ../gio/gsettings-tool.c:617
 msgid ""
 "Usage:\n"
-"  gsettings COMMAND [ARGS...]\n"
+"  gsettings [--schemadir SCHEMADIR] COMMAND [ARGS...]\n"
 "\n"
 "Commands:\n"
 "  help                      Show this information\n"
@@ -2066,7 +2066,7 @@ msgid ""
 "\n"
 msgstr ""
 "Usage:\n"
-"  gsettings COMMAND [ARGS...]\n"
+"  gsettings [--schemadir SCHEMADIR] COMMAND [ARGS...]\n"
 "\n"
 "Commands:\n"
 "  help                      Show this information\n"
@@ -2086,30 +2086,34 @@ msgstr ""
 "Use 'gsettings help COMMAND' to get detailed help.\n"
 "\n"
 
-#: ../gio/gsettings-tool.c:643
+#: ../gio/gsettings-tool.c:639
 #, c-format
 msgid ""
 "Usage:\n"
-"  gsettings %s %s\n"
+"  gsettings [--schemadir SCHEMADIR] %s %s\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 "Usage:\n"
-"  gsettings %s %s\n"
+"  gsettings [--schemadir SCHEMADIR] %s %s\n"
 "\n"
 "%s\n"
 "\n"
 
-#: ../gio/gsettings-tool.c:648
+#: ../gio/gsettings-tool.c:642
 msgid "Arguments:\n"
 msgstr "Arguments:\n"
 
-#: ../gio/gsettings-tool.c:652
+#: ../gio/gsettings-tool.c:645
+msgid "  SCHEMADIR A directory to search for additional schemas\n"
+msgstr "  SCHEMADIR A directory to search for additional schemas\n"
+
+#: ../gio/gsettings-tool.c:649
 msgid "  COMMAND   The (optional) command to explain\n"
 msgstr "  COMMAND   The (optional) command to explain\n"
 
-#: ../gio/gsettings-tool.c:656
+#: ../gio/gsettings-tool.c:653
 msgid ""
 "  SCHEMA    The name of the schema\n"
 "  PATH      The path, for relocatable schemas\n"
@@ -2117,19 +2121,19 @@ msgstr ""
 "  SCHEMA    The name of the schema\n"
 "  PATH      The path, for relocatable schemas\n"
 
-#: ../gio/gsettings-tool.c:661
+#: ../gio/gsettings-tool.c:658
 msgid "  KEY       The (optional) key within the schema\n"
 msgstr "  KEY       The (optional) key within the schema\n"
 
-#: ../gio/gsettings-tool.c:665
+#: ../gio/gsettings-tool.c:662
 msgid "  KEY       The key within the schema\n"
 msgstr "  KEY       The key within the schema\n"
 
-#: ../gio/gsettings-tool.c:669
+#: ../gio/gsettings-tool.c:666
 msgid "  VALUE     The value to set\n"
 msgstr "  VALUE     The value to set\n"
 
-#: ../gio/gsettings-tool.c:766
+#: ../gio/gsettings-tool.c:787
 #, c-format
 msgid "Empty schema name given\n"
 msgstr "Empty schema name given\n"
@@ -2248,32 +2252,32 @@ msgstr "Error receiving message: %s"
 msgid "g_socket_get_credentials not implemented for this OS"
 msgstr "g_socket_get_credentials not implemented for this OS"
 
-#: ../gio/gsocketclient.c:163
+#: ../gio/gsocketclient.c:171
 #, c-format
 msgid "Could not connect to proxy server %s: "
 msgstr "Could not connect to proxy server %s: "
 
-#: ../gio/gsocketclient.c:177
+#: ../gio/gsocketclient.c:185
 #, c-format
 msgid "Could not connect to %s: "
 msgstr "Could not connect to %s: "
 
-#: ../gio/gsocketclient.c:179
+#: ../gio/gsocketclient.c:187
 msgid "Could not connect: "
 msgstr "Could not connect: "
 
-#: ../gio/gsocketclient.c:834
-#: ../gio/gsocketclient.c:1399
+#: ../gio/gsocketclient.c:973
+#: ../gio/gsocketclient.c:1544
 msgid "Unknown error on connect"
 msgstr "Unknown error on connect"
 
-#: ../gio/gsocketclient.c:874
-#: ../gio/gsocketclient.c:1291
+#: ../gio/gsocketclient.c:1026
+#: ../gio/gsocketclient.c:1483
 msgid "Trying to proxy over non-TCP connection is not supported."
 msgstr "Trying to proxy over non-TCP connection is not supported."
 
-#: ../gio/gsocketclient.c:896
-#: ../gio/gsocketclient.c:1311
+#: ../gio/gsocketclient.c:1052
+#: ../gio/gsocketclient.c:1504
 #, c-format
 msgid "Proxy protocol '%s' is not supported."
 msgstr "Proxy protocol '%s' is not supported."
@@ -3079,13 +3083,13 @@ msgstr "Key file contains unsupported encoding '%s'"
 
 #: ../glib/gkeyfile.c:1548
 #: ../glib/gkeyfile.c:1710
-#: ../glib/gkeyfile.c:3087
-#: ../glib/gkeyfile.c:3153
-#: ../glib/gkeyfile.c:3288
-#: ../glib/gkeyfile.c:3421
-#: ../glib/gkeyfile.c:3563
-#: ../glib/gkeyfile.c:3795
-#: ../glib/gkeyfile.c:3864
+#: ../glib/gkeyfile.c:3088
+#: ../glib/gkeyfile.c:3154
+#: ../glib/gkeyfile.c:3289
+#: ../glib/gkeyfile.c:3422
+#: ../glib/gkeyfile.c:3564
+#: ../glib/gkeyfile.c:3802
+#: ../glib/gkeyfile.c:3871
 #, c-format
 msgid "Key file does not have group '%s'"
 msgstr "Key file does not have group '%s'"
@@ -3103,55 +3107,55 @@ msgstr "Key file contains key '%s' with value '%s' which is not UTF-8"
 
 #: ../glib/gkeyfile.c:1849
 #: ../glib/gkeyfile.c:1965
-#: ../glib/gkeyfile.c:2333
+#: ../glib/gkeyfile.c:2334
 #, c-format
 msgid "Key file contains key '%s' which has a value that cannot be interpreted."
 msgstr "Key file contains key '%s' which has a value that cannot be interpreted."
 
-#: ../glib/gkeyfile.c:2550
-#: ../glib/gkeyfile.c:2916
+#: ../glib/gkeyfile.c:2551
+#: ../glib/gkeyfile.c:2917
 #, c-format
 msgid "Key file contains key '%s' in group '%s' which has a value that cannot be interpreted."
 msgstr "Key file contains key '%s' in group '%s' which has a value that cannot be interpreted."
 
-#: ../glib/gkeyfile.c:2628
-#: ../glib/gkeyfile.c:2704
+#: ../glib/gkeyfile.c:2629
+#: ../glib/gkeyfile.c:2705
 #, c-format
 msgid "Key '%s' in group '%s' has value '%s' where %s was expected"
 msgstr "Key '%s' in group '%s' has value '%s' where %s was expected"
 
-#: ../glib/gkeyfile.c:3102
-#: ../glib/gkeyfile.c:3303
-#: ../glib/gkeyfile.c:3875
+#: ../glib/gkeyfile.c:3103
+#: ../glib/gkeyfile.c:3304
+#: ../glib/gkeyfile.c:3882
 #, c-format
 msgid "Key file does not have key '%s' in group '%s'"
 msgstr "Key file does not have key '%s' in group '%s'"
 
-#: ../glib/gkeyfile.c:4109
+#: ../glib/gkeyfile.c:4116
 msgid "Key file contains escape character at end of line"
 msgstr "Key file contains escape character at end of line"
 
-#: ../glib/gkeyfile.c:4131
+#: ../glib/gkeyfile.c:4138
 #, c-format
 msgid "Key file contains invalid escape sequence '%s'"
 msgstr "Key file contains invalid escape sequence '%s'"
 
-#: ../glib/gkeyfile.c:4273
+#: ../glib/gkeyfile.c:4280
 #, c-format
 msgid "Value '%s' cannot be interpreted as a number."
 msgstr "Value '%s' cannot be interpreted as a number."
 
-#: ../glib/gkeyfile.c:4287
+#: ../glib/gkeyfile.c:4294
 #, c-format
 msgid "Integer value '%s' out of range"
 msgstr "Integer value '%s' out of range"
 
-#: ../glib/gkeyfile.c:4320
+#: ../glib/gkeyfile.c:4327
 #, c-format
 msgid "Value '%s' cannot be interpreted as a float number."
 msgstr "Value '%s' cannot be interpreted as a float number."
 
-#: ../glib/gkeyfile.c:4344
+#: ../glib/gkeyfile.c:4351
 #, c-format
 msgid "Value '%s' cannot be interpreted as a boolean."
 msgstr "Value '%s' cannot be interpreted as a boolean."
@@ -3835,89 +3839,89 @@ msgstr "Invalid sequence in conversion input"
 msgid "Character out of range for UTF-16"
 msgstr "Character out of range for UTF-16"
 
-#: ../glib/gutils.c:2167
-#: ../glib/gutils.c:2194
-#: ../glib/gutils.c:2298
+#: ../glib/gutils.c:2166
+#: ../glib/gutils.c:2193
+#: ../glib/gutils.c:2297
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
 msgstr[0] "בית אחד"
 msgstr[1] "%u בתים"
 
-#: ../glib/gutils.c:2173
+#: ../glib/gutils.c:2172
 #, c-format
 msgid "%.1f KiB"
 msgstr "%.1f KiB"
 
-#: ../glib/gutils.c:2175
+#: ../glib/gutils.c:2174
 #, c-format
 msgid "%.1f MiB"
 msgstr "%.1f MiB"
 
-#: ../glib/gutils.c:2178
+#: ../glib/gutils.c:2177
 #, c-format
 msgid "%.1f GiB"
 msgstr "%.1f GiB"
 
-#: ../glib/gutils.c:2181
+#: ../glib/gutils.c:2180
 #, c-format
 msgid "%.1f TiB"
 msgstr "%.1f TiB"
 
-#: ../glib/gutils.c:2184
+#: ../glib/gutils.c:2183
 #, c-format
 msgid "%.1f PiB"
 msgstr "%.1f PiB"
 
-#: ../glib/gutils.c:2187
+#: ../glib/gutils.c:2186
 #, c-format
 msgid "%.1f EiB"
 msgstr "%.1f EiB"
 
-#: ../glib/gutils.c:2200
+#: ../glib/gutils.c:2199
 #, c-format
 msgid "%.1f kB"
 msgstr "%.1f ק״ב"
 
-#: ../glib/gutils.c:2203
-#: ../glib/gutils.c:2311
+#: ../glib/gutils.c:2202
+#: ../glib/gutils.c:2310
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f מ״ב"
 
-#: ../glib/gutils.c:2206
-#: ../glib/gutils.c:2316
+#: ../glib/gutils.c:2205
+#: ../glib/gutils.c:2315
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f ג״ב"
 
-#: ../glib/gutils.c:2208
-#: ../glib/gutils.c:2321
+#: ../glib/gutils.c:2207
+#: ../glib/gutils.c:2320
 #, c-format
 msgid "%.1f TB"
 msgstr "%.1f ט״ב"
 
-#: ../glib/gutils.c:2211
-#: ../glib/gutils.c:2326
+#: ../glib/gutils.c:2210
+#: ../glib/gutils.c:2325
 #, c-format
 msgid "%.1f PB"
 msgstr "%.1f פ״ב"
 
-#: ../glib/gutils.c:2214
-#: ../glib/gutils.c:2331
+#: ../glib/gutils.c:2213
+#: ../glib/gutils.c:2330
 #, c-format
 msgid "%.1f EB"
 msgstr "%.1f א״ב"
 
 #. Translators: the %s in "%s bytes" will always be replaced by a number.
-#: ../glib/gutils.c:2251
+#: ../glib/gutils.c:2250
 #, c-format
 msgid "%s byte"
 msgid_plural "%s bytes"
 msgstr[0] "בית אחד"
 msgstr[1] "%s בתים"
 
-#: ../glib/gutils.c:2306
+#: ../glib/gutils.c:2305
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1f ק״ב"