[vino] Update British English translation

[David King <davidk src gnome org>]

commit f6f8b796d3cf63c3fb6844e82d6e775429d8e257
Author: David King <amigadave amigadave com>
Date:   Sun Sep 4 15:24:14 2016 +0200

    Update British English translation

 po/en_GB.po |  609 ++++++++++++++++++++++++++++------------------------------
 1 files changed, 294 insertions(+), 315 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 82d51df..cfa9035 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,11 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vino\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=vino&k";
-"eywords=I18N+L10N&component=Preferences Dialog\n"
-"POT-Creation-Date: 2012-09-04 22:45+0000\n"
-"PO-Revision-Date: 2012-09-05 13:07+0100\n"
-"Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=vino&keywords=I18N+L10N&component=Preferences Dialog\n"
+"POT-Creation-Date: 2016-08-19 16:23+0000\n"
+"PO-Revision-Date: 2016-09-04 15:18+0200\n"
+"Last-Translator: David King <amigadave amigadave com>\n"
 "Language-Team: British English <en li org>\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
@@ -21,71 +21,11 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
-#: ../capplet/vino-message-box.c:55
-#, c-format
-msgid "There was an error showing the URL \"%s\""
-msgstr "There was an error showing the URL \"%s\""
-
-#: ../capplet/vino-preferences.c:245
-#, c-format
-msgid ""
-"There was an error displaying help:\n"
-"%s"
-msgstr ""
-"There was an error displaying help:\n"
-"%s"
-
-#: ../capplet/vino-preferences.c:278
-msgid "Checking the connectivity of this machine..."
-msgstr "Checking the connectivity of this machine…"
-
-#: ../capplet/vino-preferences.c:298
-msgid "Your desktop is only reachable over the local network."
-msgstr "Your desktop is only reachable over the local network."
-
-#: ../capplet/vino-preferences.c:311
-msgid " or "
-msgstr " or "
-
-#: ../capplet/vino-preferences.c:315
-#, c-format
-msgid "Others can access your computer using the address %s."
-msgstr "Others can access your computer using the address %s."
-
-#: ../capplet/vino-preferences.c:324
-msgid "Nobody can access your desktop."
-msgstr "Nobody can access your desktop."
-
-#: ../capplet/vino-preferences.desktop.in.in.h:1
-#: ../server/vino-server.desktop.in.in.h:1
-msgid "Desktop Sharing"
-msgstr "Desktop Sharing"
-
-#: ../capplet/vino-preferences.desktop.in.in.h:2
-msgid "Choose how other users can remotely view your desktop"
-msgstr "Choose how other users can remotely view your desktop"
-
-#: ../common/vino-keyring.c:54 ../tools/vino-passwd.c:54
-msgid "Remote desktop sharing password"
-msgstr "Remote desktop sharing password"
-
 #: ../common/org.gnome.Vino.gschema.xml.h:1
-msgid "Enable remote access to the desktop"
-msgstr "Enable remote access to the desktop"
-
-#: ../common/org.gnome.Vino.gschema.xml.h:2
-msgid ""
-"If true, allows remote access to the desktop via the RFB protocol. Users on "
-"remote machines may then connect to the desktop using a VNC viewer."
-msgstr ""
-"If true, allows remote access to the desktop via the RFB protocol. Users on "
-"remote machines may then connect to the desktop using a VNC viewer."
-
-#: ../common/org.gnome.Vino.gschema.xml.h:3
 msgid "Prompt the user before completing a connection"
 msgstr "Prompt the user before completing a connection"
 
-#: ../common/org.gnome.Vino.gschema.xml.h:4
+#: ../common/org.gnome.Vino.gschema.xml.h:2
 msgid ""
 "If true, remote users accessing the desktop are not allowed access until the "
 "user on the host machine approves the connection. Recommended especially "
@@ -95,11 +35,11 @@ msgstr ""
 "user on the host machine approves the connection. Recommended especially "
 "when access is not password protected."
 
-#: ../common/org.gnome.Vino.gschema.xml.h:5
+#: ../common/org.gnome.Vino.gschema.xml.h:3
 msgid "Only allow remote users to view the desktop"
 msgstr "Only allow remote users to view the desktop"
 
-#: ../common/org.gnome.Vino.gschema.xml.h:6
+#: ../common/org.gnome.Vino.gschema.xml.h:4
 msgid ""
 "If true, remote users accessing the desktop are only allowed to view the "
 "desktop. Remote users will not be able to use the mouse or keyboard."
@@ -107,51 +47,51 @@ msgstr ""
 "If true, remote users accessing the desktop are only allowed to view the "
 "desktop. Remote users will not be able to use the mouse or keyboard."
 
