Updated British English translation

1 files changed, 90 insertions, 92 deletions

diff --git a/po/en_GB.po b/po/en_GB.po
index ab7b44a1..547a6ea6 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,81 +2,81 @@
 # Copyright (C) 2004 THE GCONFS'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the GCONF package.
 # Gareth Owen <gowen72@yahoo.com>, David Lodge <dave@cirt.net>, 2004
-#
+# Philip Withnall <philip@tecnocode.co.uk>, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: GCONF\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-23 19:37+0000\n"
+"POT-Creation-Date: 2009-09-12 23:45+0100\n"
 "PO-Revision-Date: 2008-03-02 23:00+0000\n"
-"Last-Translator: David Lodge <dave@cirt.net>\n"
-"Language-Team: English/GB <en@li.org>\n"
+"Last-Translator: Philip Withnall <philip@tecnocode.co.uk>\n"
+"Language-Team: British English <en@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../backends/evoldap-backend.c:159
+#: ../backends/evoldap-backend.c:162
 #, c-format
 msgid "Failed to get configuration file path from '%s'"
 msgstr "Failed to get configuration file path from '%s'"
 
-#: ../backends/evoldap-backend.c:170
+#: ../backends/evoldap-backend.c:173
 #, c-format
 msgid "Created Evolution/LDAP source using configuration file '%s'"
 msgstr "Created Evolution/LDAP source using configuration file '%s'"
 
-#: ../backends/evoldap-backend.c:444
+#: ../backends/evoldap-backend.c:447
 #, c-format
 msgid "Unable to parse XML file '%s'"
 msgstr "Unable to parse XML file '%s'"
 
-#: ../backends/evoldap-backend.c:453
+#: ../backends/evoldap-backend.c:456
 #, c-format
 msgid "Config file '%s' is empty"
 msgstr "Config file '%s' is empty"
 
-#: ../backends/evoldap-backend.c:464
+#: ../backends/evoldap-backend.c:467
 #, c-format
 msgid "Root node of '%s' must be <evoldap>, not <%s>"
 msgstr "Root node of '%s' must be <evoldap>, not <%s>"
 
-#: ../backends/evoldap-backend.c:502
+#: ../backends/evoldap-backend.c:505
 #, c-format
 msgid "No <template> specified in '%s'"
 msgstr "No <template> specified in '%s'"
 
-#: ../backends/evoldap-backend.c:509
+#: ../backends/evoldap-backend.c:512
 #, c-format
 msgid "No \"filter\" attribute specified on <template> in '%s'"
 msgstr "No \"filter\" attribute specified on <template> in '%s'"
 
-#: ../backends/evoldap-backend.c:571
+#: ../backends/evoldap-backend.c:574
 #, c-format
 msgid "No LDAP server or base DN specified in '%s'"
 msgstr "No LDAP server or base DN specified in '%s'"
 
-#: ../backends/evoldap-backend.c:577
+#: ../backends/evoldap-backend.c:580
 #, c-format
 msgid "Contacting LDAP server: host '%s', port '%d', base DN '%s'"
 msgstr "Contacting LDAP server: host '%s', port '%d', base DN '%s'"
 
-#: ../backends/evoldap-backend.c:584
+#: ../backends/evoldap-backend.c:587
 #, c-format
 msgid "Failed to contact LDAP server: %s"
 msgstr "Failed to contact LDAP server: %s"
 
-#: ../backends/evoldap-backend.c:672
+#: ../backends/evoldap-backend.c:675
 #, c-format
 msgid "Searching for entries using filter: %s"
 msgstr "Searching for entries using filter: %s"
 
-#: ../backends/evoldap-backend.c:686
+#: ../backends/evoldap-backend.c:689
 #, c-format
 msgid "Error querying LDAP server: %s"
 msgstr "Error querying LDAP server: %s"
 
-#: ../backends/evoldap-backend.c:696
+#: ../backends/evoldap-backend.c:699
 #, c-format
 msgid "Got %d entries using filter: %s"
 msgstr "Got %d entries using filter: %s"