-#: ../common/org.gnome.Vino.gschema.xml.h:7
+#: ../common/org.gnome.Vino.gschema.xml.h:5
 msgid "Network interface for listening"
 msgstr "Network interface for listening"
 
-#: ../common/org.gnome.Vino.gschema.xml.h:8
+#: ../common/org.gnome.Vino.gschema.xml.h:6
 msgid ""
 "If not set, the server will listen on all network interfaces.\n"
 "\n"
-"Set this if you want that accept connections only from some specific network "
-"interface. eg: eth0, wifi0, lo, ..."
+"Set this if you want to accept connections only from some specific network "
+"interface. For example, eth0, wifi0, lo and so on."
 msgstr ""
 "If not set, the server will listen on all network interfaces.\n"
 "\n"
-"Set this if you want that accept connections only from some specific network "
-"interface. e.g.: eth0, wifi0, lo, …"
+"Set this if you want to accept connections only from some specific network "
+"interface. e.g.: eth0, wifi0, lo and so on"
 
-#: ../common/org.gnome.Vino.gschema.xml.h:11
+#: ../common/org.gnome.Vino.gschema.xml.h:9
 msgid "Listen on an alternative port"
 msgstr "Listen on an alternative port"
 
-#: ../common/org.gnome.Vino.gschema.xml.h:12
+#: ../common/org.gnome.Vino.gschema.xml.h:10
 msgid ""
-"If true, the server will listen to another port, instead of the default "
+"If true, the server will listen on another port, instead of the default "
 "(5900). The port must be specified in the 'alternative-port' key."
 msgstr ""
-"If true, the server will listen to another port, instead of the default "
+"If true, the server will listen on another port, instead of the default "
 "(5900). The port must be specified in the 'alternative-port' key."
 
-#: ../common/org.gnome.Vino.gschema.xml.h:13
+#: ../common/org.gnome.Vino.gschema.xml.h:11
 msgid "Alternative port number"
 msgstr "Alternative port number"
 
-#: ../common/org.gnome.Vino.gschema.xml.h:14
+#: ../common/org.gnome.Vino.gschema.xml.h:12
 msgid ""
 "The port which the server will listen to if the 'use-alternative-port' key "
-"is set to true. Valid values are in the range from 5000 to 50000."
+"is set to true. Valid values are in the range of 5000 to 50000."
 msgstr ""
 "The port which the server will listen to if the 'use-alternative-port' key "
-"is set to true. Valid values are in the range from 5000 to 50000."
+"is set to true. Valid values are in the range of 5000 to 50000."
 
-#: ../common/org.gnome.Vino.gschema.xml.h:15
+#: ../common/org.gnome.Vino.gschema.xml.h:13
 msgid "Require encryption"
 msgstr "Require encryption"
 
-#: ../common/org.gnome.Vino.gschema.xml.h:16
+#: ../common/org.gnome.Vino.gschema.xml.h:14
 msgid ""
 "If true, remote users accessing the desktop are required to support "
 "encryption. It is highly recommended that you use a client which supports "
@@ -161,11 +101,11 @@ msgstr ""
 "encryption. It is highly recommended that you use a client which supports "
 "encryption unless the intervening network is trusted."
 
-#: ../common/org.gnome.Vino.gschema.xml.h:17
+#: ../common/org.gnome.Vino.gschema.xml.h:15
 msgid "Allowed authentication methods"
 msgstr "Allowed authentication methods"
 
-#: ../common/org.gnome.Vino.gschema.xml.h:18
+#: ../common/org.gnome.Vino.gschema.xml.h:16
 msgid ""
 "Lists the authentication methods with which remote users may access the "
 "desktop.\n"
@@ -183,11 +123,11 @@ msgstr ""
 "password key) before connecting and \"none\" which allows any remote user to "
 "connect."
 
-#: ../common/org.gnome.Vino.gschema.xml.h:21
+#: ../common/org.gnome.Vino.gschema.xml.h:19
 msgid "Password required for \"vnc\" authentication"
 msgstr "Password required for \"vnc\" authentication"
 
-#: ../common/org.gnome.Vino.gschema.xml.h:22
+#: ../common/org.gnome.Vino.gschema.xml.h:20
 msgid ""
 "The password which the remote user will be prompted for if the \"vnc\" "
 "authentication method is used. The password specified by the key is base64 "
@@ -203,11 +143,11 @@ msgstr ""
 "The special value of 'keyring' (which is not valid base64) means that the "
 "password is stored in the GNOME keyring."
 
-#: ../common/org.gnome.Vino.gschema.xml.h:25
+#: ../common/org.gnome.Vino.gschema.xml.h:23
 msgid "E-mail address to which the remote desktop URL should be sent"
 msgstr "E-mail address to which the remote desktop URL should be sent"
 
-#: ../common/org.gnome.Vino.gschema.xml.h:26
+#: ../common/org.gnome.Vino.gschema.xml.h:24
 msgid ""
 "This key specifies the e-mail address to which the remote desktop URL should "
 "be sent if the user clicks on the URL in the Desktop Sharing preferences "
@@ -217,134 +157,77 @@ msgstr ""
 "be sent if the user clicks on the URL in the Desktop Sharing preferences "
 "dialogue."
 
-#: ../common/org.gnome.Vino.gschema.xml.h:27
+#: ../common/org.gnome.Vino.gschema.xml.h:25
 msgid "Lock the screen when last user disconnect"
 msgstr "Lock the screen when last user disconnect"
 
-#: ../common/org.gnome.Vino.gschema.xml.h:28
-msgid "If true, screen will be locked after the last remote client disconnect."
+#: ../common/org.gnome.Vino.gschema.xml.h:26
+msgid ""
+"If true, the screen will be locked after the last remote client disconnects."
 msgstr ""
-"If true, screen will be locked after the last remote client disconnect."
+"If true, the screen will be locked after the last remote client disconnects."
 
-#: ../common/org.gnome.Vino.gschema.xml.h:29
+#: ../common/org.gnome.Vino.gschema.xml.h:27
 msgid "When the status icon should be shown"
 msgstr "When the status icon should be shown"
 
-#: ../common/org.gnome.Vino.gschema.xml.h:30
+#: ../common/org.gnome.Vino.gschema.xml.h:28
 msgid ""
 "This key controls the behavior of the status icon. There are three options: "
-"\"always\" - The icon will be always there; \"client\" - You will see the "
-"icon only when there is someone connected, this is the default behavior; "
-"\"never\" - Never shows the icon."
+"\"always\" - the icon will always be present; \"client\" - the icon will "
+"only be present when someone is connected (this is the default behavior); "
+"\"never\" - the icon will not be present."
 msgstr ""
 "This key controls the behaviour of the status icon. There are three options: "
-"\"always\" — The icon will be always there; \"client\" — You will see the "
-"icon only when there is someone connected, this is the default behaviour; "
-"\"never\" — Never shows the icon."
+"\"always\" — The icon will always be present; \"client\" — the icon will "
+"only be present when someone is connected (this is the default behaviour); "
+"\"never\" — the icon will not be present."
+
+#: ../common/org.gnome.Vino.gschema.xml.h:29
+msgid "Whether to disable the desktop background when a user is connected"
+msgstr "Whether to disable the desktop background when a user is connected"
+
+#: ../common/org.gnome.Vino.gschema.xml.h:30
+msgid ""
+"When true, disable the desktop background and replace it with a single block "
+"of color when a user successfully connects."
+msgstr ""
+"When true, disable the desktop background and replace it with a single block "
+"of colour when a user successfully connects."
 
 #: ../common/org.gnome.Vino.gschema.xml.h:31
-msgid "When true, disable the background on receive valid session"
-msgstr "When true, disable the background on receiving a valid session"
+msgid "Whether a UPnP router should be used to forward and open ports"
+msgstr "Whether a UPnP router should be used to forward and open ports"
 
 #: ../common/org.gnome.Vino.gschema.xml.h:32
-msgid "Whether we should use UPNP to forward the port in routers"
-msgstr "Whether we should use UPnP to forward the port in routers"
-
-#: ../common/org.gnome.Vino.gschema.xml.h:33
 msgid ""
-"If true, we will use UPNP protocol to automatically forward the port used by "
-"vino in the router."
+"If true, request that a UPnP-capable router should forward and open the port "
+"used by Vino."
 msgstr ""
-"If true, we will use the UPnP protocol to automatically forward the port "
-"used by Vino in the router."
+"If true, request that a UPnP-capable router should forward and open the port "
+"used by Vino."
 
-#: ../common/org.gnome.Vino.gschema.xml.h:34
+#: ../common/org.gnome.Vino.gschema.xml.h:33
 msgid "Whether we should disable the XDamage extension of X.org"
 msgstr "Whether we should disable the XDamage extension of X.org"
 
-#: ../common/org.gnome.Vino.gschema.xml.h:35
+#: ../common/org.gnome.Vino.gschema.xml.h:34
 msgid ""
-"If true, we will not use the XDamage extension of X.org. This extension does "
-"not work properly on some video drivers when using 3D effects. Disabling it "
-"will make vino work on these environments with a slower rendering as side "
-"effect."
+"If true, do not use the XDamage extension of X.org. This extension does not "
+"work properly on some video drivers when using 3D effects. Disabling it will "
+"make Vino work in these environments, with slower rendering as a side effect."
 msgstr ""