@@ -199,151 +199,146 @@ msgstr "Failed to load file \"%s\": %s"
 msgid "Line %d character %d: %s"
 msgstr "Line %d character %d: %s"
 
-#: ../backends/markup-tree.c:2188
-#, c-format
-msgid "Attribute \"%s\" repeated twice on the same <%s> element"
-msgstr "Attribute \"%s\" repeated twice on the same <%s> element"
-
-#: ../backends/markup-tree.c:2205 ../backends/markup-tree.c:2229
+#: ../backends/markup-tree.c:2197 ../backends/markup-tree.c:2218
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "Attribute \"%s\" is invalid on <%s> element in this context"
 
-#: ../backends/markup-tree.c:2254 ../gconf/gconf-value.c:111
+#: ../backends/markup-tree.c:2243 ../gconf/gconf-value.c:111
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Didn't understand `%s' (expected integer)"
 
-#: ../backends/markup-tree.c:2261 ../gconf/gconf-value.c:121
+#: ../backends/markup-tree.c:2250 ../gconf/gconf-value.c:121
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Integer `%s' is too large or small"
 
-#: ../backends/markup-tree.c:2293 ../gconf/gconf-value.c:186
+#: ../backends/markup-tree.c:2282 ../gconf/gconf-value.c:186
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Didn't understand `%s' (expected true or false)"
 
-#: ../backends/markup-tree.c:2317 ../gconf/gconf-value.c:142
+#: ../backends/markup-tree.c:2306 ../gconf/gconf-value.c:142
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Didn't understand `%s' (expected real number)"
 
-#: ../backends/markup-tree.c:2397
+#: ../backends/markup-tree.c:2386
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 
-#: ../backends/markup-tree.c:2417 ../backends/markup-tree.c:2457
-#: ../backends/markup-tree.c:2481 ../backends/markup-tree.c:2489
-#: ../backends/markup-tree.c:2544 ../backends/markup-tree.c:2609
-#: ../backends/markup-tree.c:2721 ../backends/markup-tree.c:2789
-#: ../backends/markup-tree.c:2847 ../backends/markup-tree.c:2997
+#: ../backends/markup-tree.c:2406 ../backends/markup-tree.c:2446
+#: ../backends/markup-tree.c:2470 ../backends/markup-tree.c:2478
+#: ../backends/markup-tree.c:2533 ../backends/markup-tree.c:2598
+#: ../backends/markup-tree.c:2710 ../backends/markup-tree.c:2778
+#: ../backends/markup-tree.c:2836 ../backends/markup-tree.c:2986
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "No \"%s\" attribute on element <%s>"
 
-#: ../backends/markup-tree.c:2431
+#: ../backends/markup-tree.c:2420
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr "Invalid ltype \"%s\" on <%s>"
 
-#: ../backends/markup-tree.c:2511
+#: ../backends/markup-tree.c:2500
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr "Invalid first-element type \"%s\" on <%s>"
 
-#: ../backends/markup-tree.c:2525
+#: ../backends/markup-tree.c:2514
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr "Invalid cdr_type \"%s\" on <%s>"
 
-#: ../backends/markup-tree.c:2561
+#: ../backends/markup-tree.c:2550
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr "Invalid list_type \"%s\" on <%s>"
 
-#: ../backends/markup-tree.c:2928
+#: ../backends/markup-tree.c:2917
 msgid "Two <default> elements below a <local_schema>"
 msgstr "Two <default> elements below a <local_schema>"
 
-#: ../backends/markup-tree.c:2943
+#: ../backends/markup-tree.c:2932
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr "Two <longdesc> elements below a <local_schema>"
 
-#: ../backends/markup-tree.c:2950
+#: ../backends/markup-tree.c:2939
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "Element <%s> is not allowed below <%s>"
 