-"If true, we will not use the XDamage extension of X.org. This extension does "
-"not work properly on some video drivers when using 3D effects. Disabling it "
-"will make Vino work on these environments with a slower rendering as side "
-"effect."
+"If true, do not use the XDamage extension of X.org. This extension does not "
+"work properly on some video drivers when using 3D effects. Disabling it will "
+"make Vino work in these environments, with slower rendering as a side effect."
 
-#: ../common/org.gnome.Vino.gschema.xml.h:36
+#: ../common/org.gnome.Vino.gschema.xml.h:35
 msgid "Notify on connect"
 msgstr "Notify on connect"
 
-#: ../common/org.gnome.Vino.gschema.xml.h:37
-msgid "If true, we will notify, when the user connects to the system."
-msgstr "If true, we will notify, when the user connects to the system."
-
-#: ../capplet/vino-preferences.ui.h:1
-msgid "Desktop Sharing Preferences"
-msgstr "Desktop Sharing Preferences"
-
-#: ../capplet/vino-preferences.ui.h:2
-msgid "Sharing"
-msgstr "Sharing"
-
-#: ../capplet/vino-preferences.ui.h:3
-msgid "Some of these preferences are locked down"
-msgstr "Some of these preferences are locked down"
-
-#: ../capplet/vino-preferences.ui.h:4
-msgid "Allow other users to _view your desktop"
-msgstr "Allow other users to _view your desktop"
-
-#: ../capplet/vino-preferences.ui.h:5
-msgid "Your desktop will be shared"
-msgstr "Your desktop will be shared"
-
-#: ../capplet/vino-preferences.ui.h:6
-msgid "_Allow other users to control your desktop"
-msgstr "_Allow other users to control your desktop"
-
-#: ../capplet/vino-preferences.ui.h:7
-msgid "Remote users are able to control your mouse and keyboard"
-msgstr "Remote users are able to control your mouse and keyboard"
-
-#: ../capplet/vino-preferences.ui.h:8
-msgid "Security"
-msgstr "Security"
-
-#: ../capplet/vino-preferences.ui.h:9
-msgid "_You must confirm each access to this machine"
-msgstr "_You must confirm each access to this machine"
-
-#: ../capplet/vino-preferences.ui.h:10
-msgid "_Require the user to enter this password:"
-msgstr "_Require the user to enter this password:"
-
-#: ../capplet/vino-preferences.ui.h:11
-msgid "Automatically _configure UPnP router to open and forward ports"
-msgstr "Automatically _configure UPnP router to open and forward ports"
-
-#: ../capplet/vino-preferences.ui.h:12
-msgid "The router must have the UPnP feature enabled"
-msgstr "The router must have the UPnP feature enabled"
-
-#: ../capplet/vino-preferences.ui.h:13
-msgid "Show Notification Area Icon"
-msgstr "Show Notification Area Icon"
-
-#: ../capplet/vino-preferences.ui.h:14
-msgid "Al_ways"
-msgstr "Al_ways"
-
-#: ../capplet/vino-preferences.ui.h:15
-msgid "_Only when someone is connected"
-msgstr "_Only when someone is connected"
-
-#: ../capplet/vino-preferences.ui.h:16
-msgid "_Never"
-msgstr "_Never"
+#: ../common/org.gnome.Vino.gschema.xml.h:36
+msgid "If true, show a notification when a user connects to the system."
+msgstr "If true, show a notification when a user connects to the system."
 
 #: ../server/smclient/eggdesktopfile.c:165
 #, c-format
@@ -414,7 +297,7 @@ msgstr "Session management options:"
 msgid "Show session management options"
 msgstr "Show session management options"
 
-#: ../server/vino-main.c:202
+#: ../server/vino-main.c:153
 msgid ""
 "Your XServer does not support the XTest extension - remote desktop access "
 "will be view-only\n"
@@ -422,21 +305,24 @@ msgstr ""
 "Your XServer does not support the XTest extension — remote desktop access "
 "will be view-only\n"
 
-#: ../server/vino-main.c:298
+#. Tube mode uses Telepathy's Tubes to share a user's desktop directly
+#. * with another IM contact. http://telepathy.freedesktop.org/wiki/Tubes
+#.
+#: ../server/vino-main.c:249
 msgid "Start in tube mode, for the ‘Share my Desktop’ feature"
 msgstr "Start in tube mode, for the ‘Share my Desktop’ feature"
 
-#: ../server/vino-main.c:304
+#: ../server/vino-main.c:260
 msgid "- VNC Server for GNOME"
 msgstr "- VNC Server for GNOME"
 
-#: ../server/vino-main.c:312
+#: ../server/vino-main.c:268
 msgid ""
 "Run 'vino-server --help' to see a full list of available command line options"
 msgstr ""
 "Run 'vino-server --help' to see a full list of available command line options"
 
-#: ../server/vino-main.c:333
+#: ../server/vino-main.c:280
 msgid "GNOME Desktop Sharing"
 msgstr "GNOME Desktop Sharing"
 
@@ -464,15 +350,21 @@ msgstr "%s's remote desktop on %s"
 msgid "Received signal %d, exiting."
 msgstr "Received signal %d, exiting."
 
-#: ../server/vino-prompt.c:141
+#: ../server/vino-prompt.c:144
 msgid "Screen"
 msgstr "Screen"
 
-#: ../server/vino-prompt.c:142
+#: ../server/vino-prompt.c:145
 msgid "The screen on which to display the prompt"
 msgstr "The screen on which to display the prompt"
 
-#: ../server/vino-prompt.c:345
+#: ../server/vino-prompt.c:270 ../server/vino-status-icon.c:604
+#: ../server/vino-status-tube-icon.c:396
+#, c-format
+msgid "Error initializing libnotify\n"
+msgstr "Error initialising libnotify\n"
+
+#: ../server/vino-prompt.c:289
 #, c-format
 msgid ""
 "A user on the computer '%s' is trying to remotely view or control your "
@@ -481,63 +373,56 @@ msgstr ""
 "A user on the computer '%s' is trying to remotely view or control your "
 "desktop."
 
-#: ../server/vino-prompt.ui.h:1
-msgid "Question"
-msgstr "Question"
-
-#: ../server/vino-prompt.ui.h:2
+#: ../server/vino-prompt.c:292
 msgid "Another user is trying to view your desktop."
 msgstr "Another user is trying to view your desktop."
 
-#: ../server/vino-prompt.ui.h:3
-msgid ""
-"A user on another computer is trying to remotely view or control your "
-"desktop."
-msgstr ""
-"A user on another computer is trying to remotely view or control your "
-"desktop."
-
-#: ../server/vino-prompt.ui.h:4
-msgid "Do you want to allow them to do so?"
-msgstr "Do you want to allow them to do so?"
-
-#: ../server/vino-prompt.ui.h:5 ../server/vino-util.c:90
-msgid "_Refuse"
-msgstr "_Refuse"
+#: ../server/vino-prompt.c:298
+msgid "Refuse"
+msgstr "Refuse"
 
-#: ../server/vino-prompt.ui.h:6 ../server/vino-util.c:89
-msgid "_Allow"
-msgstr "_Allow"
+#: ../server/vino-prompt.c:304
+msgid "Accept"
+msgstr "Accept"
 
-#: ../server/vino-server.c:162 ../server/vino-server.c:185
+#: ../server/vino-server.c:159 ../server/vino-server.c:182
 #, c-format
 msgid "Failed to open connection to bus: %s\n"
 msgstr "Failed to open connection to bus: %s\n"
 
+#: ../server/vino-server.desktop.in.in.h:1
+msgid "Desktop Sharing"
+msgstr "Desktop Sharing"
+
 #: ../server/vino-server.desktop.in.in.h:2
 msgid "GNOME Desktop Sharing Server"
 msgstr "GNOME Desktop Sharing Server"
 
-#: ../server/vino-status-icon.c:103 ../server/vino-status-tube-icon.c:96
-msgid "Desktop sharing is enabled"
-msgstr "Desktop sharing is enabled"
+#: ../server/vino-server.desktop.in.in.h:3
+msgid "vnc;share;remote;"
+msgstr "vnc;share;remote;"
 
-#: ../server/vino-status-icon.c:111
+#: ../server/vino-status-icon.c:103
 #, c-format
 msgid "One person is viewing your desktop"
 msgid_plural "%d people are viewing your desktop"
 msgstr[0] "One person is viewing your desktop"
 msgstr[1] "%d people are viewing your desktop"
 
-#: ../server/vino-status-icon.c:212 ../server/vino-status-tube-icon.c:180
+#: ../server/vino-status-icon.c:112 ../server/vino-status-tube-icon.c:90
+msgid "Desktop sharing is enabled"
+msgstr "Desktop sharing is enabled"
+
+#: ../server/vino-status-icon.c:208 ../server/vino-status-icon.c:214
+#: ../server/vino-status-tube-icon.c:173 ../server/vino-status-tube-icon.c:179
 msgid "Error displaying preferences"
 msgstr "Error displaying preferences"
 
-#: ../server/vino-status-icon.c:234 ../server/vino-status-tube-icon.c:200
+#: ../server/vino-status-icon.c:236 ../server/vino-status-tube-icon.c:199
 msgid "Error displaying help"
 msgstr "Error displaying help"
 
-#: ../server/vino-status-icon.c:267
+#: ../server/vino-status-icon.c:269
 msgid ""
 "Licensed under the GNU General Public License Version 2\n"
 "\n"