-#: ../backends/markup-tree.c:2975 ../backends/markup-tree.c:3080
-#: ../backends/markup-tree.c:3134 ../backends/markup-tree.c:3185
+#: ../backends/markup-tree.c:2964 ../backends/markup-tree.c:3069
+#: ../backends/markup-tree.c:3123 ../backends/markup-tree.c:3174
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "<%s> provided but current element does not have type %s"
 
-#: ../backends/markup-tree.c:3058
+#: ../backends/markup-tree.c:3047
 msgid "Two <car> elements given for same pair"
 msgstr "Two <car> elements given for same pair"
 
-#: ../backends/markup-tree.c:3072
+#: ../backends/markup-tree.c:3061
 msgid "Two <cdr> elements given for same pair"
 msgstr "Two <cdr> elements given for same pair"
 
-#: ../backends/markup-tree.c:3126
+#: ../backends/markup-tree.c:3115
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr "<li> has wrong type %s"
 
-#: ../backends/markup-tree.c:3157
+#: ../backends/markup-tree.c:3146
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "<%s> provided but parent <entry> does not have a value"
 
-#: ../backends/markup-tree.c:3198 ../backends/markup-tree.c:3221
-#: ../backends/markup-tree.c:3243 ../backends/markup-tree.c:3260
+#: ../backends/markup-tree.c:3187 ../backends/markup-tree.c:3210
+#: ../backends/markup-tree.c:3232 ../backends/markup-tree.c:3249
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "Element <%s> is not allowed inside current element"
 
-#: ../backends/markup-tree.c:3292
+#: ../backends/markup-tree.c:3281
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr "Outermost element in menu file must be <gconf> not <%s>"
 
-#: ../backends/markup-tree.c:3312 ../backends/markup-tree.c:3334
-#: ../backends/markup-tree.c:3339
+#: ../backends/markup-tree.c:3301 ../backends/markup-tree.c:3323
+#: ../backends/markup-tree.c:3328
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "Element <%s> is not allowed inside a <%s> element"
 
-#: ../backends/markup-tree.c:3483
+#: ../backends/markup-tree.c:3472
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "No text is allowed inside element <%s>"
 
-#: ../backends/markup-tree.c:3600 ../backends/markup-tree.c:4366
-#: ../backends/markup-tree.c:4385
+#: ../backends/markup-tree.c:3588 ../backends/markup-tree.c:4354
+#: ../backends/markup-tree.c:4373
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Failed to open \"%s\": %s\n"
 
-#: ../backends/markup-tree.c:3630
+#: ../backends/markup-tree.c:3618
 #, c-format
 msgid "Error reading \"%s\": %s\n"
 msgstr "Error reading \"%s\": %s\n"
 
-#: ../backends/markup-tree.c:4460
+#: ../backends/markup-tree.c:4448
 #, c-format
 msgid "Could not flush file '%s' to disk: %s"
 msgstr "Could not flush file '%s' to disk: %s"
 
-#: ../backends/markup-tree.c:4479
+#: ../backends/markup-tree.c:4467
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Error writing file \"%s\": %s"
 
-#: ../backends/markup-tree.c:4508
+#: ../backends/markup-tree.c:4496
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "Failed to move temporary file \"%s\" to final location \"%s\": %s"
@@ -614,17 +609,17 @@ msgstr "Couldn't locate backend module for `%s'"
 msgid "Failed to shut down backend"
 msgstr "Failed to shut down backend"
 
-#: ../gconf/gconf-client.c:345 ../gconf/gconf-client.c:363
+#: ../gconf/gconf-client.c:346 ../gconf/gconf-client.c:364
 #, c-format
 msgid "GConf Error: %s\n"
 msgstr "GConf Error: %s\n"
 
-#: ../gconf/gconf-client.c:913
+#: ../gconf/gconf-client.c:932
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "GConf warning: failure listing pairs in `%s': %s"
 
-#: ../gconf/gconf-client.c:1198
+#: ../gconf/gconf-client.c:1236
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "Expected `%s' got `%s' for key %s"
@@ -952,7 +947,7 @@ msgstr "Failed to get connection to session: %s"
 
 #: ../gconf/gconf-internals.c:2468
 #, c-format