@@ -574,95 +459,91 @@ msgstr ""
 "02110-1301, USA.\n"
 
 #. Translators comment: put your own name here to appear in the about dialog.
-#: ../server/vino-status-icon.c:282
+#: ../server/vino-status-icon.c:284
 msgid "translator-credits"
 msgstr ""
 "Gareth Owen <gowen72 yahoo com>\n"
 "David Lodge <dave cirt net>\n"
 "Philip Withnall <philip tecnocode co uk>\n"
 "Bruce Cowan <bruce bcowan me uk>\n"
-"Chris Leonard <cjl laptop org>"
+"Chris Leonard <cjl laptop org>\n"
+"David King <amigadave amigadave com>"
 
-#: ../server/vino-status-icon.c:288
+#: ../server/vino-status-icon.c:290
 msgid "Share your desktop with other users"
 msgstr "Share your desktop with other users"
 
-#: ../server/vino-status-icon.c:355 ../server/vino-status-tube-icon.c:232
+#: ../server/vino-status-icon.c:357 ../server/vino-status-tube-icon.c:231
 #, c-format
 msgid "Are you sure you want to disconnect '%s'?"
 msgstr "Are you sure you want to disconnect '%s'?"
 
-#: ../server/vino-status-icon.c:358
+#: ../server/vino-status-icon.c:360
 #, c-format
 msgid "The remote user from '%s' will be disconnected. Are you sure?"
 msgstr "The remote user from '%s' will be disconnected. Are you sure?"
 
-#: ../server/vino-status-icon.c:364
+#: ../server/vino-status-icon.c:366
 msgid "Are you sure you want to disconnect all clients?"
 msgstr "Are you sure you want to disconnect all clients?"
 
-#: ../server/vino-status-icon.c:366
+#: ../server/vino-status-icon.c:368
 msgid "All remote users will be disconnected. Are you sure?"
 msgstr "All remote users will be disconnected. Are you sure?"
 
-#: ../server/vino-status-icon.c:378 ../server/vino-status-tube-icon.c:246
+#: ../server/vino-status-icon.c:380 ../server/vino-status-tube-icon.c:245
 msgid "Disconnect"
 msgstr "Disconnect"
 
-#: ../server/vino-status-icon.c:404 ../server/vino-status-tube-icon.c:271
+#: ../server/vino-status-icon.c:406 ../server/vino-status-tube-icon.c:270
 msgid "_Preferences"
 msgstr "_Preferences"
 
-#: ../server/vino-status-icon.c:419
+#: ../server/vino-status-icon.c:421
 msgid "Disconnect all"
 msgstr "Disconnect all"
 
 #. Translators: %s is a hostname
 #. Translators: %s is the alias of the telepathy contact
-#: ../server/vino-status-icon.c:443 ../server/vino-status-tube-icon.c:284
+#: ../server/vino-status-icon.c:445 ../server/vino-status-tube-icon.c:283
 #, c-format
 msgid "Disconnect %s"
 msgstr "Disconnect %s"
 
-#: ../server/vino-status-icon.c:464 ../server/vino-status-tube-icon.c:303
+#: ../server/vino-status-icon.c:466 ../server/vino-status-tube-icon.c:302
 msgid "_Help"
 msgstr "_Help"
 
-#: ../server/vino-status-icon.c:472
+#: ../server/vino-status-icon.c:474
 msgid "_About"
 msgstr "_About"
 
-#: ../server/vino-status-icon.c:605 ../server/vino-status-tube-icon.c:400
-#, c-format
-msgid "Error initializing libnotify\n"
-msgstr "Error initialising libnotify\n"
-
 #. Translators: %s is a hostname
-#: ../server/vino-status-icon.c:626
+#: ../server/vino-status-icon.c:625
 msgid "Another user is viewing your desktop"
 msgstr "Another user is viewing your desktop"
 
-#: ../server/vino-status-icon.c:628
+#: ../server/vino-status-icon.c:627
 #, c-format
 msgid "A user on the computer '%s' is remotely viewing your desktop."
 msgstr "A user on the computer '%s' is remotely viewing your desktop."
 
 #. Translators: %s is a hostname
-#: ../server/vino-status-icon.c:634
+#: ../server/vino-status-icon.c:633
 msgid "Another user is controlling your desktop"
 msgstr "Another user is controlling your desktop"
 
-#: ../server/vino-status-icon.c:636
+#: ../server/vino-status-icon.c:635
 #, c-format
 msgid "A user on the computer '%s' is remotely controlling your desktop."
 msgstr "A user on the computer '%s' is remotely controlling your desktop."
 
-#: ../server/vino-status-icon.c:664 ../server/vino-status-tube-icon.c:437
+#: ../server/vino-status-icon.c:657 ../server/vino-status-tube-icon.c:430
 #, c-format
 msgid "Error while displaying notification bubble: %s\n"
 msgstr "Error while displaying notification bubble: %s\n"
 