-msgid "Could not send message to gconf daemon: %s"
+msgid "Could not send message to GConf daemon: %s"
 msgstr "Could not send message to GConf daemon: %s"
 
 #: ../gconf/gconf-internals.c:2479
@@ -970,47 +965,47 @@ msgstr "couldn't contact ORB to resolve existing gconfd object reference"
 msgid "Failed to convert IOR '%s' to an object reference"
 msgstr "Failed to convert IOR '%s' to an object reference"
 
-#: ../gconf/gconf-internals.c:2554
+#: ../gconf/gconf-internals.c:2556
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "couldn't create directory `%s': %s"
 
-#: ../gconf/gconf-internals.c:2611
+#: ../gconf/gconf-internals.c:2613
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Can't write to file `%s': %s"
 
-#: ../gconf/gconf-internals.c:2652
+#: ../gconf/gconf-internals.c:2654
 #, c-format
 msgid "We didn't have the lock on file `%s', but we should have"
 msgstr "We didn't have the lock on file `%s', but we should have"
 
-#: ../gconf/gconf-internals.c:2675
+#: ../gconf/gconf-internals.c:2677
 #, c-format
 msgid "Failed to link '%s' to '%s': %s"
 msgstr "Failed to link '%s' to '%s': %s"
 
-#: ../gconf/gconf-internals.c:2687
+#: ../gconf/gconf-internals.c:2689
 #, c-format
 msgid "Failed to remove lock file `%s': %s"
 msgstr "Failed to remove lock file `%s': %s"
 
-#: ../gconf/gconf-internals.c:2710
+#: ../gconf/gconf-internals.c:2712
 #, c-format
 msgid "Failed to clean up file '%s': %s"
 msgstr "Failed to clean up file '%s': %s"
 
-#: ../gconf/gconf-internals.c:2726
+#: ../gconf/gconf-internals.c:2728
 #, c-format
 msgid "Failed to remove lock directory `%s': %s"
 msgstr "Failed to remove lock directory `%s': %s"
 
-#: ../gconf/gconf-internals.c:2864
+#: ../gconf/gconf-internals.c:2866
 #, c-format
 msgid "Server ping error: %s"
 msgstr "Server ping error: %s"
 
-#: ../gconf/gconf-internals.c:2883
+#: ../gconf/gconf-internals.c:2885
 #, c-format
 msgid ""
 "Failed to contact configuration server; some possible causes are that you "
@@ -1021,9 +1016,9 @@ msgstr ""
 "Failed to contact configuration server; some possible causes are that you "
 "need to enable TCP/IP networking for ORBit, or you have stale NFS locks due "
 "to a system crash. See http://projects.gnome.org/gconf/ for information. "
-"(Details - %s)"
+"(Details — %s)"
 
-#: ../gconf/gconf-internals.c:2884
+#: ../gconf/gconf-internals.c:2886
 msgid "none"
 msgstr "none"
 
@@ -1243,7 +1238,7 @@ msgstr ""
 "logging out, killing all copies of gconfd, and logging back in may help. If "
 "you have stale locks, remove ~/.gconf*/*lock. Perhaps the problem is that "
 "you attempted to use GConf from two machines at once, and ORBit still has "
-"its default configuration that prevents remote CORBA connections - put "
+"its default configuration that prevents remote CORBA connections — put "
 "\"ORBIIOPIPv4=1\" in /etc/orbitrc. As always, check the user.* syslog for "
 "details on problems gconfd encountered. There can only be one gconfd per "
 "home directory, and it must own a lockfile in ~/.gconfd and also lockfiles "
@@ -1313,77 +1308,77 @@ msgstr "Key is NULL"
 msgid "\"%s\": %s"
 msgstr "\"%s\": %s"
 
-#: ../gconf/gconf.c:423
+#: ../gconf/gconf.c:418
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Server couldn't resolve the address `%s'"
 