-#: ../server/vino-status-tube-icon.c:235
+#: ../server/vino-status-tube-icon.c:234
 #, c-format
 msgid "The remote user '%s' will be disconnected. Are you sure?"
 msgstr "The remote user '%s' will be disconnected. Are you sure?"
@@ -695,82 +576,180 @@ msgstr "'%s' is remotely controlling your desktop."
 msgid "Waiting for '%s' to connect to the screen."
 msgstr "Waiting for '%s' to connect to the screen."
 
-#: ../server/vino-util.c:140
+#: ../server/vino-util.c:88
+msgid "_Allow"
+msgstr "_Allow"
+
+#: ../server/vino-util.c:89
+msgid "_Refuse"
+msgstr "_Refuse"
+
+#: ../server/vino-util.c:139
 msgid "An error has occurred:"
 msgstr "An error has occurred:"
 
-#: ../tools/vino-passwd.c:108
-#, c-format
-msgid "Cancelled"
-msgstr "Cancelled"
+#~ msgid "There was an error showing the URL \"%s\""
+#~ msgstr "There was an error showing the URL \"%s\""
 
-#: ../tools/vino-passwd.c:115
-#, c-format
-msgid ""
-"ERROR: Maximum length of password is %d character. Please, re-enter the "
-"password."
-msgid_plural ""
-"ERROR: Maximum length of password is %d characters. Please, re-enter the "
-"password."
-msgstr[0] ""
-"Error: Maximum length of password is %d character. Please re-enter the "
-"password."
-msgstr[1] ""
-"Error: Maximum length of password is %d characters. Please re-enter the "
-"password."
-
-#: ../tools/vino-passwd.c:149
-#, c-format
-msgid "Changing Vino password.\n"
-msgstr "Changing Vino password.\n"
+#~ msgid ""
+#~ "There was an error displaying help:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "There was an error displaying help:\n"
+#~ "%s"
 
-#: ../tools/vino-passwd.c:151
-msgid "Enter new Vino password: "
-msgstr "Enter new Vino password: "
+#~ msgid "Checking the connectivity of this machine..."
+#~ msgstr "Checking the connectivity of this machine…"
 
-#: ../tools/vino-passwd.c:154
-msgid "Retype new Vino password: "
-msgstr "Retype new Vino password: "
+#~ msgid "Your desktop is only reachable over the local network."
+#~ msgstr "Your desktop is only reachable over the local network."
 
-#: ../tools/vino-passwd.c:160
-#, c-format
-msgid "vino-passwd: password updated successfully.\n"
-msgstr "vino-passwd: password updated successfully.\n"
+#~ msgid " or "
+#~ msgstr " or "
 
-#: ../tools/vino-passwd.c:165
-#, c-format
-msgid "Sorry, passwords do not match.\n"
-msgstr "Sorry, passwords do not match.\n"
+#~ msgid "Others can access your computer using the address %s."
+#~ msgstr "Others can access your computer using the address %s."
 
-#: ../tools/vino-passwd.c:166
-#, c-format
-msgid "vino-passwd: password unchanged.\n"
-msgstr "vino-passwd: password unchanged.\n"
+#~ msgid "Nobody can access your desktop."
+#~ msgstr "Nobody can access your desktop."
 
-#: ../tools/vino-passwd.c:182
-msgid "Show Vino version"
-msgstr "Show Vino version"
+#~ msgid "Choose how other users can remotely view your desktop"
+#~ msgstr "Choose how other users can remotely view your desktop"
 
-#: ../tools/vino-passwd.c:191
-msgid "- Updates Vino password"
-msgstr "- Updates Vino password"
+#~ msgid "Remote desktop sharing password"
+#~ msgstr "Remote desktop sharing password"
 
-#: ../tools/vino-passwd.c:201
-msgid ""
-"Run 'vino-passwd --help' to see a full list of available command line options"
-msgstr ""
-"Run 'vino-passwd --help' to see a full list of available command line options"
+#~ msgid "Enable remote access to the desktop"
+#~ msgstr "Enable remote access to the desktop"
 
-#: ../tools/vino-passwd.c:208
-#, c-format
-msgid "VINO Version %s\n"
-msgstr "Vino Version %s\n"
+#~ msgid ""
+#~ "If true, allows remote access to the desktop via the RFB protocol. Users "
+#~ "on remote machines may then connect to the desktop using a VNC viewer."
+#~ msgstr ""
+#~ "If true, allows remote access to the desktop via the RFB protocol. Users "
+#~ "on remote machines may then connect to the desktop using a VNC viewer."
 