-#: ../gconf/gconf.c:801
+#: ../gconf/gconf.c:808
 msgid "Can't add notifications to a local configuration source"
 msgstr "Can't add notifications to a local configuration source"
 
-#: ../gconf/gconf.c:2251
+#: ../gconf/gconf.c:2258
 #, c-format
 msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr "Adding client to server's list failed, CORBA error: %s"
 
-#: ../gconf/gconf.c:2623
+#: ../gconf/gconf.c:2630
 msgid "Must begin with a slash '/'"
 msgstr "Must begin with a slash '/'"
 
-#: ../gconf/gconf.c:2645
+#: ../gconf/gconf.c:2652
 msgid "Can't have two slashes '/' in a row"
 msgstr "Can't have two slashes '/' in a row"
 
-#: ../gconf/gconf.c:2647
+#: ../gconf/gconf.c:2654
 msgid "Can't have a period '.' right after a slash '/'"
 msgstr "Can't have a period '.' right after a slash '/'"
 
-#: ../gconf/gconf.c:2667
+#: ../gconf/gconf.c:2674
 #, c-format
 msgid "'\\%o' is not an ASCII character and thus isn't allowed in key names"
 msgstr "'\\%o' is not an ASCII character and thus isn't allowed in key names"
 
-#: ../gconf/gconf.c:2677
+#: ../gconf/gconf.c:2684
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "`%c' is an invalid character in key/directory names"
 
-#: ../gconf/gconf.c:2691
+#: ../gconf/gconf.c:2698
 msgid "Key/directory may not end with a slash '/'"
 msgstr "Key/directory may not end with a slash '/'"
 
-#: ../gconf/gconf.c:3062
+#: ../gconf/gconf.c:3069
 #, c-format
 msgid "Failure shutting down configuration server: %s"
 msgstr "Failure shutting down configuration server: %s"
 
-#: ../gconf/gconf.c:3123
+#: ../gconf/gconf.c:3130
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Expected float, got %s"
 
-#: ../gconf/gconf.c:3158
+#: ../gconf/gconf.c:3165
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Expected int, got %s"
 
-#: ../gconf/gconf.c:3193
+#: ../gconf/gconf.c:3200
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Expected string, got %s"
 
-#: ../gconf/gconf.c:3227
+#: ../gconf/gconf.c:3234
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Expected bool, got %s"
 
-#: ../gconf/gconf.c:3260
+#: ../gconf/gconf.c:3267
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Expected schema, got %s"
 
-#: ../gconf/gconf.c:3599
+#: ../gconf/gconf.c:3606
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA error: %s"
@@ -1873,7 +1868,7 @@ msgstr "Print version"
 
 #: ../gconf/gconftool.c:523
 msgid "[FILE...]|[KEY...]|[DIR...]"
-msgstr "[FILE...]|[KEY...]|[DIR...]"
+msgstr "[FILE…]|[KEY…]|[DIR…]"
 
 #: ../gconf/gconftool.c:585
 msgid "- Tool to manipulate a GConf configuration"
@@ -2381,7 +2376,7 @@ msgstr "WARNING: must specify both a <car> and a <cdr> in a <pair>\n"
 #: ../gconf/gconftool.c:2964
 #, c-format
 msgid "WARNING: key specified (%s) for schema under a <value> - ignoring\n"
-msgstr "WARNING: key specified (%s) for schema under a <value> - ignoring\n"
+msgstr "WARNING: key specified (%s) for schema under a <value> — ignoring\n"
 
 #: ../gconf/gconftool.c:2997
 #, c-format
@@ -2635,6 +2630,9 @@ msgstr ""
 "directory:\n"
 "  %s\n"
 
+#~ msgid "Attribute \"%s\" repeated twice on the same <%s> element"
+#~ msgstr "Attribute \"%s\" repeated twice on the same <%s> element"
+
 #~ msgid "IOR file '%s' not opened successfully, no gconfd located: %s"
 #~ msgstr "IOR file '%s' not opened successfully, no gconfd located: %s"