-#: ../tools/vino-passwd.c:219
-#, c-format
-msgid "ERROR: You do not have enough permissions to change Vino password.\n"
-msgstr ""
-"Error: You do not have enough permissions to change the Vino password.\n"
+#~ msgid ""
+#~ "If true, we will use UPNP protocol to automatically forward the port used "
+#~ "by vino in the router."
+#~ msgstr ""
+#~ "If true, we will use the UPnP protocol to automatically forward the port "
+#~ "used by Vino in the router."
+
+#~ msgid "Desktop Sharing Preferences"
+#~ msgstr "Desktop Sharing Preferences"
+
+#~ msgid "Sharing"
+#~ msgstr "Sharing"
+
+#~ msgid "Some of these preferences are locked down"
+#~ msgstr "Some of these preferences are locked down"
+
+#~ msgid "Allow other users to _view your desktop"
+#~ msgstr "Allow other users to _view your desktop"
+
+#~ msgid "Your desktop will be shared"
+#~ msgstr "Your desktop will be shared"
+
+#~ msgid "_Allow other users to control your desktop"
+#~ msgstr "_Allow other users to control your desktop"
+
+#~ msgid "Remote users are able to control your mouse and keyboard"
+#~ msgstr "Remote users are able to control your mouse and keyboard"
+
+#~ msgid "Security"
+#~ msgstr "Security"
+
+#~ msgid "_You must confirm each access to this machine"
+#~ msgstr "_You must confirm each access to this machine"
+
+#~ msgid "_Require the user to enter this password:"
+#~ msgstr "_Require the user to enter this password:"
+
+#~ msgid "Automatically _configure UPnP router to open and forward ports"
+#~ msgstr "Automatically _configure UPnP router to open and forward ports"
+
+#~ msgid "The router must have the UPnP feature enabled"
+#~ msgstr "The router must have the UPnP feature enabled"
+
+#~ msgid "Show Notification Area Icon"
+#~ msgstr "Show Notification Area Icon"
+
+#~ msgid "Al_ways"
+#~ msgstr "Al_ways"
+
+#~ msgid "_Only when someone is connected"
+#~ msgstr "_Only when someone is connected"
+
+#~ msgid "_Never"
+#~ msgstr "_Never"
+
+#~ msgid "Question"
+#~ msgstr "Question"
+
+#~ msgid ""
+#~ "A user on another computer is trying to remotely view or control your "
+#~ "desktop."
+#~ msgstr ""
+#~ "A user on another computer is trying to remotely view or control your "
+#~ "desktop."
+
+#~ msgid "Do you want to allow them to do so?"
+#~ msgstr "Do you want to allow them to do so?"
+
+#~ msgid "Cancelled"
+#~ msgstr "Cancelled"
+
+#~ msgid ""
+#~ "ERROR: Maximum length of password is %d character. Please, re-enter the "
+#~ "password."
+#~ msgid_plural ""
+#~ "ERROR: Maximum length of password is %d characters. Please, re-enter the "
+#~ "password."
+#~ msgstr[0] ""
+#~ "Error: Maximum length of password is %d character. Please re-enter the "
+#~ "password."
+#~ msgstr[1] ""
+#~ "Error: Maximum length of password is %d characters. Please re-enter the "
+#~ "password."
+
+#~ msgid "Changing Vino password.\n"
+#~ msgstr "Changing Vino password.\n"
+
+#~ msgid "Enter new Vino password: "
+#~ msgstr "Enter new Vino password: "
+
+#~ msgid "Retype new Vino password: "
+#~ msgstr "Retype new Vino password: "
+
+#~ msgid "vino-passwd: password updated successfully.\n"
+#~ msgstr "vino-passwd: password updated successfully.\n"
+
+#~ msgid "Sorry, passwords do not match.\n"
+#~ msgstr "Sorry, passwords do not match.\n"
+
+#~ msgid "vino-passwd: password unchanged.\n"
+#~ msgstr "vino-passwd: password unchanged.\n"
+
+#~ msgid "Show Vino version"
+#~ msgstr "Show Vino version"
+
+#~ msgid "- Updates Vino password"
+#~ msgstr "- Updates Vino password"
+
+#~ msgid ""
+#~ "Run 'vino-passwd --help' to see a full list of available command line "
+#~ "options"
+#~ msgstr ""
+#~ "Run 'vino-passwd --help' to see a full list of available command line "
+#~ "options"
+
+#~ msgid "VINO Version %s\n"
+#~ msgstr "Vino Version %s\n"
+
+#~ msgid "ERROR: You do not have enough permissions to change Vino password.\n"
+#~ msgstr ""
+#~ "Error: You do not have enough permissions to change the Vino password.\n"
 
 #~ msgid "Remote Desktop"
 #~ msgstr "Remote Desktop"