Refresh translations from zanata

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

95 files changed, 19069 insertions, 13510 deletions

diff --git a/po/af.po b/po/af.po
index 02d69d2..0af8b78 100644
--- a/po/af.po
+++ b/po/af.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Afrikaans\n"
+"Language: af\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: af\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/am.po b/po/am.po
index 3af1fa6..6d7df9f 100644
--- a/po/am.po
+++ b/po/am.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Amharic\n"
+"Language: am\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: am\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/anp.po b/po/anp.po
index 3fbfd9f..55d92f4 100644
--- a/po/anp.po
+++ b/po/anp.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Angika\n"
+"Language: anp\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: anp\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 3dd9763..1dc4b69 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -2,23 +2,24 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Arabic\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
+"Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +73,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +122,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +245,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +372,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +399,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +441,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +477,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +606,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +681,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +740,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/as.po b/po/as.po
index 2e8d60f..8e8ad64 100644
--- a/po/as.po
+++ b/po/as.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Amitakhya Phukan <aphukan@redhat.com>, 2010
 # Nilamdyuti Goswami <ngoswami@redhat.com>, 2012
@@ -10,18 +10,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: 2015-01-12 06:21-0500\n"
 "Last-Translator: Daniel Berrange <dan-transifex@berrange.com>\n"
-"Language-Team: Assamese (http://www.transifex.com/projects/p/virt-viewer/language/as/)\n"
+"Language-Team: Assamese (http://www.transifex.com/projects/p/virt-viewer/"
+"language/as/)\n"
+"Language: as\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: as\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.7.3\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr "দূৰৱৰ্তী দৰ্শক"
 
@@ -75,45 +76,44 @@ msgstr "বন্ধনী ফ্লেগসমূহ"
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
-msgstr "দুৰৱৰ্তী-দৰ্শক সংস্কৰণ %s\n"
+msgid "remote-viewer version %s"
+msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr "সংস্কৰণ তথ্য প্ৰদৰ্শন কৰক"
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr "উইন্ডো শীৰ্ষক সংহতি কৰক"
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr "Spice নিয়ন্ত্ৰক সংযোগ ব্যৱহাৰ কৰি সংযোগ খোলক"
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr "দূৰৱৰ্তী দৰ্শক ক্লাএণ্ট"
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
-"%s⏎ উপলব্ধ কমান্ড শাৰী বিকল্পসমূহৰ এটা সম্পূৰ্ণ তালিকা চাবলে '%s --help' "
-"চাওক⏎\n"
+"%s⏎ উপলব্ধ কমান্ড শাৰী বিকল্পসমূহৰ এটা সম্পূৰ্ণ তালিকা চাবলে '%s --help' চাওক⏎\n"
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr "ত্ৰুটি: Spice নিয়ন্ত্ৰক ব্যৱহাৰ কৰোতে অতিৰিক্ত ত্ৰকসমূহ দিয়া হৈছে\n"
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr "ত্ৰুটি: কেইবাটাও URls নিয়ন্ত্ৰণ কৰিব নোৱাৰি\n"
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr "সংযোগ আৰম্ভ কৰিবলে ব্যৰ্থ"
 
@@ -126,83 +126,90 @@ msgstr "প্ৰদৰ্শন নিয়ন্ত্ৰক দ্বাৰা
 msgid "Controller connection failed: %s"
 msgstr "নিয়ন্ত্ৰক সংযোগ ব্যৰ্থ হল: %s"
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
-msgstr "সংযোগৰ বিৱৰণসমূহ"
-
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
-msgstr "সংযোগৰ ঠিকনা (_C)"
-
 #: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
-msgstr "উদাহৰণস্বৰূপ, spice://foo.example.org:5900"
-
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
-msgstr "শেহতীয়া সংযোগসমূহ (_R)"
-
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
-msgstr "এটা Spice অধিবেশন সৃষ্টি কৰিব পৰা নগল"
-
-#: ../src/remote-viewer.c:1221
 msgid "Setting up Spice session..."
 msgstr "Spice অধিবেশন সংহতি কৰা হৈ আছে..."
 
-#: ../src/remote-viewer.c:1243
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
+msgstr ""
+
+#: ../src/remote-viewer.c:1120
 #, c-format
-msgid "Invalid file %s"
-msgstr "অবৈধ ফাইল %s"
+msgid "Invalid file %s: "
+msgstr ""
 
-#: ../src/remote-viewer.c:1250
+#: ../src/remote-viewer.c:1128
 msgid "Cannot determine the connection type from URI"
 msgstr "URI ৰ পৰা সংযোগ ধৰণ নিৰ্ধাৰণ কৰিব পৰা নগল"
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
-msgstr "এই ধৰণৰ বাবে এটা অধিবেশন সৃষ্টি কৰিব পৰা নগল: %s"
-
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
+msgstr "সংযোগৰ বিৱৰণসমূহ"
+
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
+msgstr "উদাহৰণস্বৰূপ, spice://foo.example.org:5900"
+
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
+msgstr ""
+
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr "Glade ৰ বিষয়ে"
@@ -218,8 +225,7 @@ msgstr ""
 #: ../src/virt-viewer-about.xml.h:4
 msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt"
 msgstr ""
-"GTK-VNC, SPICE-GTK আৰু libvirt ৰ সৈতে নিৰ্মাণ কৰা এটা দূৰৱৰ্তী ডেস্কটপ "
-"ক্লাএন্ট"
+"GTK-VNC, SPICE-GTK আৰু libvirt ৰ সৈতে নিৰ্মাণ কৰা এটা দূৰৱৰ্তী ডেস্কটপ ক্লাএন্ট"
 
 #: ../src/virt-viewer-about.xml.h:5
 msgid "virt-manager.org"
@@ -241,133 +247,135 @@ msgid ""
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
 msgstr ""
-"এই প্ৰগ্ৰামটো এটা বিনামুলিয়া চফ্টৱেৰ; আপুনি Free Software Foundation ৰ দ্বাৰা প্ৰকাশিত GNU General Public License ৰ চুক্তিসমূহৰ অন্তৰ্গত ইয়াক পুনৰ বিলাব পাৰিব অথবা সলনি  কৰিব পাৰিব; হৈতো অনুজ্ঞাৰ সংস্কৰণ ২, অথবা (আপুনাৰ বিকল্পত) যিকোনো পৰৱৰ্তী সংস্কৰণ।\n"
+"এই প্ৰগ্ৰামটো এটা বিনামুলিয়া চফ্টৱেৰ; আপুনি Free Software Foundation ৰ দ্বাৰা "
+"প্ৰকাশিত GNU General Public License ৰ চুক্তিসমূহৰ অন্তৰ্গত ইয়াক পুনৰ বিলাব পাৰিব "
+"অথবা সলনি  কৰিব পাৰিব; হৈতো অনুজ্ঞাৰ সংস্কৰণ ২, অথবা (আপুনাৰ বিকল্পত) যিকোনো "
+"পৰৱৰ্তী সংস্কৰণ।\n"
 "\n"
-"এই প্ৰগ্ৰামটো এইটো আশাত বিলোৱা হৈছে যে ই ব্যৱহাৰযোগ্য হ'ব, কিন্তু কোনো ৱাৰেন্টি নথকাকৈ; ব্যৱসায়ীক  অথবা কোনো এটা বিশেষ কাৰণৰ যোগ্যতাৰ বাবে বুজুৱা ৱাৰেন্টি  নথকাকৈ। অধিক যানিবলৈ  GNU General Public License চাওক।\n"
+"এই প্ৰগ্ৰামটো এইটো আশাত বিলোৱা হৈছে যে ই ব্যৱহাৰযোগ্য হ'ব, কিন্তু কোনো ৱাৰেন্টি "
+"নথকাকৈ; ব্যৱসায়ীক  অথবা কোনো এটা বিশেষ কাৰণৰ যোগ্যতাৰ বাবে বুজুৱা ৱাৰেন্টি  "
+"নথকাকৈ। অধিক যানিবলৈ  GNU General Public License চাওক।\n"
 "\n"
-"আপুনি হৈতো ইতিমধ্যে এই প্ৰগ্ৰামৰ সৈতে GNU General Public License ৰ কপি এটা পাইছে; যদি নাই,  Free Software\n"
-"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA লে লিখক\n"
+"আপুনি হৈতো ইতিমধ্যে এই প্ৰগ্ৰামৰ সৈতে GNU General Public License ৰ কপি এটা "
+"পাইছে; যদি নাই,  Free Software\n"
+"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA লে "
+"লিখক\n"
 
 #: ../src/virt-viewer-about.xml.h:20
 msgid "The Fedora Translation Team"
 msgstr "Fedora অনুবাদ দল"
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr "আপুনি অধিবেশন বন্ধ কৰিব বিচাৰে নে?"
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr "মোক আকৌ নুশুধিব"
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr "প্ৰদৰ্শন %d ৰ বাবে অপেক্ষা কৰা হৈ আছে..."
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
-msgstr "অতিথি %s ৰ বাবে অজ্ঞাত গ্ৰাফিক ধৰণ"
+msgid "Unsupported graphic type '%s'"
+msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr "ssh লে সংযোগ ব্যৰ্থ হল।"
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr "চেনেলে সংযোগ কৰিব নোৱাৰি, কেৱল SSH সমৰ্থিত।"
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr "চেনেললে সংযোগ অসমৰ্থিত।"
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr "গ্ৰাফিক চাৰ্ভাৰলে সংযোগ কৰা হৈ আছে"
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr "অতিথি ডমেইন বন্ধ হল"
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr "গ্ৰাফিক চাৰ্ভাৰলে সংযোগিত"
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr "গ্ৰাফিক চাৰ্ভাৰ %s লে সংযোগ কৰিবলে অক্ষম"
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
-"%s ত দূৰৱৰ্তী ডেস্কটপ চাৰ্ভাৰৰ সৈতে প্ৰমাণীত কৰিবলে অক্ষম: %s\n"
-"সংযোগ পুনৰ চেষ্টা কৰিব নে?"
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr "দূৰৱৰ্তী ডেস্কটপ চাৰ্ভাৰৰ সৈতে প্ৰমাণিত কৰিবলে অক্ষম: %s"
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr "USB পুনৰনিৰ্দেশ ত্ৰুটি: %s"
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr "জুম স্তৰ %d-%d ৰ মাজত হব লাগিব\n"
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr "%d প্ৰদৰ্শন কৰক"
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr "অবৈধ kiosk-quit তৰ্ক: %s"
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr "উইন্ডোৰ জুম স্তৰ, শতাংশত"
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
-"পূৰ্ণ পৰ্দা অৱস্থাত খোলক (ক্লাএন্টৰ সৈতে খাপ খোৱাবলে অতিথিৰ বিভেদন ধাৰ্য্য "
-"কৰে)"
+"পূৰ্ণ পৰ্দা অৱস্থাত খোলক (ক্লাএন্টৰ সৈতে খাপ খোৱাবলে অতিথিৰ বিভেদন ধাৰ্য্য কৰে)"
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr "হটকি'সমূহ স্বনিৰ্বাচন কৰক"
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr "কিঅস্ক অৱস্থা সামৰ্থবান কৰক"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr "কিঅস্ক অৱস্থাত দিয়া চুক্তিত প্ৰস্থান কৰিব"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr "<never|on-disconnect>"
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr "ভাৰভৌচ তথ্য প্ৰদৰ্শন কৰক"
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr "ডিবাগ তথ্য প্ৰদৰ্শন কৰক"
 
@@ -385,11 +393,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr "প্ৰমাণীকৰণৰ প্ৰয়োজন"
@@ -410,6 +420,10 @@ msgstr "ব্যৱহাৰকাৰীৰ নাম:"
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -442,38 +456,40 @@ msgstr "Virt দৰ্শক"
 #: ../src/virt-viewer-main.c:80
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options"
-msgstr ""
-"উপলব্ধ কমান্ড শাৰী বিকল্পসমূহৰ এটা সম্পূৰ্ণ তালিকা চাবলে '%s --help' চলাওক"
+msgstr "উপলব্ধ কমান্ড শাৰী বিকল্পসমূহৰ এটা সম্পূৰ্ণ তালিকা চাবলে '%s --help' চলাওক"
 
 #: ../src/virt-viewer-main.c:86
 msgid "Virtual machine graphical console"
 msgstr "ভাৰছুৱেল মেচিন গ্ৰাফিকেল কনচৌল"
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
+
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
 "\n"
-"ব্যৱহাৰপদ্ধতি: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
-"\n"
-"%s\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
 "\n"
+msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr "পুনৰনিৰ্দেশৰ বাবে USB ডিভাইচসমূহ বাছক"
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr "অসমৰ্থিত প্ৰমাণীকৰণ ধৰণ %d"
@@ -482,117 +498,127 @@ msgstr "অসমৰ্থিত প্ৰমাণীকৰণ ধৰণ %d"
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr "Ctrl+Alt+_Del"
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr "Ctrl+Alt+_Backspace"
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr "Ctrl+Alt+F_1"
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr "Ctrl+Alt+F_2"
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr "Ctrl+Alt+F_3"
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr "Ctrl+Alt+F_4"
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr "Ctrl+Alt+F_5"
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr "Ctrl+Alt+F_6"
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr "Ctrl+Alt+F_7"
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr "Ctrl+Alt+F_8"
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr "Ctrl+Alt+F_9"
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr "Ctrl+Alt+F1_0"
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr "Ctrl+Alt+F11"
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr "Ctrl+Alt+F12"
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr "স্ক্ৰিনশ্বট"
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr "বিচ্ছিন্ন কৰক"
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr "USB ডিভাইছ নিৰ্বাচন"
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr "চাবি সংযুক্তি পঠাওক"
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr "পূৰ্ণপৰ্দা ত্যাগ কৰক"
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr "Ctrl+Alt"
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr "(পোইন্টাৰ এৰিবলে %s টিপক)"
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr "%s%s%s - %s"
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr " "
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr "এই সংযোগ সংস্থাপন কৰিবলে অন্তত %s সংস্কৰণ %s ৰ প্ৰয়োজন"
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr "অতিথি ডমেইন পুনৰাম্ভ হোৱাৰ বাবে অপেক্ষা কৰা হৈ আছে"
 
@@ -601,59 +627,69 @@ msgstr "অতিথি ডমেইন পুনৰাম্ভ হোৱাৰ
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr "অতিথি %s ৰ বাবে গ্ৰাফিক ধৰণ নিৰ্ধাৰণ কৰিব নোৱাৰি"
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr "অতিথি %s ৰ বাবে হস্ট নিৰ্ধাৰণ কৰিব নোৱাৰি"
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr "libvirt আৰম্ভ হবলে অপেক্ষা কৰা হৈছে"
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr "অতিথি ডমেইন বিচৰা"
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr "অতিথি ডমেইন সৃষ্টি হোৱালে অপেক্ষা কৰা হৈ আছে"
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr "অতিথি ডমেইন অৱস্থা নীৰিক্ষণ কৰা"
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr "অতিথি ডমেইন আৰম্ভ হোৱালে অপেক্ষা কৰা হৈ আছে"
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr "[none]"
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr "ফাইল (_F)"
@@ -666,35 +702,39 @@ msgstr "স্মাৰ্টকাৰ্ড সোমোৱা"
 msgid "Smartcard removal"
 msgstr "স্মাৰ্টকাৰ্ড আতৰোৱা"
 
-#: ../src/virt-viewer.xml.h:6
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:7
 msgid "_View"
 msgstr "দৰ্শন কৰক (_V)"
 
-#: ../src/virt-viewer.xml.h:7
+#: ../src/virt-viewer.xml.h:8
 msgid "Full screen"
 msgstr "সম্পূৰ্ণ পৰ্দা"
 
-#: ../src/virt-viewer.xml.h:8
+#: ../src/virt-viewer.xml.h:9
 msgid "_Zoom"
 msgstr "জুম কৰক (_Z)"
 
-#: ../src/virt-viewer.xml.h:9
+#: ../src/virt-viewer.xml.h:10
 msgid "Displays"
 msgstr "প্ৰদৰ্শনসমূহ"
 
-#: ../src/virt-viewer.xml.h:10
+#: ../src/virt-viewer.xml.h:11
 msgid "Release cursor"
 msgstr "উন্মোচন কাৰ্চাৰ"
 
-#: ../src/virt-viewer.xml.h:11
+#: ../src/virt-viewer.xml.h:12
 msgid "_Send key"
 msgstr "কি পঠাওক (_S)"
 
-#: ../src/virt-viewer.xml.h:12
+#: ../src/virt-viewer.xml.h:13
 msgid "_Help"
 msgstr "সহায় (_H)"
 
-#: ../src/virt-viewer.xml.h:13
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -721,3 +761,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/ast.po b/po/ast.po
index 5bd1fc5..72d9710 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Asturian\n"
+"Language: ast\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ast\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/bal.po b/po/bal.po
index deb64d9..a91670e 100644
--- a/po/bal.po
+++ b/po/bal.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Baluchi\n"
+"Language: bal\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: bal\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/be.po b/po/be.po
index 290d847..f497114 100644
--- a/po/be.po
+++ b/po/be.po
@@ -2,23 +2,24 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Belarusian\n"
+"Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: be\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +73,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +122,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +245,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +372,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +399,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +441,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +477,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +606,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +681,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +740,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 33e4f25..a37e28c 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Valentin Laskov <laskov@festa.bg>, 2012-2013
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: 2015-01-12 06:21-0500\n"
 "Last-Translator: Daniel Berrange <dan-transifex@berrange.com>\n"
-"Language-Team: Bulgarian (http://www.transifex.com/projects/p/virt-viewer/language/bg/)\n"
+"Language-Team: Bulgarian (http://www.transifex.com/projects/p/virt-viewer/"
+"language/bg/)\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.7.3\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr "Remote Viewer"
 
@@ -73,46 +74,47 @@ msgstr "Флаговете на привързването"
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
-msgstr "remote-viewer версия %s\n"
+msgid "remote-viewer version %s"
+msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr "Показва информация за версията"
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr "Задаване заглавие на прозореца"
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr "Отвори връзка чрез комуникационния контролер Spice"
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 "%s\n"
-"Стартирайте '%s --help' за да видите пълен списък на опциите в командния ред\n"
+"Стартирайте '%s --help' за да видите пълен списък на опциите в командния "
+"ред\n"
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 "Грешка: подадени са излишни аргументи докато се ползва Spice контролер\n"
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr "Грешка: не мога да обработя няколко URI-а\n"
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr "Неуспешно инициализиране на връзка"
 
@@ -125,83 +127,90 @@ msgstr "Дисплеят е забранен от контролера"
 msgid "Controller connection failed: %s"
 msgstr "Връзката на контролера пропадна: %s"
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
-msgstr ""
-
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
-msgstr "Параметри на връзката"
-
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
 #: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
-msgstr ""
-
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
-msgstr ""
-
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
-msgstr "Не мога да създам Spice сесия"
-
-#: ../src/remote-viewer.c:1221
 msgid "Setting up Spice session..."
 msgstr "Създаване на Spice сесия..."
 
-#: ../src/remote-viewer.c:1243
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
+msgstr ""
+
+#: ../src/remote-viewer.c:1120
 #, c-format
-msgid "Invalid file %s"
-msgstr "Невалиден файл %s"
+msgid "Invalid file %s: "
+msgstr ""
 
-#: ../src/remote-viewer.c:1250
+#: ../src/remote-viewer.c:1128
 msgid "Cannot determine the connection type from URI"
 msgstr "От това URI не може да се определи типа на връзката"
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
-msgstr "Не може да се създаде сесия от този тип: %s"
-
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
+msgstr "Параметри на връзката"
+
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
+msgstr ""
+
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr "Относно Glade"
@@ -237,7 +246,8 @@ msgid ""
 "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
 msgstr ""
 "Тази програма е свободен софтуер; Вие можете да я разпространявате\n"
-"и/или променяте под условията на GNU General Public License, както е публикуван от\n"
+"и/или променяте под условията на GNU General Public License, както е "
+"публикуван от\n"
 "Free Software Foundation; версия 2 на лиценза, или по (ваше усмотрение),\n"
 "която и да е по-късна версия.\n"
 "\n"
@@ -256,120 +266,116 @@ msgstr ""
 "The Fedora Translation Team\n"
 "Валентин Ласков, 2012"
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr "Желаете ли да прекратите сесията?"
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr "Не ме питай отново"
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr "Изчаквам за да покажа %d..."
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
-msgstr "Неизвестен тип графика за госта %s"
+msgid "Unsupported graphic type '%s'"
+msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr "Връзката към ssh пропадна."
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr "Не мога да се свържа към канала, поддържа се само SSH."
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr "Свързване към канал не се поддържа."
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr "Свързване към графичен сървър"
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr "Виртуализиращата среда на госта беше спряна"
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr "Свързан към графичен сървър"
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr "Невъзможно е да се свържа с графичния сървър %s"
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
-"Невъзможно е удостоверяването пред отдалечения десктоп сървър на %s: %s\n"
-"Да опитам ли свързването отново?"
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr "Невъзможно е удостоверяването пред отдалечения десктоп сървър: %s"
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr "Грешка при USB пренасочването: %s"
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr "Zoom level трябва да е в рамките %d-%d\n"
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr "Дисплей %d"
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr "Невалиден kiosk-quit аргумент: %s"
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr "Размер на прозореца в проценти"
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr "Настройка на клавишни комбинации"
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr "Разрешаване на kiosk режим"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr "Изход при дадено състояние в kiosk режим"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr "<never|on-disconnect>"
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr "Показва по-подробна информация"
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr "Показва информация за отстраняване на грешки"
 
@@ -387,11 +393,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr "Изисква се удостоверяване"
@@ -412,6 +420,10 @@ msgstr "Потребител:"
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -451,31 +463,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
+
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
 "\n"
-"Употреба: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
-"\n"
-"%s\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
 "\n"
+msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr "Изберете USB устройства за пренасочване"
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr "Не се поддържа удостоверяване тип %d"
@@ -484,117 +499,127 @@ msgstr "Не се поддържа удостоверяване тип %d"
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr "Ctrl+Alt+_Del"
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr "Ctrl+Alt+_Backspace"
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr "Ctrl+Alt+F_1"
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr "Ctrl+Alt+F_2"
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr "Ctrl+Alt+F_3"
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr "Ctrl+Alt+F_4"
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr "Ctrl+Alt+F_5"
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr "Ctrl+Alt+F_6"
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr "Ctrl+Alt+F_7"
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr "Ctrl+Alt+F_8"
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr "Ctrl+Alt+F_9"
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr "Ctrl+Alt+F1_0"
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr "Ctrl+Alt+F11"
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr "Ctrl+Alt+F12"
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr "Снимка на екрана"
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr "Изключване"
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr "Избор на USB устройства"
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr "Изпращане на клавишна комбинация"
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr "Изход от Цял екран"
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr "Ctrl+Alt"
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr "(Натиснете %s за освобождаване на показалеца)"
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr "%s%s%s - %s"
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr " "
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr "Изисква се %s поне версия %s за създаване на тази връзка"
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr "Изчакване виртуализиращата среда на госта да се рестартира"
 
@@ -603,59 +628,69 @@ msgstr "Изчакване виртуализиращата среда на го
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr "Не мога да определя графичния тип за госта %s"
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr "Не мога да определя хоста за госта %s"
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr "Изчаквам стартирането на libvirt"
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr "Търсене на виртуализиращата среда на госта"
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr "Изчакване виртуализиращата среда да бъде създадена"
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr "Проверка състоянието на виртуализиращата среда"
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr "Изчакване виртуализиращата среда на госта да бъде стартирана"
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr "[нищо]"
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr "_Файл"
@@ -668,35 +703,39 @@ msgstr "Поставяне на смарткарта"
 msgid "Smartcard removal"
 msgstr "Премахване на смарткарта"
 
-#: ../src/virt-viewer.xml.h:6
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:7
 msgid "_View"
 msgstr "_Изглед"
 
-#: ../src/virt-viewer.xml.h:7
+#: ../src/virt-viewer.xml.h:8
 msgid "Full screen"
 msgstr "Цял екран"
 
-#: ../src/virt-viewer.xml.h:8
+#: ../src/virt-viewer.xml.h:9
 msgid "_Zoom"
 msgstr "_Мащабиране"
 
-#: ../src/virt-viewer.xml.h:9
+#: ../src/virt-viewer.xml.h:10
 msgid "Displays"
 msgstr "Екрани"
 
-#: ../src/virt-viewer.xml.h:10
+#: ../src/virt-viewer.xml.h:11
 msgid "Release cursor"
 msgstr "Освобождаване на показалеца"
 
-#: ../src/virt-viewer.xml.h:11
+#: ../src/virt-viewer.xml.h:12
 msgid "_Send key"
 msgstr "Изпрати _клавиш"
 
-#: ../src/virt-viewer.xml.h:12
+#: ../src/virt-viewer.xml.h:13
 msgid "_Help"
 msgstr "_Помощ"
 
-#: ../src/virt-viewer.xml.h:13
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -723,3 +762,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/bn.po b/po/bn.po
index 2a37014..9fead0d 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Ayesha Akhtar <ayesha@ankur.org.bd>, 2012
 # Mahay Alam Khan <mak@ankur.org.bd>, 2012
@@ -13,18 +13,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: 2015-01-12 06:21-0500\n"
 "Last-Translator: Daniel Berrange <dan-transifex@berrange.com>\n"
-"Language-Team: Bengali (http://www.transifex.com/projects/p/virt-viewer/language/bn/)\n"
+"Language-Team: Bengali (http://www.transifex.com/projects/p/virt-viewer/"
+"language/bn/)\n"
+"Language: bn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: bn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.7.3\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -78,43 +79,43 @@ msgstr "বাইন্ড করতে ব্যবহৃত ফ্ল্যা
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
-msgstr "remote-viewer সংস্করণ %s\n"
+msgid "remote-viewer version %s"
+msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr "সংস্করণ সংক্রান্ত তথ্য প্রদর্শন করা হবে"
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr "Spice কন্ট্রোলারের যোগাব্যবস্থার মাধ্যমে সংযোগ আরম্ভ করা হবে"
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr "সংযোগ আরম্ভ করতে ব্যর্থ"
 
@@ -127,83 +128,90 @@ msgstr "কন্ট্রোলার দ্বারা প্রদর্শ�
 msgid "Controller connection failed: %s"
 msgstr "কন্ট্রোলারের সংযোগ স্থাপন করতে ব্যর্থ: %s"
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
-msgstr ""
-
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
-msgstr ""
-
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
 #: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
-msgstr ""
-
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
-msgstr ""
-
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
-msgstr "একটি Spice সেশান প্রস্তুত করতে ব্যর্থ"
-
-#: ../src/remote-viewer.c:1221
 msgid "Setting up Spice session..."
 msgstr "Spice-র সেশান প্রস্তুত করা হচ্ছে..."
 
-#: ../src/remote-viewer.c:1243
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
+msgstr ""
+
+#: ../src/remote-viewer.c:1120
 #, c-format
-msgid "Invalid file %s"
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
+#: ../src/remote-viewer.c:1128
 msgid "Cannot determine the connection type from URI"
 msgstr "URI থেকে সংযোগের ধরন নির্ধারণ করা সম্ভব নয়"
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
-msgstr "এই ধরনের জন্য সেশান প্রস্তুত করা যায়নি: %s"
-
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
+msgstr ""
+
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr "Glade পরিচিতি"
@@ -238,134 +246,136 @@ msgid ""
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
 msgstr ""
-"এটি একটি মুক্ত সফ্টওয়্যার; Free Software Foundation দ্বারা প্রকাশিত GNU General Public License-র শর্তানুযায়ী এটি বিতরণ ও পরিবর্তন করা যাবে; লাইসেন্সের সংস্করণ ২ অথবা (আপনার সুবিধানুযায়ী) ঊর্ধ্বতন কোনো সংস্করণের অধীন।\n"
+"এটি একটি মুক্ত সফ্টওয়্যার; Free Software Foundation দ্বারা প্রকাশিত GNU General "
+"Public License-র শর্তানুযায়ী এটি বিতরণ ও পরিবর্তন করা যাবে; লাইসেন্সের সংস্করণ ২ "
+"অথবা (আপনার সুবিধানুযায়ী) ঊর্ধ্বতন কোনো সংস্করণের অধীন।\n"
 "\n"
 "এই প্রোগ্রামটি বিতরণ করার মূল উদ্দেশ্য যে ব্যবহারকারীরা এর দ্বারা উপকৃত হবেন, কিন্তু \n"
-"এটির জন্য কোনো সুস্পষ্ট ওয়ারেন্টি উপস্থিত নেই; বাণিজ্যিক ও কোনো সুনির্দিষ্ট কর্ম সাধনের \n"
-"জন্য অন্তর্নিহীত ওয়ারেন্টিও অনুপস্থিত।    অধিক জানতে GNU General Public License পড়ুন।\n"
+"এটির জন্য কোনো সুস্পষ্ট ওয়ারেন্টি উপস্থিত নেই; বাণিজ্যিক ও কোনো সুনির্দিষ্ট কর্ম "
+"সাধনের \n"
+"জন্য অন্তর্নিহীত ওয়ারেন্টিও অনুপস্থিত।    অধিক জানতে GNU General Public License "
+"পড়ুন।\n"
 "\n"
-"এই প্রোগ্রামের সাথে GNU General Public License-র একটি প্রতিলিপি উপলব্ধ হওয়া উচিত; \n"
-"না থাকলে নিম্নলিখিত ঠিকানায় লিখে তা সংগ্রহ করুন Free Software Foundation, Inc., \n"
+"এই প্রোগ্রামের সাথে GNU General Public License-র একটি প্রতিলিপি উপলব্ধ হওয়া "
+"উচিত; \n"
+"না থাকলে নিম্নলিখিত ঠিকানায় লিখে তা সংগ্রহ করুন Free Software Foundation, "
+"Inc., \n"
 "59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
 
 #: ../src/virt-viewer-about.xml.h:20
 msgid "The Fedora Translation Team"
 msgstr "Fedora-র অনুবাদকদের দল"
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr "%d প্রদর্শনের জন্য অপেক্ষা করা হচ্ছে..."
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
-msgstr "%s গেস্ট মেশিনের জন্য অজানা ধরনের গ্রাফিক"
+msgid "Unsupported graphic type '%s'"
+msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr "ssh-র সাথে সংযোগ করতে ব্যর্থ।"
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr "চ্যানেলের সাথে সংযোগ করা যায়নি, শুধুমাত্র SSH সমর্থিত হবে।"
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr "সমর্থন বিনা চ্যানেলের সাথে সংযোগ করা হবে।"
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr "গ্রাফিক সার্ভারের সাথে সংযোগ স্থাপন করা হচ্ছে"
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr "গেস্ট ডোমেইন বন্ধ হয়েছে"
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr "গ্রাফিক সার্ভারের সাথে সংযোগ স্থাপন করা হয়েছে"
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr "%s গ্রাফিক সার্ভারের সাথে সংযোগ স্থাপন করতে ব্যর্থ"
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
-"%s-এ উপস্থিত দূরবর্তী ডেস্কটপ সার্ভারে অনুমোদন করতে ব্যর্থ: %s\n"
-"পুনরায় সংযোগের প্রচেষ্টা করা হবে কি?"
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr "দূরবর্তী ডেস্কটপ সার্ভারের সাথে অনুমোদন করতে ব্যর্থ: %s"
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr "USB পুনর্নির্দেশে সমস্যা: %s"
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr "উইন্ডোর প্রদর্শনের মাপ, শতাংশে ব্যক্ত"
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr "ভার্বোস তথ্য প্রদর্শন করা হবে"
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr "ডিবাগ সংক্রান্ত তথ্য প্রদর্শন করা হবে"
 
@@ -383,11 +393,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr "অনুমোদন প্রয়োজন"
@@ -408,6 +420,10 @@ msgstr "ব্যবহারকারীর নাম:"
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -446,31 +462,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
+
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
 "\n"
-"ব্যবহার পদ্ধতি: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
-"\n"
-"%s\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
 "\n"
+msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr "পুনর্নির্দেশের জন্য USB ডিভাইস নির্বাচন করুন"
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr "%d ধরনের অনুমোদন সমর্থিত নয়"
@@ -479,117 +498,127 @@ msgstr "%d ধরনের অনুমোদন সমর্থিত নয়
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr "Ctrl+Alt+_Del"
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr "Ctrl+Alt+_Backspace"
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr "Ctrl+Alt+F_1"
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr "Ctrl+Alt+F_2"
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr "Ctrl+Alt+F_3"
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr "Ctrl+Alt+F_4"
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr "Ctrl+Alt+F_5"
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr "Ctrl+Alt+F_6"
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr "Ctrl+Alt+F_7"
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr "Ctrl+Alt+F_8"
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr "Ctrl+Alt+F_9"
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr "Ctrl+Alt+F1_0"
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr "Ctrl+Alt+F11"
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr "Ctrl+Alt+F12"
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr "স্ক্রিন-শট"
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr "সংযোগ বিচ্ছেদ করুন"
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr "USB ডিভাইস নির্বাচন"
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr "সম্পূর্ণ পর্দায় প্রদর্শন থেকে প্রস্থান"
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr "%s%s%s - %s"
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr " "
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr "গেস্ট ডোমেইন পুনরায় আরম্ভের অপেক্ষা করা হচ্ছে"
 
@@ -598,59 +627,69 @@ msgstr "গেস্ট ডোমেইন পুনরায় আরম্ভ
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr "%s গেস্ট মেশিনের জন্য গ্রাফিকের ধরন নির্ধারণ করা সম্ভব নয়"
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr "%s গেস্ট মেশিনের জন্য হোস্ট নির্ধারণ করা সম্ভব নয়"
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr "গেস্ট ডোমেইন সন্ধান করা হচ্ছে"
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr "গেস্ট ডোমেইন প্রস্তুতির অপেক্ষা করা হচ্ছে"
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr "গেস্ট ডোমেইনের অবস্থা পরীক্ষা করতে ব্যর্থ"
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr "গেস্ট ডোমেইন আরম্ভের অপেক্ষা করা হচ্ছে"
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr "[শূণ্য]"
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr "ফাইল (_F)"
@@ -663,35 +702,39 @@ msgstr "স্মার্ট-কার্ড অন্তর্ভুক্ত�
 msgid "Smartcard removal"
 msgstr "স্মার্ট-কার্ড অপসারণ"
 
-#: ../src/virt-viewer.xml.h:6
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:7
 msgid "_View"
 msgstr "প্রদর্শন (_V)"
 
-#: ../src/virt-viewer.xml.h:7
+#: ../src/virt-viewer.xml.h:8
 msgid "Full screen"
 msgstr "সম্পূর্ণ পর্দায় প্রদর্শন"
 
-#: ../src/virt-viewer.xml.h:8
+#: ../src/virt-viewer.xml.h:9
 msgid "_Zoom"
 msgstr "প্রদর্শনের নাম (_Z)"
 
-#: ../src/virt-viewer.xml.h:9
+#: ../src/virt-viewer.xml.h:10
 msgid "Displays"
 msgstr "প্রদর্শনক্ষেত্র"
 
-#: ../src/virt-viewer.xml.h:10
+#: ../src/virt-viewer.xml.h:11
 msgid "Release cursor"
 msgstr "কার্সার মুক্ত করা হবে"
 
-#: ../src/virt-viewer.xml.h:11
+#: ../src/virt-viewer.xml.h:12
 msgid "_Send key"
 msgstr "কি পাঠিয়ে দিন (_S)"
 
-#: ../src/virt-viewer.xml.h:12
+#: ../src/virt-viewer.xml.h:13
 msgid "_Help"
 msgstr "সহায়তা (_H)"
 
-#: ../src/virt-viewer.xml.h:13
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -718,3 +761,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 9ec6646..379672f 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # runab <runab@redhat.com>, 2010,2012
 # runa <runabh@gmail.com>, 2012
@@ -10,18 +10,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: 2015-01-12 06:21-0500\n"
 "Last-Translator: Daniel Berrange <dan-transifex@berrange.com>\n"
-"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/virt-viewer/language/bn_IN/)\n"
+"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/virt-"
+"viewer/language/bn_IN/)\n"
+"Language: bn-IN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: bn-IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.7.3\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr "দূরবর্তী প্রদর্শন"
 
@@ -75,47 +76,46 @@ msgstr "বাইন্ড করতে ব্যবহৃত ফ্ল্যা
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
-msgstr "remote-viewer সংস্করণ %s\n"
+msgid "remote-viewer version %s"
+msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr "সংস্করণ সংক্রান্ত তথ্য প্রদর্শন করা হবে"
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr "উইন্ডো টাইটেল সেট করুন"
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr "Spice কন্ট্রোলারের যোগাব্যবস্থার মাধ্যমে সংযোগ আরম্ভ করা হবে"
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr "রিমোট ভিউয়ার ক্লায়েন্ট"
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 "%s\n"
-"কমান্ড-লাইন থেকে ব্যবহারযোগ্য সকল বিকল্পের তালিকা দেখার জন্য '%s --help' প্রয়োগ করুন।\n"
+"কমান্ড-লাইন থেকে ব্যবহারযোগ্য সকল বিকল্পের তালিকা দেখার জন্য '%s --help' প্রয়োগ "
+"করুন।\n"
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
-msgstr ""
-"ত্রুটি: Spice কনট্রোলার ব্যবহার করার সময় অতিরিক্ত আর্গুমেন্ট প্রয়োগ করা "
-"হয়েছে\n"
+msgstr "ত্রুটি: Spice কনট্রোলার ব্যবহার করার সময় অতিরিক্ত আর্গুমেন্ট প্রয়োগ করা হয়েছে\n"
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr "ত্রুটি: একাধিক URI পরিচালনা করা সম্ভব নয়\n"
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr "সংযোগ আরম্ভ করতে ব্যর্থ"
 
@@ -128,83 +128,90 @@ msgstr "কন্ট্রোলার দ্বারা প্রদর্শ�
 msgid "Controller connection failed: %s"
 msgstr "কন্ট্রোলারের সংযোগ স্থাপন করতে ব্যর্থ: %s"
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
-msgstr "সংযোগ সংক্রান্ত বিবরণ"
-
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
-msgstr "সংযোগ ঠিকানা (_C)"
-
 #: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
-msgstr "উদাহরণস্বরূপ, spice://foo.example.org:5900"
-
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
-msgstr "সাম্প্রতিক সংযোগ (_R)"
-
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
-msgstr "একটি Spice সেশান প্রস্তুত করতে ব্যর্থ"
-
-#: ../src/remote-viewer.c:1221
 msgid "Setting up Spice session..."
 msgstr "Spice-র সেশান প্রস্তুত করা হচ্ছে..."
 
-#: ../src/remote-viewer.c:1243
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
+msgstr ""
+
+#: ../src/remote-viewer.c:1120
 #, c-format
-msgid "Invalid file %s"
-msgstr "অবৈধ ফাইল %s"
+msgid "Invalid file %s: "
+msgstr ""
 
-#: ../src/remote-viewer.c:1250
+#: ../src/remote-viewer.c:1128
 msgid "Cannot determine the connection type from URI"
 msgstr "URI থেকে সংযোগের ধরন নির্ধারণ করা সম্ভব নয়"
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
-msgstr "এই ধরনের জন্য সেশান প্রস্তুত করা যায়নি: %s"
-
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
+msgstr "সংযোগ সংক্রান্ত বিবরণ"
+
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
+msgstr "উদাহরণস্বরূপ, spice://foo.example.org:5900"
+
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
+msgstr ""
+
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr "Glade পরিচিতি"
@@ -241,136 +248,138 @@ msgid ""
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
 msgstr ""
-"এটি একটি মুক্ত সফ্টওয়্যার; Free Software Foundation দ্বারা প্রকাশিত GNU General Public License-র শর্তানুযায়ী এটি বিতরণ ও পরিবর্তন করা যাবে; লাইসেন্সের সংস্করণ ২ অথবা (আপনার সুবিধানুযায়ী) ঊর্ধ্বতন কোনো সংস্করণের অধীন।\n"
+"এটি একটি মুক্ত সফ্টওয়্যার; Free Software Foundation দ্বারা প্রকাশিত GNU General "
+"Public License-র শর্তানুযায়ী এটি বিতরণ ও পরিবর্তন করা যাবে; লাইসেন্সের সংস্করণ ২ "
+"অথবা (আপনার সুবিধানুযায়ী) ঊর্ধ্বতন কোনো সংস্করণের অধীন।\n"
 "\n"
 "এই প্রোগ্রামটি বিতরণ করার মূল উদ্দেশ্য যে ব্যবহারকারীরা এর দ্বারা উপকৃত হবেন, কিন্তু \n"
-"এটির জন্য কোনো সুস্পষ্ট ওয়ারেন্টি উপস্থিত নেই; বাণিজ্যিক ও কোনো সুনির্দিষ্ট কর্ম সাধনের \n"
-"জন্য অন্তর্নিহীত ওয়ারেন্টিও অনুপস্থিত।    অধিক জানতে GNU General Public License পড়ুন।\n"
+"এটির জন্য কোনো সুস্পষ্ট ওয়ারেন্টি উপস্থিত নেই; বাণিজ্যিক ও কোনো সুনির্দিষ্ট কর্ম "
+"সাধনের \n"
+"জন্য অন্তর্নিহীত ওয়ারেন্টিও অনুপস্থিত।    অধিক জানতে GNU General Public License "
+"পড়ুন।\n"
 "\n"
-"এই প্রোগ্রামের সাথে GNU General Public License-র একটি প্রতিলিপি উপলব্ধ হওয়া উচিত; \n"
-"না থাকলে নিম্নলিখিত ঠিকানায় লিখে তা সংগ্রহ করুন Free Software Foundation, Inc., \n"
+"এই প্রোগ্রামের সাথে GNU General Public License-র একটি প্রতিলিপি উপলব্ধ হওয়া "
+"উচিত; \n"
+"না থাকলে নিম্নলিখিত ঠিকানায় লিখে তা সংগ্রহ করুন Free Software Foundation, "
+"Inc., \n"
 "59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
 
 #: ../src/virt-viewer-about.xml.h:20
 msgid "The Fedora Translation Team"
 msgstr "Fedora-র অনুবাদকদের দল"
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr "অাপনি কী সেশন বন্ধ করতে চান?"
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr "অামকে অাবার জিজ্ঞাসা করবেন না"
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr "%d প্রদর্শনের জন্য অপেক্ষা করা হচ্ছে..."
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
-msgstr "%s গেস্ট মেশিনের জন্য অজানা ধরনের গ্রাফিক"
+msgid "Unsupported graphic type '%s'"
+msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr "ssh-র সাথে সংযোগ করতে ব্যর্থ।"
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr "চ্যানেলের সাথে সংযোগ করা যায়নি, শুধুমাত্র SSH সমর্থিত হবে।"
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr "সমর্থন বিনা চ্যানেলের সাথে সংযোগ করা হবে।"
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr "গ্রাফিক সার্ভারের সাথে সংযোগ স্থাপন করা হচ্ছে"
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr "গেস্ট ডোমেইন বন্ধ হয়েছে"
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr "গ্রাফিক সার্ভারের সাথে সংযোগ স্থাপন করা হয়েছে"
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr "%s গ্রাফিক সার্ভারের সাথে সংযোগ স্থাপন করতে ব্যর্থ"
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
-"%s-এ উপস্থিত দূরবর্তী ডেস্কটপ সার্ভারে অনুমোদন করতে ব্যর্থ: %s\n"
-"পুনরায় সংযোগের প্রচেষ্টা করা হবে কি?"
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr "দূরবর্তী ডেস্কটপ সার্ভারের সাথে অনুমোদন করতে ব্যর্থ: %s"
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr "USB পুনর্নির্দেশে সমস্যা: %s"
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr "জুম মাত্রা অবশ্যই %d-%d এর মধ্যবর্তী হতে হবে\n"
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr "প্রদর্শন %d"
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr "অবৈধ kiosk-quit আর্গুমেন্ট: %s"
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr "উইন্ডোর প্রদর্শনের মাপ, শতাংশে ব্যক্ত"
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
-"সম্পূর্ণ পর্দায় প্রদর্শনের মোডে খোলা হবে (ক্লায়েন্ট সঠিক মাপে প্রদর্শনের "
-"জন্য গেস্ট সিস্টেমের রেসোলিউশন পরিবর্তন করা হয়)"
+"সম্পূর্ণ পর্দায় প্রদর্শনের মোডে খোলা হবে (ক্লায়েন্ট সঠিক মাপে প্রদর্শনের জন্য গেস্ট "
+"সিস্টেমের রেসোলিউশন পরিবর্তন করা হয়)"
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr "কাস্টোমাইজ হটকী"
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr "কিয়োস্ক মোড সক্রিয় করুন"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr "কিয়োস্ক মোডে প্রদত্ত অবস্থায় প্রস্থান করুন"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr "<never|on-disconnect>"
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr "ভার্বোস তথ্য প্রদর্শন করা হবে"
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr "ডিবাগ সংক্রান্ত তথ্য প্রদর্শন করা হবে"
 
@@ -388,11 +397,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr "অনুমোদন প্রয়োজন"
@@ -413,6 +424,10 @@ msgstr "ব্যবহারকারীর নাম:"
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -446,38 +461,40 @@ msgstr "Virt Viewer"
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options"
 msgstr ""
-"কমান্ড-লাইন থেকে ব্যবহারযোগ্য সকল বিকল্পের তালিকা দেখার জন্য '%s --help' "
-"প্রয়োগ করুন"
+"কমান্ড-লাইন থেকে ব্যবহারযোগ্য সকল বিকল্পের তালিকা দেখার জন্য '%s --help' প্রয়োগ করুন"
 
 #: ../src/virt-viewer-main.c:86
 msgid "Virtual machine graphical console"
 msgstr "ভার্চুয়াল মেশিনের গ্রাফিক্যাল কনসোল"
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
+
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
 "\n"
-"ব্যবহার পদ্ধতি: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
-"\n"
-"%s\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
 "\n"
+msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr "পুনর্নির্দেশের জন্য USB ডিভাইস নির্বাচন করুন"
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr "%d ধরনের অনুমোদন সমর্থিত নয়"
@@ -486,117 +503,127 @@ msgstr "%d ধরনের অনুমোদন সমর্থিত নয়
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr "Ctrl+Alt+_Del"
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr "Ctrl+Alt+_Backspace"
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr "Ctrl+Alt+F_1"
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr "Ctrl+Alt+F_2"
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr "Ctrl+Alt+F_3"
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr "Ctrl+Alt+F_4"
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr "Ctrl+Alt+F_5"
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr "Ctrl+Alt+F_6"
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr "Ctrl+Alt+F_7"
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr "Ctrl+Alt+F_8"
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr "Ctrl+Alt+F_9"
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr "Ctrl+Alt+F1_0"
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr "Ctrl+Alt+F11"
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr "Ctrl+Alt+F12"
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr "স্ক্রিন-শট"
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr "সংযোগ বিচ্ছেদ করুন"
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr "USB ডিভাইস নির্বাচন"
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr "সেন্ড-কি-র সংকলন"
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr "সম্পূর্ণ পর্দায় প্রদর্শন থেকে প্রস্থান"
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr "Ctrl+Alt"
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr "(পয়েন্টার মুক্ত করার জন্য %s টিপুন)"
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr "%s%s%s - %s"
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr " "
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr "এই সংযোগ সেট অাপ করতে অন্ততপক্ষে %s সংস্করণ %s প্রয়োজন"
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr "গেস্ট ডোমেইন পুনরায় আরম্ভের অপেক্ষা করা হচ্ছে"
 
@@ -605,59 +632,69 @@ msgstr "গেস্ট ডোমেইন পুনরায় আরম্ভ
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr "%s গেস্ট মেশিনের জন্য গ্রাফিকের ধরন নির্ধারণ করা সম্ভব নয়"
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr "%s গেস্ট মেশিনের জন্য হোস্ট নির্ধারণ করা সম্ভব নয়"
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr "লিবভার্ট আরম্ভের অপেক্ষা করা হচ্ছে"
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr "গেস্ট ডোমেইন সন্ধান করা হচ্ছে"
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr "গেস্ট ডোমেইন প্রস্তুতির অপেক্ষা করা হচ্ছে"
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr "গেস্ট ডোমেইনের অবস্থা পরীক্ষা করতে ব্যর্থ"
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr "গেস্ট ডোমেইন আরম্ভের অপেক্ষা করা হচ্ছে"
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr "[শূণ্য]"
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr "ফাইল (_F)"
@@ -670,35 +707,39 @@ msgstr "স্মার্ট-কার্ড অন্তর্ভুক্ত�
 msgid "Smartcard removal"
 msgstr "স্মার্ট-কার্ড অপসারণ"
 
-#: ../src/virt-viewer.xml.h:6
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:7
 msgid "_View"
 msgstr "প্রদর্শন (_V)"
 
-#: ../src/virt-viewer.xml.h:7
+#: ../src/virt-viewer.xml.h:8
 msgid "Full screen"
 msgstr "সম্পূর্ণ পর্দায় প্রদর্শন"
 
-#: ../src/virt-viewer.xml.h:8
+#: ../src/virt-viewer.xml.h:9
 msgid "_Zoom"
 msgstr "প্রদর্শনের নাম (_Z)"
 
-#: ../src/virt-viewer.xml.h:9
+#: ../src/virt-viewer.xml.h:10
 msgid "Displays"
 msgstr "প্রদর্শনক্ষেত্র"
 
-#: ../src/virt-viewer.xml.h:10
+#: ../src/virt-viewer.xml.h:11
 msgid "Release cursor"
 msgstr "কার্সার মুক্ত করা হবে"
 
-#: ../src/virt-viewer.xml.h:11
+#: ../src/virt-viewer.xml.h:12
 msgid "_Send key"
 msgstr "কি পাঠিয়ে দিন (_S)"
 
-#: ../src/virt-viewer.xml.h:12
+#: ../src/virt-viewer.xml.h:13
 msgid "_Help"
 msgstr "সহায়তা (_H)"
 
-#: ../src/virt-viewer.xml.h:13
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -725,3 +766,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/bo.po b/po/bo.po
index 0c3f443..b1b05bb 100644
--- a/po/bo.po
+++ b/po/bo.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Tibetan\n"
+"Language: bo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: bo\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/br.po b/po/br.po
index 8537c6f..40034e2 100644
--- a/po/br.po
+++ b/po/br.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Breton\n"
+"Language: br\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: br\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/brx.po b/po/brx.po
index 3648310..fd5e7b9 100644
--- a/po/brx.po
+++ b/po/brx.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Bodo\n"
+"Language: brx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: brx\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/bs.po b/po/bs.po
index b77a3cf..9776114 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -2,23 +2,24 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Bosnian\n"
+"Language: bs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: bs\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +73,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +122,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +245,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +372,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +399,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +441,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +477,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +606,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +681,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +740,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/ca.po b/po/ca.po
index afed444..be21c24 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,31 +1,33 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Robert Antoni Buj i Gelonch, 2014
+# Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2015. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
-"PO-Revision-Date: 2015-01-12 06:21-0500\n"
-"Last-Translator: Daniel Berrange <dan-transifex@berrange.com>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/virt-viewer/language/ca/)\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
+"PO-Revision-Date: 2015-11-30 06:13-0500\n"
+"Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/virt-viewer/"
+"language/ca/)\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.7.3\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
-msgstr "Visor remot"
+msgstr "Visualitzador remot"
 
 #: ../data/remote-viewer.desktop.in.h:2
 msgid "Access remote desktops"
-msgstr "Accedeix a escriptoris remots"
+msgstr "Accediu a escriptoris remots"
 
 #: ../data/virt-viewer-mime.xml.in.h:1
 msgid "Virt-Viewer connection file"
@@ -37,7 +39,7 @@ msgstr "Origen"
 
 #: ../src/gbinding.c:638
 msgid "The source of the binding"
-msgstr "L'origen de l'enllaç"
+msgstr "L'origen de la creació d'un vincle"
 
 #: ../src/gbinding.c:652
 msgid "Target"
@@ -45,7 +47,7 @@ msgstr "Destí"
 
 #: ../src/gbinding.c:653
 msgid "The target of the binding"
-msgstr "El destí de l'enllaç"
+msgstr "El destí de la creació d'un vincle"
 
 #: ../src/gbinding.c:668
 msgid "Source Property"
@@ -53,7 +55,7 @@ msgstr "Propietat de l'origen"
 
 #: ../src/gbinding.c:669
 msgid "The property on the source to bind"
-msgstr "La propietat en l'origen per enllaçar"
+msgstr "La propietat en l'origen per crear un vincle"
 
 #: ../src/gbinding.c:684
 msgid "Target Property"
@@ -61,7 +63,7 @@ msgstr "Propietat del destí"
 
 #: ../src/gbinding.c:685
 msgid "The property on the target to bind"
-msgstr "La propietat en el destí per enllaçar"
+msgstr "La propietat en el destí per crear un vincle"
 
 #: ../src/gbinding.c:699
 msgid "Flags"
@@ -69,51 +71,52 @@ msgstr "Indicadors"
 
 #: ../src/gbinding.c:700
 msgid "The binding flags"
-msgstr "Els indicadors de l'enllaç"
+msgstr "Els indicadors de la creació d'un vincle"
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
-msgstr "remote-viewer versió %s\n"
+msgid "remote-viewer version %s"
+msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr "Mostra informació de la versió"
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr "Estableix el títol de la finestra"
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr "Obre la connexió mitjançant la comunicació del controlador Spice"
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
-msgstr "Client del visor remot"
+msgstr "Client del visualitzador remot"
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 "%s\n"
-"Executeu '%s --help' per visualitzar el llistat complet d'opcions disponibles per a la línia d'ordres\n"
+"Executeu '%s --help' per visualitzar el llistat complet d'opcions "
+"disponibles per a la línia d'ordres\n"
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
-"S'ha produït un error: s'han proporcionat arguments extra mentre s'estava "
-"utilitzant el controlador Spice\n"
+"Error: s'han proporcionat arguments extres mentre s'estava utilitzant el "
+"controlador Spice\n"
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr "S'ha produït un error: no es poden gestionar múltiples URI\n"
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr "S'ha produït un error en inicialitzar la connexió"
 
@@ -126,83 +129,90 @@ msgstr "La pantalla està desactivada pel controlador"
 msgid "Controller connection failed: %s"
 msgstr "La connexió amb el controlador ha fallat: %s"
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
-msgstr ""
+msgstr "_Canvia CD"
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
+msgstr "S'ha produït un error en analitzar sintàcticament la uri d'ovirt"
+
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
-msgstr ""
+msgstr "La MV oVirt %s no s'està executant"
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
-msgstr ""
+msgstr "La MV oVirt %s no té cap pantalla"
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
-msgstr ""
-
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
-msgstr "Detalls de la connexió"
-
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
-msgstr "Adreça de la _connexió"
+msgid "oVirt VM %s has unknown display type: %d"
+msgstr "La MV oVirt %s té un tipus desconegut de pantalla: %d"
 
 #: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
-msgstr "Per exemple, spice://foo.exemple.cat:5900"
-
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
-msgstr "Connexions _recents"
-
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
-msgstr "No s'ha pogut crer una sessió Spice"
-
-#: ../src/remote-viewer.c:1221
 msgid "Setting up Spice session..."
 msgstr "S'està preparant la sessió Spice..."
 
-#: ../src/remote-viewer.c:1243
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
+msgstr ""
+
+#: ../src/remote-viewer.c:1120
 #, c-format
-msgid "Invalid file %s"
-msgstr "El fitxer %s no és vàlid"
+msgid "Invalid file %s: "
+msgstr ""
 
-#: ../src/remote-viewer.c:1250
+#: ../src/remote-viewer.c:1128
 msgid "Cannot determine the connection type from URI"
 msgstr "No s'ha pogut determinar el tipus de connexió des de la URI"
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
-msgstr "No s'ha pogut crear la sessió per aquest tipus: %s"
-
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
+msgstr "Detalls de la connexió"
+
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
+msgstr "Per exemple, spice://foo.exemple.cat:5900"
+
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
+msgstr ""
+
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr "Quant a Glade"
@@ -241,127 +251,136 @@ msgid ""
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
 msgstr ""
+"Aquest programa és programari lliure; el podeu redistribuir i/o modificar\n"
+"d'acord amb els termes de la Llicència pública general de GNU tal com\n"
+"la publica la Free Software Foundation; amb la versió 2 de la Llicència,  o\n"
+"(si ho preferiu) amb qualsevol versió posterior.\n"
+"\n"
+"Aquest programa es distribueix amb l'esperança que us sigui útil, però\n"
+"SENSE CAP GARANTIA; ni tan sols amb la garantia de COMERCIALITZACIÓ\n"
+"o APTITUD PER A PROPÒSITS DETERMINATS.  Vegeu la Llicència pública\n"
+"general de GNU per a més detalls.\n"
+"\n"
+"Hauríeu d'haver rebut una còpia de la llicència pública general de GNU\n"
+"amb aquest programa; si no fos així, escriviu a la Free Software\n"
+"Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\n"
 
 #: ../src/virt-viewer-about.xml.h:20
 msgid "The Fedora Translation Team"
-msgstr "L'equip de traducció de Fedora"
+msgstr "Robert Antoni Buj i Gelonch <rbuj@fedoraproject.og>"
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr "Voleu tancar la sessió?"
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr "No m'ho tornis a preguntar"
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr "A l'espera de la pantalla %d..."
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr "La connexió per ssh ha fallat."
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr "No s'ha pogut connectar al canal, únicament és compatible amb SSH."
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr "La connexió al canal no és compatible."
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
-msgstr ""
+msgstr "La pantalla únicament pot adjuntar-se a través de libvirt amb --attach"
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr "S'està connectant al servidor gràfic"
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
-msgstr "S'ha apagat el domini de l'hoste"
+msgstr "S'ha apagat el domini del convidat"
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr "S'ha connectat al servidor gràfic"
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr "No s'ha pogut connectar amb el servidor gràfic %s"
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
-"No s'ha pogut autentificar amb el servidor d'escriptori remot a %s: %s\n"
-"Voleu tornar a intentar la connexió?"
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr "No s'ha pogut autentificar amb el servidor d'escriptori remot: %s"
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr "S'ha produït un error en la redirecció USB: %s"
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr "El nivell del zoom ha d'estar dins del rang %d-%d\n"
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
-msgstr "Mostra %d"
+msgstr "Pantalla %d"
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr "Argument no vàlid de kiosk-quit: %s"
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr "Nivell de zoom de la finestra, en percentatge"
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
-"Obre en mode de pantalla completa (Ajusta la resolució de l'hoste per "
+"Obre en mode de pantalla completa (ajusta la resolució del convidat per "
 "adaptar-se al client)"
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr "Personalitza les dreceres de teclat"
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr "Activa el mode quiosc"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr "Surt del mode quiosc en una condició donada"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr "<never|on-disconnect>"
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr "Mostra informació detallada"
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr "Mostra informació de depuració"
 
@@ -373,17 +392,23 @@ msgid ""
 "<b>%s</b>\n"
 "\n"
 msgstr ""
+"Es requereix autentificació per a la connexió %s a:\n"
+"\n"
+"<b>%s</b>\n"
+"\n"
 
 #: ../src/virt-viewer-auth.c:92
 #, c-format
 msgid "Authentication is required for the %s connection:\n"
-msgstr ""
+msgstr "Es requereix autentificació per a la connexió %s:\n"
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr "Es requereix autenticació"
@@ -402,6 +427,10 @@ msgstr "Nom d'usuari:"
 
 #: ../src/virt-viewer-auth.xml.h:5
 msgid "Show password"
+msgstr "Mostra la contrasenya"
+
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
 msgstr ""
 
 #: ../src/virt-viewer-main.c:38
@@ -444,275 +473,318 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr "Consola gràfica de la màquina virtual"
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
+
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
 "\n"
-"Ús: %s [OPCIONS] NOM-DOMINI|ID|UUID\n"
-"\n"
-"%s\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
 "\n"
+msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
-msgstr ""
+msgstr "La contrasenya no és vàlida"
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
-msgstr "Selecciona els dispositius USB per a la redirecció"
+msgstr "Seleccioneu els dispositius USB per a la redirecció"
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr "El tipus d'autenticació no és compatible %d"
 
 #: ../src/virt-viewer-vm-connection.c:64
 msgid "No virtual machine found"
+msgstr "No s'han trobat màquines virtuals"
+
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
-msgstr ""
+msgstr "Ctrl+Alt+_ Supr"
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr "Ctrl+Alt+_Retrocés"
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr "Ctrl+Alt+F_1"
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr "Ctrl+Alt+F_2"
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr "Ctrl+Alt+F_3"
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr "Ctrl+Alt+F_4"
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr "Ctrl+Alt+F_5"
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr "Ctrl+Alt+F_6"
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr "Ctrl+Alt+F_7"
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr "Ctrl+Alt+F_8"
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr "Ctrl+Alt+F_9"
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr "Ctrl+Alt+F1_0"
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr "Ctrl+Alt+F11"
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr "Ctrl+Alt+F12"
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr "Captura de pantalla"
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
-msgstr ""
+msgstr "Desconegut"
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr "Desconnecta"
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr "Selecció del dispositiu USB"
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr "Envia una combinació de tecles"
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr "Deixa la pantalla completa"
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr "Ctrl+Alt"
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr "(Premeu %s per alliberar el punter)"
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
-msgstr ""
+msgstr "%s%s%s - %s"
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
+msgstr " "
+
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr "Com a mínim es necessita %s versió %s per preparar aquesta connexió"
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
-msgstr "A l'espera del domini de l'hoste per tornar a iniciar"
+msgstr "A l'espera del domini del convidat per tornar a iniciar"
 
 #: ../src/virt-viewer.c:409
 #, c-format
 msgid "Cannot determine the graphic type for the guest %s"
-msgstr "No es pot determinar el tipus de gràfics per a l'hoste %s"
+msgstr "No es pot determinar el tipus de gràfics per al convidat %s"
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
-msgstr "No s'ha pogut determinar l'amfitrió per a l'hoste %s"
+msgstr "No s'ha pogut determinar l'amfitrió per al convidat %s"
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
-msgstr ""
+msgstr "El convidat «%s» no és accessible"
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
-msgstr ""
+msgstr "La màquina virtual %s no s'està executant"
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr "A l'espera de libvirt per iniciar"
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
-msgstr "S'està cercant el domini de l'hoste"
+msgstr "S'està cercant el domini del convidat"
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
-msgstr "A l'espera de la creació del domini de l'hoste"
+msgstr "A l'espera de la creació del domini del convidat"
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
-msgstr "S'està comprovant l'estat del domini de l'hoste"
+msgstr "S'està comprovant l'estat del domini del convidat"
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
-msgstr "A l'espera del domini de l'hoste per iniciar"
+msgstr "A l'espera del domini del convidat a iniciar"
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
-msgstr ""
+msgstr "No s'ha pogut connectar a libvirt amb l'URI: %s."
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr "[cap]"
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
+msgstr "L'autentificació ha fallat."
+
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr "_Fitxer"
 
 #: ../src/virt-viewer.xml.h:4
 msgid "Smartcard insertion"
-msgstr "Inserció d'una smartcard"
+msgstr "Inserció d'una targeta intel·ligent"
 
 #: ../src/virt-viewer.xml.h:5
 msgid "Smartcard removal"
-msgstr "Extracció d'una smartcard"
+msgstr "Extracció d'una targeta intel·ligent"
+
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
+msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
+#: ../src/virt-viewer.xml.h:7
 msgid "_View"
 msgstr "_Visualitza"
 
-#: ../src/virt-viewer.xml.h:7
+#: ../src/virt-viewer.xml.h:8
 msgid "Full screen"
 msgstr "Pantalla completa"
 
-#: ../src/virt-viewer.xml.h:8
+#: ../src/virt-viewer.xml.h:9
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../src/virt-viewer.xml.h:9
+#: ../src/virt-viewer.xml.h:10
 msgid "Displays"
 msgstr "Pantalles"
 
-#: ../src/virt-viewer.xml.h:10
+#: ../src/virt-viewer.xml.h:11
 msgid "Release cursor"
 msgstr "Allibera el cursor"
 
-#: ../src/virt-viewer.xml.h:11
+#: ../src/virt-viewer.xml.h:12
 msgid "_Send key"
-msgstr "Envia una _tecla"
+msgstr "Envia _tecles"
 
-#: ../src/virt-viewer.xml.h:12
+#: ../src/virt-viewer.xml.h:13
 msgid "_Help"
 msgstr "A_juda"
 
-#: ../src/virt-viewer.xml.h:13
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
-msgstr ""
+msgstr "_Detalls del convidat"
 
 #: ../src/virt-viewer-guest-details.xml.h:1
 msgid "Guest Details"
-msgstr ""
+msgstr "Detalls del convidat"
 
 #: ../src/virt-viewer-guest-details.xml.h:2
 msgid "Name:"
-msgstr ""
+msgstr "Nom:"
 
 #: ../src/virt-viewer-guest-details.xml.h:3
 msgid "GUID:"
-msgstr ""
+msgstr "GUID:"
 
 #: ../src/virt-viewer-vm-connection.xml.h:1
 msgid "Choose a virtual machine"
-msgstr ""
+msgstr "Trieu una màquina virtual"
 
 #: ../src/virt-viewer-vm-connection.xml.h:2
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
+msgstr "Màquines virtuals disponibles"
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
 msgstr ""
diff --git a/po/cs.po b/po/cs.po
index dfd2232..3e575cd 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Czech\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/cy.po b/po/cy.po
index bf71def..2551e76 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -2,23 +2,24 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Welsh\n"
+"Language: cy\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cy\n"
-"Plural-Forms: nplurals=4; plural= (n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3\n"
+"Plural-Forms: nplurals=4; plural= (n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != "
+"11) ? 2 : 3\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +73,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +122,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +245,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +372,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +399,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +441,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +477,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +606,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +681,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +740,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/da.po b/po/da.po
index 22edf73..1f8aafe 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Danish\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/de.po b/po/de.po
index d624a38..6ed7342 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Automatically generated, 2010
 # Fabian Affolter <fab@fedoraproject.org>, 2012,2014
@@ -13,28 +13,30 @@
 # Rainer Gromansperg <rgromans@redhat.com>, 2013
 # Roman Spirgi <bigant@fedoraproject.org>, 2012
 # noxin <transifex.com@davidmainzer.com>, 2013
+# Roman Spirgi <rspirgi@gmail.com>, 2015. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
-"PO-Revision-Date: 2015-01-12 06:21-0500\n"
-"Last-Translator: Daniel Berrange <dan-transifex@berrange.com>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/virt-viewer/language/de/)\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
+"PO-Revision-Date: 2015-05-26 09:30-0400\n"
+"Last-Translator: Roman Spirgi <rspirgi@gmail.com>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/virt-viewer/"
+"language/de/)\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.7.3\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr "Remote-Viewer"
 
 #: ../data/remote-viewer.desktop.in.h:2
 msgid "Access remote desktops"
-msgstr "Zugriff auf Remote-Desktop"
+msgstr "Zugriff auf Remote-Desktops"
 
 #: ../data/virt-viewer-mime.xml.in.h:1
 msgid "Virt-Viewer connection file"
@@ -82,47 +84,47 @@ msgstr "Die Bindungs-Flags"
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
-msgstr "Remote-Viewer Version %s\n"
+msgid "remote-viewer version %s"
+msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr "Versionsinformationen anzeigen"
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr "Titel des Window setzen"
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr "Verbindung öffnen unter Verwendung der Spice-Kontroller-Kommunikation"
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 "%s\n"
-"Führen Sie '%s --help' aus, zum Anzeigen aller verfügbaren Kommandozeilen-Optionen\n"
+"Führen Sie '%s --help' aus, zum Anzeigen aller verfügbaren Kommandozeilen-"
+"Optionen\n"
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
-"Fehler: Zusätzliche Parameter bei Verwendung von Spice-Controller "
-"angegeben\n"
+"Fehler: Zusätzliche Parameter bei Verwendung von Spice-Controller angegeben\n"
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr "Fehler: Multiple URIs können nicht verarbeitet werden\n"
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr "Initiieren der Verbindung fehlgeschlagen"
 
@@ -135,83 +137,90 @@ msgstr "Anzeige vom Kontroller deaktiviert"
 msgid "Controller connection failed: %s"
 msgstr "Kontroller-Verbindung fehlgeschlagen: %s"
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
-msgstr ""
-
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
-msgstr "Verbindungsdetails"
-
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
 #: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
-msgstr ""
-
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
-msgstr ""
-
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
-msgstr "Spice-Sitzung konnte nicht erstellt werden"
-
-#: ../src/remote-viewer.c:1221
 msgid "Setting up Spice session..."
 msgstr "Einrichten der Spice-Sitzung ..."
 
-#: ../src/remote-viewer.c:1243
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
+msgstr ""
+
+#: ../src/remote-viewer.c:1120
 #, c-format
-msgid "Invalid file %s"
-msgstr "Ungültige Datei %s"
+msgid "Invalid file %s: "
+msgstr ""
 
-#: ../src/remote-viewer.c:1250
+#: ../src/remote-viewer.c:1128
 msgid "Cannot determine the connection type from URI"
 msgstr "Verbindungstyp konnte nicht von URI ermittelt werden"
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
-msgstr "Sitzung für diesen Typ konnte nicht erstellt werden: %s"
-
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
+msgstr "Verbindungsdetails"
+
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
+msgstr ""
+
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr "Über Glade"
@@ -266,123 +275,119 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr "Das Fedora Übersetzungs-Team"
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr "Möchten Sie die Sitzung beenden?"
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr "Nicht noch einmal nachfragen"
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr "Warten auf Anzeige %d ..."
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
-msgstr "Unbekannter Grafiktyp für Gast %s"
+msgid "Unsupported graphic type '%s'"
+msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr "Verbindung über SSH ist fehlgeschlagen."
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 "Zu dem Kanal konnte nicht verbunden werden, es wird nur SSH unterstützt"
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr "Verbindung zu dem Kanal wird nicht unterstützt."
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr "Verbinden mit Grafikserver"
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr "Gast-Domain wurde beendet"
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr "Verbunden mit Grafikserver"
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr "Verbindung zum Grafik-Server %s konnte nicht hergestellt werden"
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
-"Authentifikation beim Remote-Desktop-Server unter %s fehlgeschlagen: %s\n"
-"Verbindung erneut versuchen?"
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr "Authentifikation beim Remote-Desktop-Server fehlgeschlagen: %s"
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr "USB-Weiterleitungsfehler: %s"
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr "Zoom-Level muss zwischen %d-%d sein\n"
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr "%d anzeigen"
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr "Ungültiger kiosk-quit Parameter: %s"
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr "Zoomlevel des Fensters in Prozent"
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 "Im Vollbildmodus öffnen (Die Auflösung des Gast-Systems entsprechend "
 "angepasst an)."
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr "eigene angepasste Hotkeys"
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr "Kiosk Modus ermöglichen"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr "Beenden bei bestimmter Bedingung im Kiosk-Modus"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr "<never|on-disconnect>"
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr "Ausführliche Informationen anzeigen"
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr "Debugging-Informationen anzeigen"
 
@@ -400,11 +405,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr "Authentifikation erforderlich"
@@ -425,6 +432,10 @@ msgstr "Benutzername:"
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -465,31 +476,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
+
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
 "\n"
-"Verwendung: %s [OPTIONEN] DOMAIN-NAME|ID|UUID\n"
-"\n"
-"%s\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
 "\n"
+msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr "USB-Gerät zur Weiterleitung wählen"
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr "Nicht unterstützter Authentifikationsstyp %d"
@@ -498,119 +512,129 @@ msgstr "Nicht unterstützter Authentifikationsstyp %d"
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr "Strg+Alt+_Entf"
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr "Strg+Alt+_Rücktaste"
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr "Strg+Alt+F_1"
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr "Strg+Alt+F_2"
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr "Strg+Alt+F_3"
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr "Strg+Alt+F_4"
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr "Strg+Alt+F_5"
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr "Strg+Alt+F_6"
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr "Strg+Alt+F_7"
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr "Strg+Alt+F_8"
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr "Strg+Alt+F_9"
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr "Strg+Alt+F1_0"
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr "Strg+Alt+F11"
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr "Strg+Alt+F12"
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr "Screenshot"
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr "Verbindung trennen"
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr "USB-Geräteauswahl"
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr "Tastenkombination senden"
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr "Vollbildmodus verlassen"
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr "Strg+Alt"
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr "(Drücken Sie %s, um den Mauszeiger freizugeben)"
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr "%s%s%s - %s"
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr " "
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 "Es wird mindestens %s in der Version %s benötigt, um eine Verbindung "
 "aufzubauen"
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr "Warten auf Neustart der Domain"
 
@@ -619,59 +643,69 @@ msgstr "Warten auf Neustart der Domain"
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr "Grafiktyp für den Gast %s konnte nicht ermittelt werden "
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr "Host für den Gast %s konnte nicht ermittelt werden"
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr "Auf den Start von libvirt wird gewartet"
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr "Suchen der Gast-Domain"
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr "Warten auf Erstellung der Gast-Domain"
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr "Prüfen des Gast-Domain-Status"
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr "Warten auf Start der Gast-Domain"
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr "[keine]"
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr "_Datei"
@@ -684,35 +718,39 @@ msgstr "Smartcard-Eingabe"
 msgid "Smartcard removal"
 msgstr "Smartcard-Entfernung"
 
-#: ../src/virt-viewer.xml.h:6
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:7
 msgid "_View"
 msgstr "_Ansicht"
 
-#: ../src/virt-viewer.xml.h:7
+#: ../src/virt-viewer.xml.h:8
 msgid "Full screen"
 msgstr "Vollbild"
 
-#: ../src/virt-viewer.xml.h:8
+#: ../src/virt-viewer.xml.h:9
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../src/virt-viewer.xml.h:9
+#: ../src/virt-viewer.xml.h:10
 msgid "Displays"
 msgstr "Anzeigen"
 
-#: ../src/virt-viewer.xml.h:10
+#: ../src/virt-viewer.xml.h:11
 msgid "Release cursor"
 msgstr "Cursor freigeben"
 
-#: ../src/virt-viewer.xml.h:11
+#: ../src/virt-viewer.xml.h:12
 msgid "_Send key"
 msgstr "_Taste senden"
 
-#: ../src/virt-viewer.xml.h:12
+#: ../src/virt-viewer.xml.h:13
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../src/virt-viewer.xml.h:13
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -739,3 +777,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/de_CH.po b/po/de_CH.po
index 167502c..8ab979f 100644
--- a/po/de_CH.po
+++ b/po/de_CH.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: German (Switzerland)\n"
+"Language: de-CH\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de-CH\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/el.po b/po/el.po
index ec1cda8..3960ea1 100644
--- a/po/el.po
+++ b/po/el.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Greek\n"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/en_GB.po b/po/en_GB.po
index dea2206..fead5ef 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English (United Kingdom)\n"
+"Language: en-GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: en-GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/eo.po b/po/eo.po
index dc44a74..999d8d2 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Esperanto\n"
+"Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/es.po b/po/es.po
index d3cce73..7cab4b1 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Adolfo Jayme Barrientos <fito@libreoffice.org>, 2012
 # vareli <ehespinosa@ya.com>, 2013-2014
@@ -12,24 +12,26 @@
 # Luis Bazán <lbazan@fedoraproject.org>, 2013
 # Manuel Eduardo Ospina Sarmiento <mospina@localhost.localdomain>, 2010
 # Manuel Ospina <mospina@redhat.com>, 2010
+# Abdel G. Martínez L. <abdel.g.martinez.l@gmail.com>, 2015. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
-"PO-Revision-Date: 2015-01-12 06:21-0500\n"
-"Last-Translator: Daniel Berrange <dan-transifex@berrange.com>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/virt-viewer/language/es/)\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
+"PO-Revision-Date: 2015-04-17 10:00-0400\n"
+"Last-Translator: Abdel G. Martínez L. <abdel.g.martinez.l@gmail.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/virt-viewer/"
+"language/es/)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.7.3\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
-msgstr "Visor remoto"
+msgstr "Visor Remoto"
 
 #: ../data/remote-viewer.desktop.in.h:2
 msgid "Access remote desktops"
@@ -57,7 +59,7 @@ msgstr "El destino de la conexión"
 
 #: ../src/gbinding.c:668
 msgid "Source Property"
-msgstr "Propiedad de fuente"
+msgstr "Propiedad de la Fuente"
 
 #: ../src/gbinding.c:669
 msgid "The property on the source to bind"
@@ -65,7 +67,7 @@ msgstr "La propiedad en la fuente que va a conectar"
 
 #: ../src/gbinding.c:684
 msgid "Target Property"
-msgstr "Propiedad de destino"
+msgstr "Propiedad de Destino"
 
 #: ../src/gbinding.c:685
 msgid "The property on the target to bind"
@@ -81,49 +83,50 @@ msgstr "Indicadores de conexión"
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
-msgstr "remote-viewer versión %s\n"
+msgid "remote-viewer version %s"
+msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr "Mostrar información de versión"
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr "Fijar el título de ventana"
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr "Abra la conexión mediante el controlador de comunicación Spice "
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr "Cliente de visor remoto"
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
-"%s Corriendo ‘%s –help’ para ver una lista completa de las opciones "
-"disponibles de línea de comando\n"
+"Ejecute '%s --help' para ver una lista completa de opciones de línea de "
+"comandos disponibles\n"
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
-"Error: argumentos adicionales proporcionados mediante el controlador de Spice\n"
+"Error: argumentos adicionales proporcionados mediante el controlador de "
+"Spice\n"
 "\n"
 "\n"
 "\n"
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
-msgstr "Error: no  se puede manipular URl\n"
+msgstr "Error: no  se puede manipular múltiples URIs\n"
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr "No se pudo inicializar la conexión"
 
@@ -136,83 +139,90 @@ msgstr "Pantalla desactivada por el controlador"
 msgid "Controller connection failed: %s"
 msgstr "No se pudo conectar al controlador: %s"
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
-msgstr ""
+msgstr "_Cambiar CD"
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
+msgstr "fallo en análisis uri de ovirt"
+
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
-msgstr ""
+msgstr "la MV oVirt %s no está ejecutándose"
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
-msgstr ""
+msgstr "la MV oVirt %s no tiene monitor"
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
-msgstr ""
-
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
-msgstr "Información de conexión"
-
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
-msgstr "_Dirección de Conexión"
+msgid "oVirt VM %s has unknown display type: %d"
+msgstr "la MV oVirt %s tiene un tipo de monitor desconocido: %d"
 
 #: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
-msgstr "Por ejemplo, spice://foo.example.org:5900"
-
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
-msgstr "_Conexiones Recientes"
-
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
-msgstr "No se pudo crear una sesión de Spice"
-
-#: ../src/remote-viewer.c:1221
 msgid "Setting up Spice session..."
 msgstr "Configurando sesión de Spice…"
 
-#: ../src/remote-viewer.c:1243
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
+msgstr ""
+
+#: ../src/remote-viewer.c:1120
 #, c-format
-msgid "Invalid file %s"
-msgstr "Fichero no válido %s"
+msgid "Invalid file %s: "
+msgstr ""
 
-#: ../src/remote-viewer.c:1250
+#: ../src/remote-viewer.c:1128
 msgid "Cannot determine the connection type from URI"
 msgstr "No se puede determinar el tipo de conexión de la URI"
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
-msgstr "No se pudo crear una sesión para este tipo: %s"
-
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
+msgstr "Detalles de conexión"
+
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
+msgstr "Por ejemplo, spice://foo.example.org:5900"
+
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
+msgstr ""
+
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr "Acerca de Glade"
@@ -250,132 +260,136 @@ msgid ""
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
 msgstr ""
-"Este programa es de software libre; puede distribuirlo y modificarlo bajo los términos de la Licencia Pública General de GNU publicada por la Free Software Foundation, ya sea la versiṕn 2 de la licencia o (su opción) una versión posterior.\n"
+"Este programa es de software libre; puede distribuirlo y modificarlo bajo "
+"los términos de la Licencia Pública General de GNU publicada por la Free "
+"Software Foundation, ya sea la versiṕn 2 de la licencia o (su opción) una "
+"versión posterior.\n"
 "\n"
-"Este programa se distribuye con la esperanza de que será útil, pero SIN NINGUNA GARANTÍA, incluso sin la garantía implícita de comerciabilidad o IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Ver la GNU General Public License para más detalles. ⏎ \n"
+"Este programa se distribuye con la esperanza de que será útil, pero SIN "
+"NINGUNA GARANTÍA, incluso sin la garantía implícita de comerciabilidad o "
+"IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Ver la GNU General Public License "
+"para más detalles. \n"
 "\n"
-"Debe de haber recibido una copia de la Licencia Pública General de GNU junto con este programa, si no, escriba a la Free Software  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 EE.UU. \n"
+"Debe de haber recibido una copia de la Licencia Pública General de GNU junto "
+"con este programa, si no, escriba a la Free Software  Foundation, Inc., 59 "
+"Temple Place, Suite 330, Boston, MA 02111-1307 EE.UU. \n"
 
 #: ../src/virt-viewer-about.xml.h:20
 msgid "The Fedora Translation Team"
-msgstr "El equipo de traducción de Fedora"
+msgstr "El Equipo de Traducción de Fedora"
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr "¿Quiere cerrar la sesión?"
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr "No me pregunte otra vez"
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
-msgstr "Esperando la pantalla %d…"
+msgstr "Esperando el monitor %d…"
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
-msgstr "Tipo de gráficos desconocido para el huésped %s"
+msgid "Unsupported graphic type '%s'"
+msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr "Falló la conexión a ssh."
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr "No se puede conectar al canal, solo se permite SSH."
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr "La conexión al canal no está soportada."
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
-msgstr ""
+msgstr "La pantalla solo puede ser unida a través de libvirt con --attach"
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr "Conectando al servidor gráfico"
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr "Dominio de huéspedes se ha apagado"
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr "Conectado al servidor gráfico"
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr "No se pudo conectar al servidor gráfico %s"
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
-"No se puede autenticar con el servidor de escritorio remoto en %s: %s⏎ \n"
-"¿Reintentar la conexión?"
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr "No se puede autenticar con el servidor del escritorio remoto: %s"
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr "Error de redirección USB: %s"
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
-msgstr "Nivel de zoom debe estar dentro de %d-%d\n"
+msgstr "Nivel de enfoque debe estar dentro de %d-%d\n"
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
-msgstr "Visualizar %d"
+msgstr "Monitor %d"
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr "Argumento kiosk-quit no válido: %s"
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
-msgstr "Aumentar acercamiento de ventana, en porcentaje"
+msgstr "Nivel de enfoque de ventana, en porcentaje"
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
-"Abrir en modo pantalla completa (ajuste la resolución del invitado para que "
+"Abrir en modo pantalla completa (ajusta la resolución del invitado para que "
 "encaje con el cliente)"
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr "Personalizar teclas calientes"
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
-msgstr "Activar el modo kiosk"
+msgstr "Activar el modo kiosco"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
-msgstr "Abandonar sobre condición dada en modo kiosk"
+msgstr "Abandonar sobre condición dada en modo kiosco"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
-msgstr "<nunca | en-desconexión>"
+msgstr "<never|on-disconnect>"
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr "Mostrar información detallada"
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr "Mostrar información de depuración"
 
@@ -387,20 +401,26 @@ msgid ""
 "<b>%s</b>\n"
 "\n"
 msgstr ""
+"Autenticación es requerida para la conexión %s para:\n"
+"\n"
+"<b>%s</b>\n"
+"\n"
 
 #: ../src/virt-viewer-auth.c:92
 #, c-format
 msgid "Authentication is required for the %s connection:\n"
-msgstr ""
+msgstr "Autenticación es requerida para la conexión %s:\n"
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
-msgstr "Se necesita autenticación"
+msgstr "Autenticación requerida"
 
 #: ../src/virt-viewer-auth.xml.h:2 ../src/virt-viewer-guest-details.xml.h:4
 msgid "label"
@@ -416,6 +436,10 @@ msgstr "Nombre de usuario:"
 
 #: ../src/virt-viewer-auth.xml.h:5
 msgid "Show password"
+msgstr "Mostrar contraseña"
+
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
 msgstr ""
 
 #: ../src/virt-viewer-main.c:38
@@ -451,157 +475,170 @@ msgstr "Virt Viewer"
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options"
 msgstr ""
-"Corriendo ‘%s –help’ para ver una lista completa de las opciones disponibles"
-" de línea de comando"
+"Ejecutando ‘%s –help’ puede ver una lista completa de las opciones "
+"disponibles de líneas de comando"
 
 #: ../src/virt-viewer-main.c:86
 msgid "Virtual machine graphical console"
 msgstr "Consola gráfica de la máquina virtual"
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
+
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
 "\n"
-"Uso: %s [OPCIONES] DOMINIO-NOMBRE|ID|UUID\n"
-"\n"
-"%s\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
 "\n"
+msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
-msgstr ""
+msgstr "Contraseña inválida"
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr "Seleccione los dispositivos USB para redirigir"
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr "Tipo de autenticación no compatible %d"
 
 #: ../src/virt-viewer-vm-connection.c:64
 msgid "No virtual machine found"
+msgstr "Máquina virtual no encontrada"
+
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr "Ctrl+Alt+_Supr"
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr "Ctrl+Alt+_Retroceso"
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr "Ctrl+Alt+F_1"
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr "Ctrl+Alt+F_2"
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr "Ctrl+Alt+F_3"
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr "Ctrl+Alt+F_4"
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr "Ctrl+Alt+F_5"
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr "Ctrl+Alt+F_6"
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr "Ctrl+Alt+F_7"
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr "Ctrl+Alt+F_8"
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr "Ctrl+Alt+F_9"
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr "Ctrl+Alt+F1_0"
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr "Ctrl+Alt+F11"
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr "Ctrl+Alt+F12"
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr "Captura de pantalla"
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
-msgstr ""
+msgstr "Desconocido"
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr "Desconectar"
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr "Selección de dispositivos USB"
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr "Enviar combinación de teclas"
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr "Salir de pantalla completa"
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr "Ctrl+Alt"
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr "(Presione %s para liberar el  puntero)"
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr "%s%s%s - %s"
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr " "
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
-msgstr "Por lo menos %s versión %s se requiere para configurar esta conexión"
+msgstr "Al menos la %s versión %s es requerida para configurar esta conexión"
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr "Esperando a que el dominio de huéspedes reinicie"
 
@@ -610,123 +647,153 @@ msgstr "Esperando a que el dominio de huéspedes reinicie"
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr "No se puede determinar el tipo de gráficos para el huésped %s"
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr "No se puede determinar el anfitrión para el huésped %s"
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
-msgstr ""
+msgstr "Huésped '%s' no está alcanzable"
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
-msgstr ""
+msgstr "Máquina virtual %s no está en ejecución"
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr "Esperando a libvirt para inicio"
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr "Buscando dominio de huéspedes"
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr "Esperando a que el dominio de huéspedes sea creado"
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr "Comprobando el estatus del dominio de huéspedes"
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr "Esperando a que dominio de huéspedes inicie"
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
-msgstr ""
+msgstr "No puede conectarse a libvirt con URI: %s."
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr "[ninguno]"
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
+msgstr "Fallo de autenticación."
+
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
-msgstr "_Archivo"
+msgstr "_Fichero"
 
 #: ../src/virt-viewer.xml.h:4
 msgid "Smartcard insertion"
-msgstr "Inserción de Smartcard"
+msgstr "Inserción de smartcard"
 
 #: ../src/virt-viewer.xml.h:5
 msgid "Smartcard removal"
-msgstr "Retiro de Smartcard"
+msgstr "Retiro de smartcard"
+
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
+msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
+#: ../src/virt-viewer.xml.h:7
 msgid "_View"
 msgstr "_Ver"
 
-#: ../src/virt-viewer.xml.h:7
+#: ../src/virt-viewer.xml.h:8
 msgid "Full screen"
 msgstr "Pantalla completa"
 
-#: ../src/virt-viewer.xml.h:8
+#: ../src/virt-viewer.xml.h:9
 msgid "_Zoom"
-msgstr "_Zoom"
+msgstr "_Enfoque"
 
-#: ../src/virt-viewer.xml.h:9
+#: ../src/virt-viewer.xml.h:10
 msgid "Displays"
 msgstr "Pantallas"
 
-#: ../src/virt-viewer.xml.h:10
+#: ../src/virt-viewer.xml.h:11
 msgid "Release cursor"
-msgstr "Libere el cursor"
+msgstr "Liberar cursor"
 
-#: ../src/virt-viewer.xml.h:11
+#: ../src/virt-viewer.xml.h:12
 msgid "_Send key"
 msgstr "_Enviar llave"
 
-#: ../src/virt-viewer.xml.h:12
+#: ../src/virt-viewer.xml.h:13
 msgid "_Help"
-msgstr "Ay_uda"
+msgstr "_Ayuda"
 
-#: ../src/virt-viewer.xml.h:13
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
-msgstr ""
+msgstr "_Detalles de Huésped"
 
 #: ../src/virt-viewer-guest-details.xml.h:1
 msgid "Guest Details"
-msgstr ""
+msgstr "Detalles de Huésped"
 
 #: ../src/virt-viewer-guest-details.xml.h:2
 msgid "Name:"
-msgstr ""
+msgstr "Nombre:"
 
 #: ../src/virt-viewer-guest-details.xml.h:3
 msgid "GUID:"
-msgstr ""
+msgstr "GUID:"
 
 #: ../src/virt-viewer-vm-connection.xml.h:1
 msgid "Choose a virtual machine"
-msgstr ""
+msgstr "Elija una máquina virtual"
 
 #: ../src/virt-viewer-vm-connection.xml.h:2
 msgid "Name"
-msgstr ""
+msgstr "Nombre"
 
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
+msgstr "Máquinas virtuales disponibles"
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
 msgstr ""
diff --git a/po/et.po b/po/et.po
index 6a3562d..c495f85 100644
--- a/po/et.po
+++ b/po/et.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Estonian\n"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/eu.po b/po/eu.po
index 0276c68..2951e3b 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Asier Iturralde Sarasola <asier.iturralde@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: 2015-01-12 06:21-0500\n"
 "Last-Translator: Daniel Berrange <dan-transifex@berrange.com>\n"
-"Language-Team: Basque (http://www.transifex.com/projects/p/virt-viewer/language/eu/)\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/virt-viewer/"
+"language/eu/)\n"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.7.3\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -73,43 +74,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr "Bistaratu bertsio informazioa"
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -122,83 +123,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr "Glade-ri buruz"
@@ -238,118 +246,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr "Bistaratu arazketa informazioa"
 
@@ -367,11 +373,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -392,6 +400,10 @@ msgstr "Erabiltzaile-izena:"
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -430,26 +442,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -458,117 +478,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr "Pantaila-argazkia"
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr "Deskonektatu"
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr "USB gailuaren hautapena"
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr "Irten pantaila osotik"
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr "%s%s%s - %s"
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr " "
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -577,59 +607,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr "_Fitxategia"
@@ -642,35 +682,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:7
 msgid "_View"
 msgstr "_Ikusi"
 
-#: ../src/virt-viewer.xml.h:7
+#: ../src/virt-viewer.xml.h:8
 msgid "Full screen"
 msgstr "Pantaila osoa"
 
-#: ../src/virt-viewer.xml.h:8
+#: ../src/virt-viewer.xml.h:9
 msgid "_Zoom"
 msgstr "_Zooma"
 
-#: ../src/virt-viewer.xml.h:9
+#: ../src/virt-viewer.xml.h:10
 msgid "Displays"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:10
+#: ../src/virt-viewer.xml.h:11
 msgid "Release cursor"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:11
+#: ../src/virt-viewer.xml.h:12
 msgid "_Send key"
 msgstr "_Bidali tekla"
 
-#: ../src/virt-viewer.xml.h:12
+#: ../src/virt-viewer.xml.h:13
 msgid "_Help"
 msgstr "_Laguntza"
 
-#: ../src/virt-viewer.xml.h:13
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -697,3 +741,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/fa.po b/po/fa.po
index 2903bd2..3c3b4bc 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Persian\n"
+"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 0890c9f..214d2ff 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Finnish\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 0b497d9..66704e2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Boris BARNIER <b.barnier@gmail.com>, 2010
 # Christophe Fergeau <cfergeau@redhat.com>, 2013
@@ -12,18 +12,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: 2015-01-12 06:21-0500\n"
 "Last-Translator: Daniel Berrange <dan-transifex@berrange.com>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/virt-viewer/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/projects/p/virt-viewer/"
+"language/fr/)\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.7.3\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr "Afficheur distant"
 
@@ -77,48 +78,49 @@ msgstr "Indicateurs de liaison"
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
-msgstr "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
+msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr "Afficher les informations de version"
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr "Définir le titre de la fenêtre"
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 "Ouvrir la connexion à l'aide d'une communication avec le contrôleur de Spice"
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 "%s\n"
-"Lancer '%s --help' pour voir la liste complète des options de ligne de commande disponibles.\n"
+"Lancer '%s --help' pour voir la liste complète des options de ligne de "
+"commande disponibles.\n"
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 "Erreur : arguments surnuméraires spécifiés lors de l'utilisation du "
 "contrôleur Spice\n"
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr "Erreur : impossible de gérer plusieurs URI\n"
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr "Impossible d'initier la connexion"
 
@@ -131,83 +133,90 @@ msgstr "Affichage désactivé par le contrôleur"
 msgid "Controller connection failed: %s"
 msgstr "Échec de la connexion du contrôleur : %s"
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
-msgstr ""
-
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
-msgstr "Détails de la connexion"
-
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
 #: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
-msgstr ""
-
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
-msgstr ""
-
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
-msgstr "Impossible de créer une session Spice"
-
-#: ../src/remote-viewer.c:1221
 msgid "Setting up Spice session..."
 msgstr "Mise en place d'une session Spice..."
 
-#: ../src/remote-viewer.c:1243
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
+msgstr ""
+
+#: ../src/remote-viewer.c:1120
 #, c-format
-msgid "Invalid file %s"
-msgstr "Fichier invalide: %s"
+msgid "Invalid file %s: "
+msgstr ""
 
-#: ../src/remote-viewer.c:1250
+#: ../src/remote-viewer.c:1128
 msgid "Cannot determine the connection type from URI"
 msgstr "Impossible de déterminer le type de la connexion à partir de l'URI"
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
-msgstr "Impossible de créer une session pour ce type : %s"
-
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
+msgstr "Détails de la connexion"
+
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
+msgstr ""
+
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr "À propos de Glade"
@@ -260,125 +269,120 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr "L'équipe de traduction de Fedora"
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr "Êtes-vous sûr de vouloir mettre fin à la session?"
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr "Ne plus demander"
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr "En attente de l'affichage %d..."
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
-msgstr "Type d'affichage inconnu de l'invité %s"
+msgid "Unsupported graphic type '%s'"
+msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr "Échec de la connexion ssh."
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 "Impossible d'établir la connexion au canal, seul SSH est pris en charge."
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr "La connexion au canal n'est pas prise en charge."
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr "Connexion au serveur d'affichage"
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr "Le domaine invité est fermé"
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr "Connecté au serveur d'affichage"
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr "Impossible d'établir la connexion au serveur d'affichage %s"
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
-"Authentification avec le serveur distant sur %s impossible : %s\n"
-"Essayer la connexion à nouveau ?"
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
-"Impossible d'authentifier la connexion avec le serveur de bureau distant : "
-"%s"
+"Impossible d'authentifier la connexion avec le serveur de bureau distant : %s"
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr "Erreur de redirection USB : %s"
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr "Le niveau de zoom doit être dans la plage %d-%d\n"
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr "Affichage %d"
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr "Argument kiosk-quit invalide : %s"
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr "Niveau de zoom de la fenêtre, en pourcentage"
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 "Ouvre en mode plein écran (ajuste la résolution de l'invité à celle du "
 "client)"
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr "Personnaliser les raccourcis clavier"
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr "Activer le mode kiosque"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr "Quitter sur une condition définie dans le mode kiosque"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr "<never|on-disconnect>"
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr "Afficher les informations détaillées"
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr "Afficher les informations de débogage"
 
@@ -396,11 +400,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr "Authentification requise"
@@ -421,6 +427,10 @@ msgstr "Nom d'utilisateur :"
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -461,31 +471,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
+
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
 "\n"
-"Usage : %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
-"\n"
-"%s\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
 "\n"
+msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr "Sélectionnez les périphériques USB à rediriger"
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr "Le type d'authentification %d n'est pas pris en charge"
@@ -494,118 +507,127 @@ msgstr "Le type d'authentification %d n'est pas pris en charge"
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr "Ctrl+Alt+_Suppr"
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr "Ctrl+Alt+_Effacer"
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr "Ctrl+Alt+F_1"
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr "Ctrl+Alt+F_2"
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr "Ctrl+Alt+F_3"
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr "Ctrl+Alt+F_4"
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr "Ctrl+Alt+F_5"
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr "Ctrl+Alt+F_6"
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr "Ctrl+Alt+F_7"
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr "Ctrl+Alt+F_8"
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr "Ctrl+Alt+F_9"
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr "Ctrl+Alt+F1_0"
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr "Ctrl+Alt+F11"
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr "Ctrl+Alt+F12"
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr "Capture d'écran"
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr "Déconnexion"
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr "Sélection du périphérique USB"
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr "Envoyer la combinaison de touches"
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr "Quitter le plein écran"
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr "Ctrl+Alt"
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr "(Appuyer sur %s pour libérer la souris)"
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr "%s%s%s - %s"
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr " "
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
 #, c-format
-msgid "At least %s version %s is required to setup this connection"
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
 msgstr ""
-"La configuration de cette connexion nécessite au minimum %s version %s"
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer-file.c:833
+#, c-format
+msgid "At least %s version %s is required to setup this connection"
+msgstr "La configuration de cette connexion nécessite au minimum %s version %s"
+
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr "En attente du redémarrage du domaine invité"
 
@@ -614,59 +636,69 @@ msgstr "En attente du redémarrage du domaine invité"
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr "Impossible de déterminer le type d'affichage de l'invité %s"
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr "Impossible de déterminer l'hôte de l'invité %s"
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr "En attente du démarrage de libvirt"
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr "Recherche du domaine invité"
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr "En attente de la création du domaine invité"
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr "Vérification du statut du domaine invité"
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr "En attente du démarrage du domaine invité"
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr "[aucun]"
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr "_Fichier"
@@ -679,35 +711,39 @@ msgstr "Insertion d'une Smartcard"
 msgid "Smartcard removal"
 msgstr "Suppression d'une Smartcard"
 
-#: ../src/virt-viewer.xml.h:6
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:7
 msgid "_View"
 msgstr "_Affichage"
 
-#: ../src/virt-viewer.xml.h:7
+#: ../src/virt-viewer.xml.h:8
 msgid "Full screen"
 msgstr "Plein écran"
 
-#: ../src/virt-viewer.xml.h:8
+#: ../src/virt-viewer.xml.h:9
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../src/virt-viewer.xml.h:9
+#: ../src/virt-viewer.xml.h:10
 msgid "Displays"
 msgstr "Affichages"
 
-#: ../src/virt-viewer.xml.h:10
+#: ../src/virt-viewer.xml.h:11
 msgid "Release cursor"
 msgstr "Libérer le curseur"
 
-#: ../src/virt-viewer.xml.h:11
+#: ../src/virt-viewer.xml.h:12
 msgid "_Send key"
 msgstr "_Envoi de touches"
 
-#: ../src/virt-viewer.xml.h:12
+#: ../src/virt-viewer.xml.h:13
 msgid "_Help"
 msgstr "_Aide"
 
-#: ../src/virt-viewer.xml.h:13
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -734,3 +770,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/gl.po b/po/gl.po
index ba682bf..a418184 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Galician\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/gu.po b/po/gu.po
index bc94f0b..13f7c68 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Ankit Patel <ankit644@yahoo.com>, 2014
 # sweta <swkothar@redhat.com>, 2010,2012-2013
@@ -10,18 +10,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: 2015-01-12 06:21-0500\n"
 "Last-Translator: Daniel Berrange <dan-transifex@berrange.com>\n"
-"Language-Team: Gujarati (http://www.transifex.com/projects/p/virt-viewer/language/gu/)\n"
+"Language-Team: Gujarati (http://www.transifex.com/projects/p/virt-viewer/"
+"language/gu/)\n"
+"Language: gu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: gu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.7.3\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr "દૂરસ્થ દર્શક"
 
@@ -75,26 +76,26 @@ msgstr "બાઇન્ડિંગ ફ્લેગ"
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
-msgstr "remote-viewer આવૃત્તિ %s\n"
+msgid "remote-viewer version %s"
+msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr "આવૃત્તિ જાણકારીને બતાવો"
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr "વિન્ડો શીર્ષક સુયોજિત કરો"
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr "Spice નિયંત્રક વાર્તાલાપની મદદથી જોડાણને ખોલો"
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr "- દૂરસ્થ દર્શક ક્લાયન્ટ"
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
@@ -103,17 +104,17 @@ msgstr ""
 "%s\n"
 "ઉપલબ્ધ આદેશ વાક્ય વિકલ્પોની સંપૂર્ણ યાદીને જોવા માટે '%s --help' ચલાવો\n"
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr "ભૂલ: વધારાની દલીલો આપેલ છે જ્યારે Spice નિયંત્રકને વાપરી રહ્યા હોય\n"
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr "ભૂલ: ઘણી URIs ને સંભાળી શકાતી નથી\n"
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr "જોડાણને પ્રારંભ કરવાનુ નિષ્ફળ"
 
@@ -126,83 +127,90 @@ msgstr "નિયંત્રક દ્દારા નિષ્ક્રિય
 msgid "Controller connection failed: %s"
 msgstr "નિયંત્રક જોડાણ નિષ્ફળ: %s"
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
-msgstr "જોડાણ વિગતો"
-
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
-msgstr "જોડાણ સરનામું (_C)"
-
 #: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
-msgstr "ઉદાહરણ તરીકે, spice://foo.example.org:5900"
-
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
-msgstr "તાજેતરનાં જોડાણો (_R)"
-
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
-msgstr "Spice સત્રને બનાવી શક્યા નહિં"
-
-#: ../src/remote-viewer.c:1221
 msgid "Setting up Spice session..."
 msgstr "Spice સત્રને સુયોજિત કરી રહ્યા છે..."
 
-#: ../src/remote-viewer.c:1243
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
+msgstr ""
+
+#: ../src/remote-viewer.c:1120
 #, c-format
-msgid "Invalid file %s"
-msgstr "અયોગ્ય ફાઇલ %s"
+msgid "Invalid file %s: "
+msgstr ""
 
-#: ../src/remote-viewer.c:1250
+#: ../src/remote-viewer.c:1128
 msgid "Cannot determine the connection type from URI"
 msgstr "URI માંથી જોડાણ પ્રકારને નક્કી કરી શકાતુ નથી"
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
-msgstr "આ પ્રકાર માટે સત્રને બનાવી શક્યા નહિં: %s"
-
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
+msgstr "જોડાણ વિગતો"
+
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
+msgstr "ઉદાહરણ તરીકે, spice://foo.example.org:5900"
+
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
+msgstr ""
+
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr "ગલૅડ વિશે"
@@ -217,8 +225,7 @@ msgstr ""
 
 #: ../src/virt-viewer-about.xml.h:4
 msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt"
-msgstr ""
-"GTK-VNC, SPICE-GTK અને libvirt સાથે દૂરસ્થ ડેસ્કટોપ ક્લાયન્ટને બનાવેલ છે"
+msgstr "GTK-VNC, SPICE-GTK અને libvirt સાથે દૂરસ્થ ડેસ્કટોપ ક્લાયન્ટને બનાવેલ છે"
 
 #: ../src/virt-viewer-about.xml.h:5
 msgid "virt-manager.org"
@@ -258,122 +265,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr "Fedora અનુવાદ ટીમ"
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr "શું તમે આ સત્રને બંધ કરવા માંગો છો?"
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr "મને ફરી વાર પૂછશો નહિં"
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr "%d ને દર્શાવવા માટે રાહ જોઇ રહ્યા છે..."
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
-msgstr "મહેમાન %s માટે અજ્ઞાત ગ્રાફિક પ્રકાર"
+msgid "Unsupported graphic type '%s'"
+msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr "ssh સાથે જોડાવાનું નિષ્ફળ."
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr "ચેનલમાં જોડાઇ શકતા નથી, SSH ફક્ત આધારભૂત છે."
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr "ચેનલમાં જોડાવાનુ બિનઆધારભૂત છે."
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr "ગ્રાફિક સર્વરમાં જોડાઇ રહ્યા છે"
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr "મહેમાન ડોમેઇન બંધ થઇ ગયો"
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr "ગ્રાફિક સર્વરમાં જોડાયેલ છે"
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr "ગ્રાફિક સર્વર %s માં જોડાવામાં અસમર્થ"
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
-"%s પર દૂરસ્થ ડેસ્કટોપ સાથે સત્તાધિકરણ કરવાનું અસમર્થ: %s\n"
-"ફરીથી જોડાણનો પુન:પ્રયત્ન કરો?"
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr "દૂરસ્થ ડેસ્કટોપ સર્વર સાથે સત્તાધિકરણ કરવાનું અસમર્થ: %s"
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr "USB પુનર્નિર્દેશન ભૂલ: %s"
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr "નાનું મોટુ કરવાનું લેવલ એ %d-%d માં હોવુ જ જોઇએ\n"
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr "%d દર્શાવો"
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr "અયોગ્ય kiosk-quit દલીલ: %s"
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr "નાનામોટાપણાનું સ્તર, ટકામાં"
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
-msgstr ""
-"સંપૂર્ણ સ્ક્રીન સ્થિતિમાં ખોલો (ક્લાયન્ટને બંધબેસાડવા માટે મહેમાન "
-"રિઝોલ્યુશનને ગોઠવે છે)"
+msgstr "સંપૂર્ણ સ્ક્રીન સ્થિતિમાં ખોલો (ક્લાયન્ટને બંધબેસાડવા માટે મહેમાન રિઝોલ્યુશનને ગોઠવે છે)"
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr "ટૂંકીકીઓ કસ્ટમાઇઝ કરો"
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr "kiosk સ્થિતિને સક્રિય કરો"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr "kiosk સ્થિતિમાં આપેલ શરત પર બહાર નીકળો"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr "<never|on-disconnect>"
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr "વર્બોસ જાણકારીને બતાવો"
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr "ડિબગીંગ જાણકારીને બતાવો"
 
@@ -391,11 +392,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr "સત્તાધિકરણ જરૂરી છે"
@@ -416,6 +419,10 @@ msgstr "વપરાશકર્તાનામ:"
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -448,38 +455,40 @@ msgstr "Virt Viewer"
 #: ../src/virt-viewer-main.c:80
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options"
-msgstr ""
-"ઉપલબ્ધ આદેશ વાક્ય વિકલ્પોની સંપૂર્ણ યાદીને જોવા માટે '%s --help' ચલાવો"
+msgstr "ઉપલબ્ધ આદેશ વાક્ય વિકલ્પોની સંપૂર્ણ યાદીને જોવા માટે '%s --help' ચલાવો"
 
 #: ../src/virt-viewer-main.c:86
 msgid "Virtual machine graphical console"
 msgstr "વર્ચ્યુઅલ મશીન ગ્રાફિકલ કન્સોલ"
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
+
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
 "\n"
-"વપરાશ: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
-"\n"
-"%s\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
 "\n"
+msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr "પુનર્નિર્દેશન માટે USB ઉપકરણોને પસંદ કરો"
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr "બિનઆધારભૂત સત્તાધિકરણ પ્રકાર %d"
@@ -488,117 +497,127 @@ msgstr "બિનઆધારભૂત સત્તાધિકરણ પ્ર�
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr "Ctrl+Alt+_Del"
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr "Ctrl+Alt+_Backspace"
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr "Ctrl+Alt+F_1"
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr "Ctrl+Alt+F_2"
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr "Ctrl+Alt+F_3"
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr "Ctrl+Alt+F_4"
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr "Ctrl+Alt+F_5"
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr "Ctrl+Alt+F_6"
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr "Ctrl+Alt+F_7"
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr "Ctrl+Alt+F_8"
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr "Ctrl+Alt+F_9"
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr "Ctrl+Alt+F1_0"
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr "Ctrl+Alt+F11"
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr "Ctrl+Alt+F12"
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr "સ્ક્રીનશોટ"
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr "જોડાણ તોડી નાંખો"
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr "USB ઉપકરણ પસંદગી"
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr "કી સંયોજન મોકલો"
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr "પૂર્ણસ્ક્રીન છોડો"
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr "Ctrl+Alt"
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr "(પોઇંટરને પ્રકાશિત કરવા માટે  %s ને દબાવો)"
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr "%s%s%s - %s"
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr " "
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr "ઓછામાં ઓછી %s આવૃત્તિ %s ને આ જોડાણને સુયોજિત કરવાની જરૂરિયાત છે"
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr "પુન:શરૂ કરવા માટે મહેમાન ડોમેઇન માટે રાહ જોઇ રહ્યા છે"
 
@@ -607,59 +626,69 @@ msgstr "પુન:શરૂ કરવા માટે મહેમાન ડો�
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr "મહેમાન %s માટે ગ્રાફિક પ્રકારને નક્કી કરી શકાતુ નથી"
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr "મહેમાન %s માટે યજમાનને નક્કી કરી શકાતુ નથી"
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr "શરૂ થવા libvirt માટે રાહ જોઇ રહ્યા છે"
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr "મહેમાન ડોમેઇનને શોધી રહ્યા છે"
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr "બનાવવા માટે મહેમાન ડોમેઇન માટે રાહ જોઇ રહ્યા છે"
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr "મહેમાન ડોમેઇન પરિસ્થિતિને ચકાસી રહ્યા છે"
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr "શરૂ કરવા માટે મહેમાન ડોમેઇન માટે રાહ જોઇ રહ્યા છે"
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr "[કંઇ નહિં]"
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr "ફાઇલ (_F)"
@@ -672,35 +701,39 @@ msgstr "સ્માર્ટકાર્ડ નિવેશ"
 msgid "Smartcard removal"
 msgstr "સ્માર્ટકાર્ડ નિરાકરણ"
 
-#: ../src/virt-viewer.xml.h:6
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:7
 msgid "_View"
 msgstr "દૃશ્ય (_V)"
 
-#: ../src/virt-viewer.xml.h:7
+#: ../src/virt-viewer.xml.h:8
 msgid "Full screen"
 msgstr "પૂર્ણ સ્ક્રીન"
 
-#: ../src/virt-viewer.xml.h:8
+#: ../src/virt-viewer.xml.h:9
 msgid "_Zoom"
 msgstr "નાનુંમોટુ કરો (_Z)"
 
-#: ../src/virt-viewer.xml.h:9
+#: ../src/virt-viewer.xml.h:10
 msgid "Displays"
 msgstr "દર્શાવે છે"
 
-#: ../src/virt-viewer.xml.h:10
+#: ../src/virt-viewer.xml.h:11
 msgid "Release cursor"
 msgstr "પ્રકાશન કર્સર"
 
-#: ../src/virt-viewer.xml.h:11
+#: ../src/virt-viewer.xml.h:12
 msgid "_Send key"
 msgstr "કી મોકલો (_S)"
 
-#: ../src/virt-viewer.xml.h:12
+#: ../src/virt-viewer.xml.h:13
 msgid "_Help"
 msgstr "મદદ (_H)"
 
-#: ../src/virt-viewer.xml.h:13
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -727,3 +760,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/he.po b/po/he.po
index fc66ee5..4c53eb4 100644
--- a/po/he.po
+++ b/po/he.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Hebrew\n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/hi.po b/po/hi.po
index 0a13c94..0acc2d6 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Chandan kumar <chandankumar.093047@gmail.com>, 2012
 # rajesh <rajeshkajha@yahoo.com>, 2012
@@ -11,18 +11,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: 2015-01-12 06:21-0500\n"
 "Last-Translator: Daniel Berrange <dan-transifex@berrange.com>\n"
-"Language-Team: Hindi (http://www.transifex.com/projects/p/virt-viewer/language/hi/)\n"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/virt-viewer/"
+"language/hi/)\n"
+"Language: hi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.7.3\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr "दूरस्थ दर्शक"
 
@@ -76,26 +77,26 @@ msgstr "बाइंडिंग फ्लैग"
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
-msgstr "दूरस्थ-दर्शक संस्करण %s\n"
+msgid "remote-viewer version %s"
+msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr "संस्करण की जानकारी दिखाता है"
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr "विंडो शीर्षक सेट करें"
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr "स्पाइस संचार नियंत्रक का उपयोग करते हुए कनेक्शन खोलें"
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
@@ -104,17 +105,17 @@ msgstr ""
 "%s\n"
 "'%s --help' को उपलब्ध कमांड लाइन की पूरी सूची देखने के लिए देखें.\n"
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr "त्रुटि: स्पाइस कंट्रोलर के उपयोग के दौरान अतिरिक्त वितर्क दिए गए\n"
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr "त्रुटि: बहुल URI को नियंत्रित नहीं कर सकता है\n"
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr "कनेक्शन आरंभ करने में विफल"
 
@@ -127,83 +128,90 @@ msgstr "नियंत्रक के द्वारा प्रदर्श
 msgid "Controller connection failed: %s"
 msgstr "नियंत्रक कनेक्शन में विफल रहा है : %s"
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
-msgstr ""
-
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
-msgstr "संबंध विवरण"
-
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
 #: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
-msgstr ""
-
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
-msgstr ""
-
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
-msgstr "स्पाइस का सत्र नहीं बना पाया"
-
-#: ../src/remote-viewer.c:1221
 msgid "Setting up Spice session..."
 msgstr "स्पाइस सत्र की सेटिंग कर रहा है ..."
 
-#: ../src/remote-viewer.c:1243
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
+msgstr ""
+
+#: ../src/remote-viewer.c:1120
 #, c-format
-msgid "Invalid file %s"
-msgstr "अवैध फ़ाइल %s"
+msgid "Invalid file %s: "
+msgstr ""
 
-#: ../src/remote-viewer.c:1250
+#: ../src/remote-viewer.c:1128
 msgid "Cannot determine the connection type from URI"
 msgstr "यूआरआइ से कनेक्शन के प्रकार को तय नहीं कर सकता है"
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
-msgstr "इस प्रकार का सत्र नहीं बना सका : %s"
-
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
+msgstr "संबंध विवरण"
+
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
+msgstr ""
+
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr "ग्लेड के बारे में"
@@ -216,9 +224,7 @@ msgstr ""
 
 #: ../src/virt-viewer-about.xml.h:4
 msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt"
-msgstr ""
-"एक दूरस्थ डेस्कटॉप ग्राहक जीतीके-वीएनसी, स्पाइस-जीटीके और लिब्विर्ट के साथ "
-"निर्मित"
+msgstr "एक दूरस्थ डेस्कटॉप ग्राहक जीतीके-वीएनसी, स्पाइस-जीटीके और लिब्विर्ट के साथ निर्मित"
 
 #: ../src/virt-viewer-about.xml.h:5
 msgid "virt-manager.org"
@@ -240,130 +246,132 @@ msgid ""
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
 msgstr ""
-"यह प्रोग्राम मुफ्त सॉफ्टवेयर का है: आप इसे फ्री सॉफ्टवेयर फाउंडेशन के द्वारा प्रकाशित जीएनयू जनरल पब्लिक लाइसेंस; या तो लाइसेंस का संस्करण 2, या (आपके विकल्प के अनुसार) बाद के किसी संस्करण की शर्तों के तहत  पुनर्वितरित और / संशोधित कर सकते हैं .\n"
+"यह प्रोग्राम मुफ्त सॉफ्टवेयर का है: आप इसे फ्री सॉफ्टवेयर फाउंडेशन के द्वारा प्रकाशित जीएनयू "
+"जनरल पब्लिक लाइसेंस; या तो लाइसेंस का संस्करण 2, या (आपके विकल्प के अनुसार) बाद के किसी "
+"संस्करण की शर्तों के तहत  पुनर्वितरित और / संशोधित कर सकते हैं .\n"
 "\n"
-"इस कार्यक्रम को इस उम्मीद से वितरित किया गया है कि यह बिना किसी वारंटी;व्यापारिकता की अप्रत्यक्ष वारंटी या किसी खास उद्देश्य के लिए उपयुक्तता के बिना उपयोगी होगा.    अधिक जानकारी के लिए जीएनयू जनरल पब्लिक लाइसेंस देखें.\n"
+"इस कार्यक्रम को इस उम्मीद से वितरित किया गया है कि यह बिना किसी वारंटी;व्यापारिकता "
+"की अप्रत्यक्ष वारंटी या किसी खास उद्देश्य के लिए उपयुक्तता के बिना उपयोगी होगा.    अधिक "
+"जानकारी के लिए जीएनयू जनरल पब्लिक लाइसेंस देखें.\n"
 "\n"
-"आप इस प्रोग्राम के साथ जीएनयू जनरल पब्लिक लाइसेंस की एक प्रतिलिपि प्राप्त करेगे; अगर नहीं, फ्री सॉफ्टवेयर फाउंडेशन को लिखे, Inc. 59 मंदिर प्लेस, 330 सूट, बोस्टन, एमए    02111-1307, संयुक्त राज्य अमेरिका\n"
+"आप इस प्रोग्राम के साथ जीएनयू जनरल पब्लिक लाइसेंस की एक प्रतिलिपि प्राप्त करेगे; अगर "
+"नहीं, फ्री सॉफ्टवेयर फाउंडेशन को लिखे, Inc. 59 मंदिर प्लेस, 330 सूट, बोस्टन, एमए    "
+"02111-1307, संयुक्त राज्य अमेरिका\n"
 
 #: ../src/virt-viewer-about.xml.h:20
 msgid "The Fedora Translation Team"
 msgstr "फेडोरा अनुवाद टीम"
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr "क्या आप इस सत्र को आयात बंद करना चाहते हैं?"
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr "मुझे फिर मत पूछें"
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr " %d प्रदर्शन के लिए प्रतीक्षा कर रहा है ..."
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
-msgstr "%s अतिथि के लिए अज्ञात ग्राफ़िक प्रकार"
+msgid "Unsupported graphic type '%s'"
+msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr "सश से कनेक्ट करने में विफल."
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr "चैनल से कनेक्ट नहीं हो सकता, केवल सश समर्थित."
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr " चैनल से कनेक्ट करना असहायक"
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr "ग्राफ़िक सर्वर से कनेक्ट हो रहा है."
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr "अतिथि के डोमेन को शटडाउन किया है"
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr "ग्राफ़िक सर्वर से जुड़ा"
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr "%s ग्राफ़िक सर्वर से कनेक्ट करने में असमर्थ"
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
-"%s पर दूरस्थ डेस्कटॉप सर्वर के साथ सत्यापन करने में असमर्थ : %s\n"
-"फिर से कनेक्शन पुन: प्रयास करें?"
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr "दूरस्थ डेस्कटॉप सर्वर के साथ सत्यापन करने में असमर्थ : %s"
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr "यूएसबी पुनर्निर्देशन त्रुटि : %s"
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr "प्रदर्शन %d"
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr "विंडो का जूम स्तर, प्रतिशत में"
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr "हॉटकी मनपसंद बनाएँ"
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr " वर्बोज की जानकारी दिखाता है"
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr "डिबगिंग सूचना दिखाता है"
 
@@ -381,11 +389,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr "सत्यापन की आवश्यकता"
@@ -406,6 +416,10 @@ msgstr "उपयोगकर्ता नाम:"
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -444,31 +458,34 @@ msgstr "'%s --help' को उपलब्ध कमांड लाइन क�
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
+
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
 "\n"
-"प्रयोग: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
-"\n"
-"%s\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
 "\n"
+msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr "पुनर्निर्देशन के लिए यूएसबी उपकरणों का चयन करें"
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr "असहायक सत्यापन के प्रकार %d"
@@ -477,117 +494,127 @@ msgstr "असहायक सत्यापन के प्रकार %d"
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr "Ctrl+Alt+_Del"
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr "Ctrl+Alt+_Backspace"
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr "Ctrl+Alt+F_1"
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr "Ctrl+Alt+F_2"
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr "Ctrl+Alt+F_3"
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr "Ctrl+Alt+F_4"
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr "Ctrl+Alt+F_5"
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr "Ctrl+Alt+F_6"
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr "Ctrl+Alt+F_7"
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr "Ctrl+Alt+F_8"
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr "Ctrl+Alt+F_9"
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr "Ctrl+Alt+F1_0"
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr "Ctrl+Alt+F11"
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr "Ctrl+Alt+F12"
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr "स्क्रीनशॉट"
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr "डिस्कनेक्ट करें"
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr "यूएसबी उपकरण चयन"
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr "कुंजी संयोजन भेजें"
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr "फुल स्क्रीन छोड़ दें"
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr "Ctrl+Alt"
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr "(सूचक जारी करने के लिए %s दबाएँ)"
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr "%s%s%s - %s"
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr "  "
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr "कम से कम %s संस्करण %s इस कनेक्शन के सेटअप के लिए जरूरी है"
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr "अतिथि डोमेन को फिर से प्रारंभ करने के लिए प्रतीक्षा करे "
 
@@ -596,59 +623,69 @@ msgstr "अतिथि डोमेन को फिर से प्रार�
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr "%s अतिथि के लिए ग्राफ़िक प्रकार निर्धारित नहीं कर सकते है "
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr "%s अतिथि के लिए होस्ट का निर्धारण नहीं कर सकते है "
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr "libvirt शुरू करने के लिए प्रतीक्षा की जा रही है"
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr "अतिथि डोमेन को खोज रहा है "
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr "अतिथि डोमेन बनाई जाने प्रतीक्षा के लिए की जा रही है"
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr "अतिथि डोमेन की स्थिति की जाँच हो रही है"
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr "  अतिथि डोमेन शुरू करने के लिए प्रतीक्षा की जा रही है "
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr "कुछ नहीं"
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr "फाइल (_F)"
@@ -661,35 +698,39 @@ msgstr "स्मार्टकार्ड प्रवेश"
 msgid "Smartcard removal"
 msgstr "स्मार्टकार्ड हटाना"
 
-#: ../src/virt-viewer.xml.h:6
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:7
 msgid "_View"
 msgstr "दृश्य (_V)"
 
-#: ../src/virt-viewer.xml.h:7
+#: ../src/virt-viewer.xml.h:8
 msgid "Full screen"
 msgstr "फुल स्क्रीन"
 
-#: ../src/virt-viewer.xml.h:8
+#: ../src/virt-viewer.xml.h:9
 msgid "_Zoom"
 msgstr "ज़ूम (_Z)"
 
-#: ../src/virt-viewer.xml.h:9
+#: ../src/virt-viewer.xml.h:10
 msgid "Displays"
 msgstr "प्रदर्शित करे "
 
-#: ../src/virt-viewer.xml.h:10
+#: ../src/virt-viewer.xml.h:11
 msgid "Release cursor"
 msgstr "रिलीज कर्सर"
 
-#: ../src/virt-viewer.xml.h:11
+#: ../src/virt-viewer.xml.h:12
 msgid "_Send key"
 msgstr "कुंजी भेजें (_S)"
 
-#: ../src/virt-viewer.xml.h:12
+#: ../src/virt-viewer.xml.h:13
 msgid "_Help"
 msgstr "सहायता (_H)"
 
-#: ../src/virt-viewer.xml.h:13
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -716,3 +757,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/hr.po b/po/hr.po
index 9fc2b8c..6e7d195 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -2,23 +2,24 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Croatian\n"
+"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: hr\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +73,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +122,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +245,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +372,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +399,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +441,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +477,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +606,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +681,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +740,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/hu.po b/po/hu.po
index dd6c3cb..020c7cf 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Nikolas Slivka <snicore@gmail.com>, 2010
 # Szabo Attila <atekka@gmail.com>, 2013
@@ -11,18 +11,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: 2015-02-22 10:54-0500\n"
 "Last-Translator: Porcsin László <dzsolly85@gmail.com>\n"
-"Language-Team: Hungarian (http://www.transifex.com/projects/p/virt-viewer/language/hu/)\n"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/virt-viewer/"
+"language/hu/)\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.7.3\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr "Távoli megjelenítő"
 
@@ -76,26 +77,26 @@ msgstr "Kötési jelzők"
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
-msgstr "alkalmazás verziója %s\n"
+msgid "remote-viewer version %s"
+msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr "Verzió információk megjelenítése"
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr "Ablak címének megadása"
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr "Kapcsolat megnyitása a Spice vezérlő kommunikációjában"
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr "Távoli megjelenítő kliens"
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
@@ -104,18 +105,18 @@ msgstr ""
 "%s\n"
 "Futtassa a '%s --help' parancsot a teljes elérhető parancssori opciókért\n"
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 "Hiba: külön paraméterek kerültek megadásra a Spice vezérlő használatakor\n"
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr "Hiba: több URI nem kezelhető egyszerre\n"
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr "Sikertelen kapcsolat indítás"
 
@@ -128,83 +129,90 @@ msgstr "Kijelző kikapcsolva a vezérlő által"
 msgid "Controller connection failed: %s"
 msgstr "Vezérlő kapcsolat sikertelen: %s"
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr "_CD váltás"
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
-msgstr ""
-
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
-msgstr "Kapcsolat részletei"
-
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
 #: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
-msgstr ""
-
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
-msgstr ""
-
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
-msgstr "Spice folyamat készítése nem lehetséges"
-
-#: ../src/remote-viewer.c:1221
 msgid "Setting up Spice session..."
 msgstr "Spice folyamat beállítása..."
 
-#: ../src/remote-viewer.c:1243
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
+msgstr ""
+
+#: ../src/remote-viewer.c:1120
 #, c-format
-msgid "Invalid file %s"
-msgstr "Érvénytelen fájl %s"
+msgid "Invalid file %s: "
+msgstr ""
 
-#: ../src/remote-viewer.c:1250
+#: ../src/remote-viewer.c:1128
 msgid "Cannot determine the connection type from URI"
 msgstr "Kapcsolattípus nem meghatározható az URI-ról "
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
-msgstr "Folyamat nem indítható ehhez a típushoz: %s"
-
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
+msgstr "Kapcsolat részletei"
+
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
+msgstr ""
+
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr "A Glade-ről"
@@ -259,120 +267,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr "A Fedora Fordítói csapata"
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr "Biztos vagy abban hogy be akarod zárni ezt a kapcsolatot?"
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr "Ne kérdezze meg többet"
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr "Várakozás a %d kijelzőre..."
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
-msgstr "Ismeretlen grafikus mód típus %s vendégnél"
+msgid "Unsupported graphic type '%s'"
+msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr "SSH kapcsolat sikertelen."
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr "Csatornára való csatlakozás meghiúsult, kizárólag SSH támogatott."
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr "Kapcsolódás egy nem támogatott csatornához."
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr "Csatlakozás egy grafikus kiszolgálóhoz"
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr "Vendég tartomány leáll"
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr "Csatlakozva a grafikus kiszolgálóhoz"
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr "%s grafikus kiszolgálóhoz a kapcsolódás nem lehetséges"
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
-"Bejelentkezés sikertelen a távoli kiszolgálónál itt:  %s: %s\n"
-"Megpróbáljuk még egyszer?"
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr "Bejelentkezés sikertelen a távoli kiszolgálónál: %s"
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr "USB átirányítási hiba: %s"
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr "%d kijelző"
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr "Ablak nagyítási fokozata, százalékban"
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr "Gyorsbillentyűk testreszabása"
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr "Részletes információk megjelenítése"
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr "Hibakeresési információk megjelenítése"
 
@@ -390,11 +394,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr "Azonosítás szükséges"
@@ -415,6 +421,10 @@ msgstr "Felhasználói név:"
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -454,31 +464,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
+
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
 "\n"
-"Használata: %s [OPCIÓK] DOMAIN-NAME|ID|UUID\n"
-"\n"
-"%s\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
 "\n"
+msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr "Válasszon USB eszközöket az átirányításhoz"
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr "Nem támogatott azonosítási mód: %d"
@@ -487,117 +500,127 @@ msgstr "Nem támogatott azonosítási mód: %d"
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr "Ctrl+Alt+_Del"
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr "Ctrl+Alt+_Backspace"
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr "Ctrl+Alt+F_1"
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr "Ctrl+Alt+F_2"
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr "Ctrl+Alt+F_3"
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr "Ctrl+Alt+F_4"
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr "Ctrl+Alt+F_5"
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr "Ctrl+Alt+F_6"
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr "Ctrl+Alt+F_7"
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr "Ctrl+Alt+F_8"
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr "Ctrl+Alt+F_9"
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr "Ctrl+Alt+F1_0"
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr "Ctrl+Alt+F11"
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr "Ctrl+Alt+F12"
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr "Képernyőkép"
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr "Leválasztás"
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr "USB eszköz kiválasztás"
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr "Billentyűkombináció küldése"
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr "Teljes képernyő elhagyása"
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr "Ctrl+Alt"
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr "(Nyomjon %s billentyűt hogy kiszabadítsa a mutatót)"
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr "%s%s%s - %s"
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr " "
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr "Minimum %s verzió %s szükséges hogy beállítsd ezt a kapcsolatot"
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr "Várakozás a vendégtartomány újraindulására"
 
@@ -606,59 +629,69 @@ msgstr "Várakozás a vendégtartomány újraindulására"
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr "A vendég grafikus része nem meghatározható %s"
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr "A vendég részére kiszolgáló nem meghatározható %s"
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr "Várakozás a libvirt elindulásáig"
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr "Vendég tartomány keresése"
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr "Várakozás a vendég tartomány elkészülésére"
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr "Vendég tartomány állapot ellenőrzése"
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr "Várakozás a vendég tartomány indítására"
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr "[nincs]"
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr "_Fájl"
@@ -671,35 +704,39 @@ msgstr "Smartcard behelyezése"
 msgid "Smartcard removal"
 msgstr "Smartcard eltávolítása"
 
-#: ../src/virt-viewer.xml.h:6
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:7
 msgid "_View"
 msgstr "Nézet"
 
-#: ../src/virt-viewer.xml.h:7
+#: ../src/virt-viewer.xml.h:8
 msgid "Full screen"
 msgstr "Teljes képernyő"
 
-#: ../src/virt-viewer.xml.h:8
+#: ../src/virt-viewer.xml.h:9
 msgid "_Zoom"
 msgstr "Nagyítás"
 
-#: ../src/virt-viewer.xml.h:9
+#: ../src/virt-viewer.xml.h:10
 msgid "Displays"
 msgstr "Kijelzők"
 
-#: ../src/virt-viewer.xml.h:10
+#: ../src/virt-viewer.xml.h:11
 msgid "Release cursor"
 msgstr "Kurzor eleresztése"
 
-#: ../src/virt-viewer.xml.h:11
+#: ../src/virt-viewer.xml.h:12
 msgid "_Send key"
 msgstr "Billentyű leütés"
 
-#: ../src/virt-viewer.xml.h:12
+#: ../src/virt-viewer.xml.h:13
 msgid "_Help"
 msgstr "Súgó"
 
-#: ../src/virt-viewer.xml.h:13
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -726,3 +763,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/ia.po b/po/ia.po
index 4de63aa..2c3078e 100644
--- a/po/ia.po
+++ b/po/ia.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Interlingua\n"
+"Language: ia\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/id.po b/po/id.po
index 1d13f81..b480dc2 100644
--- a/po/id.po
+++ b/po/id.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Indonesian\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: id\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/ilo.po b/po/ilo.po
index 6c40399..db2e9e4 100644
--- a/po/ilo.po
+++ b/po/ilo.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Iloko\n"
+"Language: ilo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ilo\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/is.po b/po/is.po
index 2da05e8..4bd36ca 100644
--- a/po/is.po
+++ b/po/is.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Icelandic\n"
+"Language: is\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n%10!=1 || n%100==11)\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/it.po b/po/it.po
index 5c30fb7..ed62c15 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Francesco D'Aluisio <fdaluisio@fedoraproject.org>, 2013
 # Francesco Tombolini <tombo@adamantio.net>, 2010
@@ -14,18 +14,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: 2015-01-12 06:21-0500\n"
 "Last-Translator: Daniel Berrange <dan-transifex@berrange.com>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/virt-viewer/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/virt-viewer/"
+"language/it/)\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.7.3\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr "Visualizzatore remoto"
 
@@ -79,45 +80,47 @@ msgstr "I flag per l'associazione"
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
-msgstr "versione del visualizzatore-remoto %s\n"
+msgid "remote-viewer version %s"
+msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr "Mostra informazioni sulla versione"
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr "Imposta il titolo della finestra"
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr "Apri collegamento usando una comunicazione SPICE"
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 "%s\n"
-"Eseguire '%s --help' per avere un elenco completo di opzioni della linea di comando disponibili\n"
+"Eseguire '%s --help' per avere un elenco completo di opzioni della linea di "
+"comando disponibili\n"
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
-msgstr "Errore: presenti troppi argomenti durante l'uso del controllore Spice\n"
+msgstr ""
+"Errore: presenti troppi argomenti durante l'uso del controllore Spice\n"
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr "Errore: impossibile gestire URI multipli\n"
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr "Inizializzazione connessione fallita"
 
@@ -130,83 +133,90 @@ msgstr "Schermo disabilitato dal controller"
 msgid "Controller connection failed: %s"
 msgstr "Connessione controller fallita: %s"
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
-msgstr ""
-
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
-msgstr "Dettagli connessione"
-
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
 #: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
-msgstr ""
-
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
-msgstr ""
-
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
-msgstr "Impossibile creare una sessione di Spice"
-
-#: ../src/remote-viewer.c:1221
 msgid "Setting up Spice session..."
 msgstr "Impostazione sessione Spice in corso..."
 
-#: ../src/remote-viewer.c:1243
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
+msgstr ""
+
+#: ../src/remote-viewer.c:1120
 #, c-format
-msgid "Invalid file %s"
-msgstr "File %s non valido"
+msgid "Invalid file %s: "
+msgstr ""
 
-#: ../src/remote-viewer.c:1250
+#: ../src/remote-viewer.c:1128
 msgid "Cannot determine the connection type from URI"
 msgstr "Impossibile determinare il tipo di connessione dall'URI"
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
-msgstr "Impossibile creare una sessione per questo tipo: %s"
-
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
+msgstr "Dettagli connessione"
+
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
+msgstr ""
+
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr "Informazioni su Glade"
@@ -241,131 +251,135 @@ msgid ""
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
 msgstr ""
-"Questo programma è un sofware libero, è possibile ridistribuirlo e/o modificarlo in conformità alle disposizioni della GNU General Public License come viene pubblicata dalla Free Software Foundation; versione 2 della licenza o (a scelta) tutte le versioni successive.\n"
+"Questo programma è un sofware libero, è possibile ridistribuirlo e/o "
+"modificarlo in conformità alle disposizioni della GNU General Public License "
+"come viene pubblicata dalla Free Software Foundation; versione 2 della "
+"licenza o (a scelta) tutte le versioni successive.\n"
 "\n"
-"Questo programma è distribuito nella speranza che possa essere utile, ma SENZA ALCUNA GARANZIA, e senza garanzia implicita di COMMERCIALIZZAZIONE o di ADATTAMENTO AD UNO SCOPO PARTICOLARE. Per maggiori dettagli consultare la GNU General Public License.\n"
+"Questo programma è distribuito nella speranza che possa essere utile, ma "
+"SENZA ALCUNA GARANZIA, e senza garanzia implicita di COMMERCIALIZZAZIONE o "
+"di ADATTAMENTO AD UNO SCOPO PARTICOLARE. Per maggiori dettagli consultare la "
+"GNU General Public License.\n"
 "\n"
-"Insieme a questo programma deve essere fornita una copia della GNU General Public License; in caso contrario scrivere alla Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n"
+"Insieme a questo programma deve essere fornita una copia della GNU General "
+"Public License; in caso contrario scrivere alla Free Software Foundation, "
+"Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n"
 
 #: ../src/virt-viewer-about.xml.h:20
 msgid "The Fedora Translation Team"
 msgstr "Il Fedora Translation Team"
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr "Desideri terminare la sessione?"
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr "Non chiedermelo più"
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr "In attesa del display %d..."
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
-msgstr "Impossibile determinare il tipo grafico per il guest %s"
+msgid "Unsupported graphic type '%s'"
+msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr "Connessione a ssh fallita."
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr "Impossibile connettersi al canale, è supportato solo SSH."
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr "Connessione al canale non supportata."
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr "Connessione al server grafico in corso"
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr "Il dominio del guest si è arrestato"
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr "Connesso al server grafico"
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr "Impossibile connettersi al server grafico %s"
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
-"Impossibile eseguire l'autenticazione con il server desktop remoto su %s: %s\n"
-"Riprovare il collegamento?"
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 "Impossibile eseguire l'autenticazione con il server desktop remoto su: %s"
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr "Errore di reindirizzamento USB: %s"
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr "Livello di Zoom deve essere tra %d-%d\n"
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr "Visualizza %d"
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr "Argomento kiosk-quit invalido: %s"
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr "Livello di zoom della finestra, in percentuale"
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr "Personalizza i tasti di scelta rapida"
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr "Abilita modalità Kiosk"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr "Esci dalla modalità kiosk in una data condizione"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr "<never|on-disconnect>"
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr "Mostra informazioni dettagliate"
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr "Mostra le informazioni di debug"
 
@@ -383,11 +397,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr "Autenticazione necessaria"
@@ -408,6 +424,10 @@ msgstr "Nome utente:"
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -448,31 +468,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
+
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
 "\n"
-"Utilizzo: %s [OPZIONI] NOME-DOMINIO|ID|UUID\n"
-"\n"
-"%s\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
 "\n"
+msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr "Seleziona i dispositivi USB per il reindirizzamento"
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr "Tipo di autenticazione %d non supportata"
@@ -481,117 +504,127 @@ msgstr "Tipo di autenticazione %d non supportata"
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr "Ctrl+Alt+_Del"
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr "Ctrl+Alt+_Backspace"
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr "Ctrl+Alt+F_1"
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr "Ctrl+Alt+F_2"
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr "Ctrl+Alt+F_3"
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr "Ctrl+Alt+F_4"
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr "Ctrl+Alt+F_5"
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr "Ctrl+Alt+F_6"
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr "Ctrl+Alt+F_7"
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr "Ctrl+Alt+F_8"
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr "Ctrl+Alt+F_9"
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr "Ctrl+Alt+F1_0"
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr "Ctrl+Alt+F11"
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr "Ctrl+Alt+F12"
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr "Schermata"
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr "Scollega"
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr "Selezione dispositivo USB"
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr "Invia combinazione di tasti"
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr "Lascia a schermo intero"
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr "Ctrl+Alt"
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr "(Premere %s per rilasciare il puntatore)"
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr "%s%s%s - %s"
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr " "
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr "%s versione %s è requisito minimo per configurare questa connessione"
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr "In attesa del riavvio del dominio guest"
 
@@ -600,59 +633,69 @@ msgstr "In attesa del riavvio del dominio guest"
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr "Impossibile determinare il tipo grafico per il guest %s"
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr "Impossibile determinare l'host per il guest %s"
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr "In attesa dell'avvio di libvirt"
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr "Ricerca dominio guest in corso"
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr "In attesa di creazione del dominio guest"
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr "Controllo stato del dominio guest in corso"
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr "In attesa dell'avvio del dominio guest"
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr "[nessuno]"
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr "_File"
@@ -665,35 +708,39 @@ msgstr "Inserimento Smartcard"
 msgid "Smartcard removal"
 msgstr "Rimozione Smartcard"
 
-#: ../src/virt-viewer.xml.h:6
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:7
 msgid "_View"
 msgstr "_Visualizza"
 
-#: ../src/virt-viewer.xml.h:7
+#: ../src/virt-viewer.xml.h:8
 msgid "Full screen"
 msgstr "Schermo intero"
 
-#: ../src/virt-viewer.xml.h:8
+#: ../src/virt-viewer.xml.h:9
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../src/virt-viewer.xml.h:9
+#: ../src/virt-viewer.xml.h:10
 msgid "Displays"
 msgstr "Display"
 
-#: ../src/virt-viewer.xml.h:10
+#: ../src/virt-viewer.xml.h:11
 msgid "Release cursor"
 msgstr "Rilascia il cursore"
 
-#: ../src/virt-viewer.xml.h:11
+#: ../src/virt-viewer.xml.h:12
 msgid "_Send key"
 msgstr "_Invia combinazione tasti"
 
-#: ../src/virt-viewer.xml.h:12
+#: ../src/virt-viewer.xml.h:13
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: ../src/virt-viewer.xml.h:13
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -720,3 +767,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/ja.po b/po/ja.po
index c2f0fdb..6d1c8e1 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,28 +1,30 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Hajime Taira <htaira@redhat.com>, 2012-2014
 # Kiyoto Hashida <khashida@redhat.com>, 2010
 # noriko <noriko@fedoraproject.org>, 2014
 # Tomoyuki KATO <tomo@dream.daynight.jp>, 2012-2013
+# Hajime Taira <htaira@fedoraproject.org>, 2015. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
-"PO-Revision-Date: 2015-01-12 06:21-0500\n"
-"Last-Translator: Daniel Berrange <dan-transifex@berrange.com>\n"
-"Language-Team: Japanese (http://www.transifex.com/projects/p/virt-viewer/language/ja/)\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
+"PO-Revision-Date: 2015-04-16 07:15-0400\n"
+"Last-Translator: Hajime Taira <htaira@fedoraproject.org>\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/virt-viewer/"
+"language/ja/)\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.7.3\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr "リモートビューアー"
 
@@ -76,45 +78,47 @@ msgstr "バインディングのフラグ"
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
-msgstr "remote-viewer バージョン %s\n"
+msgid "remote-viewer version %s"
+msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr "バージョン情報を表示します"
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr "ウィンドウタイトルの設定"
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr "Spice コントローラー通信を使用して接続を開く"
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr "リモートビューアークライアント"
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 "%s\n"
-"利用可能なコマンドラインオプションの完全な一覧を確認するには '%s --help' を実行してください\n"
+"利用可能なコマンドラインオプションの完全な一覧を確認するには '%s --help' を実"
+"行してください\n"
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
-msgstr "エラー: Spice コントローラーを使用しているときに余計な引数が指定されました\n"
+msgstr ""
+"エラー: Spice コントローラーを使用しているときに余計な引数が指定されました\n"
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr "Error: 複数の URI を処理できません\n"
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr "接続の初期化に失敗しました"
 
@@ -127,83 +131,90 @@ msgstr "ディスプレイがコントローラーにより無効化されまし
 msgid "Controller connection failed: %s"
 msgstr "コントローラーの接続に失敗しました: %s"
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
-msgstr ""
+msgstr "CDの変更(_C)"
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
+msgstr "oVirt URI の構文解析に失敗しました"
+
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
-msgstr ""
+msgstr "oVirt上の仮想マシン %s は稼働していません"
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
-msgstr ""
+msgstr "oVirt上の仮想マシン %s にはディスプレイがありません"
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
-msgstr ""
-
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
-msgstr "接続の詳細"
-
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
-msgstr "接続先アドレス(_C)"
+msgid "oVirt VM %s has unknown display type: %d"
+msgstr "oVirt上の仮想マシン %s は不明なディスプレイタイプ: %d を搭載しています"
 
 #: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
-msgstr "例: spice://foo.example.org:5900"
-
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
-msgstr "最近の接続(_R):"
-
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
-msgstr "Spice セッションを作成できませんでした"
-
-#: ../src/remote-viewer.c:1221
 msgid "Setting up Spice session..."
 msgstr "Spice セッションのセットアップ中..."
 
-#: ../src/remote-viewer.c:1243
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
+msgstr ""
+
+#: ../src/remote-viewer.c:1120
 #, c-format
-msgid "Invalid file %s"
-msgstr "無効なファイル %s"
+msgid "Invalid file %s: "
+msgstr ""
 
-#: ../src/remote-viewer.c:1250
+#: ../src/remote-viewer.c:1128
 msgid "Cannot determine the connection type from URI"
 msgstr "URI から接続の種類を決定できません"
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
-msgstr "この種類のセッションを作成できませんでした: %s"
-
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
+msgstr "接続の詳細"
+
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
+msgstr "例: spice://foo.example.org:5900"
+
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
+msgstr ""
+
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr "Glade について"
@@ -218,7 +229,9 @@ msgstr ""
 
 #: ../src/virt-viewer-about.xml.h:4
 msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt"
-msgstr "GTK-VNC, SPICE-GTK および libvirt でビルドされたリモートデスクトップクライアント"
+msgstr ""
+"GTK-VNC, SPICE-GTK および libvirt でビルドされたリモートデスクトップクライア"
+"ント"
 
 #: ../src/virt-viewer-about.xml.h:5
 msgid "virt-manager.org"
@@ -258,120 +271,118 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr "The Fedora Translation Team"
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr "セッションを閉じますか?"
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr "二度と確認しない"
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr "ディスプレイ %d を待機中..."
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
-msgstr "仮想マシン %s のグラフィックの種類が未知の種類です"
+msgid "Unsupported graphic type '%s'"
+msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr "SSH への接続に失敗しました。"
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr "チャンネルに接続できません、SSH のみがサポートされます。"
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr "サポートされないチャネルに接続します。"
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
-msgstr ""
+msgstr "ディスプレイは libvirt にて --attach を指定する場合にのみ付与できます"
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr "グラフィックサーバーに接続中"
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr "仮想マシンがシャットダウンしました"
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr "グラフィックサーバーに接続"
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr "グラフィックサーバー %s に接続できません"
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
-"%s のリモートデスクトップサーバーの認証で失敗しました: %s\n"
-"再び接続を試行しますか？"
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr "リモートデスクトップサーバーの認証で失敗しました: %s"
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr "USB リダイレクトエラー: %s"
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr "ズームレベルは %d-%d の範囲内でなければいけません\n"
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr "ディスプレイ %d"
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr "無効な kiosk-quit の引数: %s"
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr "ウィンドウのズームレベル（パーセント単位）"
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
-msgstr "フルスクリーンモードで開きます (クライアントに適するよう、仮想マシンを自動調整します)"
+msgstr ""
+"フルスクリーンモードで開きます (クライアントに適するよう、仮想マシンを自動調"
+"整します)"
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr "ホットキーのカスタマイズ"
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr "Kiosk モードを有効化"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr "Kiosk モードを与えられた条件で終了します"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr "<never|on-disconnect>"
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr "詳細情報を表示します"
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr "デバッグ情報を表示します"
 
@@ -383,17 +394,23 @@ msgid ""
 "<b>%s</b>\n"
 "\n"
 msgstr ""
+"%s 接続のために認証が必要です:\n"
+"\n"
+"<b>%s</b>\n"
+"\n"
 
 #: ../src/virt-viewer-auth.c:92
 #, c-format
 msgid "Authentication is required for the %s connection:\n"
-msgstr ""
+msgstr "%s 接続のために認証が必要です:\n"
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr "認証が必要です"
@@ -412,6 +429,10 @@ msgstr "ユーザー名:"
 
 #: ../src/virt-viewer-auth.xml.h:5
 msgid "Show password"
+msgstr "パスワードの表示"
+
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
 msgstr ""
 
 #: ../src/virt-viewer-main.c:38
@@ -446,156 +467,172 @@ msgstr "仮想マシンビューアー"
 #: ../src/virt-viewer-main.c:80
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options"
-msgstr "利用可能なコマンドラインオプションの完全な一覧を確認するには '%s --help' を実行してください"
+msgstr ""
+"利用可能なコマンドラインオプションの完全な一覧を確認するには '%s --help' を実"
+"行してください"
 
 #: ../src/virt-viewer-main.c:86
 msgid "Virtual machine graphical console"
 msgstr "仮想マシングラフィカルコンソール"
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
+
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
 "\n"
-"使用法: %s [オプション] ドメイン名|ID|UUID\n"
-"\n"
-"%s\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
 "\n"
+msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
-msgstr ""
+msgstr "無効なパスワード"
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr "リダイレクトする USB デバイスを選択"
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr "サポートしていない認証の種類 %d"
 
 #: ../src/virt-viewer-vm-connection.c:64
 msgid "No virtual machine found"
+msgstr "仮想マシンが見つかりません"
+
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr "Ctrl+Alt+Del(_D)"
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr "Ctrl+Alt+Backspace(_B)"
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr "Ctrl+Alt+F1(_1)"
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr "Ctrl+Alt+F2(_2)"
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr "Ctrl+Alt+F3(_3)"
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr "Ctrl+Alt+F4(_4)"
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr "Ctrl+Alt+F5(_5)"
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr "Ctrl+Alt+F6(_6)"
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr "Ctrl+Alt+F7(_7)"
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr "Ctrl+Alt+F8(_8)"
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr "Ctrl+Alt+F9(_9)"
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr "Ctrl+Alt+F10(_0)"
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr "Ctrl+Alt+F11"
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr "Ctrl+Alt+F12"
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr "スクリーンショット"
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
-msgstr ""
+msgstr "不明"
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr "切断"
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr "USB デバイスの選択"
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr "組み合わせキーの送信"
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr "フルスクリーンの解除"
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr "Ctrl+Alt"
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr "(ポインターを開放するには %s を押します)"
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr "%s%s%s - %s"
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr " "
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
-msgstr "少なくとも %s バージョン %s がこのセッションをセットアップするために必要です"
+msgstr ""
+"少なくとも %s バージョン %s がこのセッションをセットアップするために必要です"
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr "仮想マシンが再起動するのを待機中"
 
@@ -604,59 +641,69 @@ msgstr "仮想マシンが再起動するのを待機中"
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr "仮想マシン %s のグラフィックの種類を決定できません"
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr "仮想マシン %s のホストを決定できません"
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
-msgstr ""
+msgstr "ゲスト '%s' が応答しません"
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
-msgstr ""
+msgstr "仮想マシン %s は稼働していません"
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr "libvirt の起動を待つ"
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr "仮想マシンを検索中"
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr "仮想マシンが作成されるのを待機中"
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr "仮想マシンの状態を確認中"
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr "仮想マシンが開始するのを待機中"
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
-msgstr ""
+msgstr "libvirt URI に接続できません: %s"
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr "[なし]"
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
+msgstr "認証に失敗しました。"
+
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr "ファイル(_F)"
@@ -669,58 +716,78 @@ msgstr "スマートカードの挿入"
 msgid "Smartcard removal"
 msgstr "スマートカードの抜き取り"
 
-#: ../src/virt-viewer.xml.h:6
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:7
 msgid "_View"
 msgstr "表示(_V)"
 
-#: ../src/virt-viewer.xml.h:7
+#: ../src/virt-viewer.xml.h:8
 msgid "Full screen"
 msgstr "フルスクリーン"
 
-#: ../src/virt-viewer.xml.h:8
+#: ../src/virt-viewer.xml.h:9
 msgid "_Zoom"
 msgstr "ズーム(_Z)"
 
-#: ../src/virt-viewer.xml.h:9
+#: ../src/virt-viewer.xml.h:10
 msgid "Displays"
 msgstr "ディスプレイ"
 
-#: ../src/virt-viewer.xml.h:10
+#: ../src/virt-viewer.xml.h:11
 msgid "Release cursor"
 msgstr "カーソルの開放"
 
-#: ../src/virt-viewer.xml.h:11
+#: ../src/virt-viewer.xml.h:12
 msgid "_Send key"
 msgstr "キーを送信(_S)"
 
-#: ../src/virt-viewer.xml.h:12
+#: ../src/virt-viewer.xml.h:13
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
-#: ../src/virt-viewer.xml.h:13
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
-msgstr ""
+msgstr "仮想マシンの詳細(_G)"
 
 #: ../src/virt-viewer-guest-details.xml.h:1
 msgid "Guest Details"
-msgstr ""
+msgstr "仮想マシンの詳細"
 
 #: ../src/virt-viewer-guest-details.xml.h:2
 msgid "Name:"
-msgstr ""
+msgstr "名前:"
 
 #: ../src/virt-viewer-guest-details.xml.h:3
 msgid "GUID:"
-msgstr ""
+msgstr "GUID:"
 
 #: ../src/virt-viewer-vm-connection.xml.h:1
 msgid "Choose a virtual machine"
-msgstr ""
+msgstr "仮想マシンの選択"
 
 #: ../src/virt-viewer-vm-connection.xml.h:2
 msgid "Name"
-msgstr ""
+msgstr "名前"
 
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
+msgstr "利用可能な仮想マシン"
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
 msgstr ""
diff --git a/po/ka.po b/po/ka.po
index 6fb097d..b56505c 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Georgian\n"
+"Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ka\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/kk.po b/po/kk.po
index 125f4a9..c96e809 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Kazakh\n"
+"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: kk\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/km.po b/po/km.po
index 0cff592..56dbfdd 100644
--- a/po/km.po
+++ b/po/km.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Khmer\n"
+"Language: km\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: km\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/kn.po b/po/kn.po
index dcfb20a..1e60531 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # shanky <prasad.mvs@gmail.com>, 2013-2014
 # shanky <prasad.mvs@gmail.com>, 2012
@@ -12,18 +12,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: 2015-01-12 06:21-0500\n"
 "Last-Translator: Daniel Berrange <dan-transifex@berrange.com>\n"
-"Language-Team: Kannada (http://www.transifex.com/projects/p/virt-viewer/language/kn/)\n"
+"Language-Team: Kannada (http://www.transifex.com/projects/p/virt-viewer/"
+"language/kn/)\n"
+"Language: kn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: kn\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.7.3\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr "ದೂರಸ್ಥ ವೀಕ್ಷಕ"
 
@@ -77,26 +78,26 @@ msgstr "ಬೈಂಡಿಂಗ್ ಫ್ಲಾಗ್‌ಗಳು"
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
-msgstr "ದೂರದ-ವೀಕ್ಷಕದ ಆವೃತ್ತಿ %s\n"
+msgid "remote-viewer version %s"
+msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr "ಪ್ರದರ್ಶನ ಆವೃತ್ತಿ ಮಾಹಿತಿ"
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr "ಕಿಟಕಿಯ ಶೀರ್ಷಿಕೆಯನ್ನು ಹೊಂದಿಸು"
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr "ಸ್ಪೈಸ್ ನಿಯಂತ್ರಣ ವ್ಯವಹಾರವನ್ನು ಬಳಸಿಕೊಂಡು ಸಂಪರ್ಕವನ್ನು ತೆರೆ"
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr "- ದೂರದ ವೀಕ್ಷಕದ ಕ್ಲೈಂಟ್"
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
@@ -105,17 +106,17 @@ msgstr ""
 "%s\n"
 "ಲಭ್ಯವಿರುವ ಆಜ್ಞಾಸಾಲಿನ ಆಯ್ಕೆಗಳ ಸಂಪೂರ್ಣ ಪಟ್ಟಿಗಾಗಿ  '%s --help' ಅನ್ನು ಚಲಾಯಿಸಿ\n"
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr "ದೋಷ: ಸ್ಪೈಸ್‌ ನಿಯಂತ್ರಕವನ್ನು ಬಳಸುವಾಗ ಹೆಚ್ಚುವರಿ ಆರ್ಗ್ಯುಮೆಂಟ್‌ಗಳು\n"
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr "ದೋಷ: ಅನೇಕ URLಗಳನ್ನು ನಿಭಾಯಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ\n"
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr "ಸಂಪರ್ಕವನ್ನು ಆರಂಭಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ"
 
@@ -128,83 +129,90 @@ msgstr "ನಿಯಂತ್ರಕದಿಂದ ಪ್ರದರ್ಶಕವನ್�
 msgid "Controller connection failed: %s"
 msgstr "ನಿಯಂತ್ರಕದ ಸಂಪರ್ಕವು ವಿಫಲಗೊಂಡಿದೆ: %s"
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
-msgstr "ಸಂಪರ್ಕ ವಿವರಗಳು"
-
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
-msgstr "ಸಂಪರ್ಕ ವಿಳಾಸ (_C)"
-
 #: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
-msgstr "ಉದಾಹರಣೆಗೆ, spice://foo.example.org:5900"
-
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
-msgstr "ಇತ್ತೀಚಿನ ಸಂಪರ್ಕಗಳು (_R)"
-
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
-msgstr "ಸ್ಪೈಸ್ ಅಧಿವೇಶನವನ್ನು ರಚಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
-
-#: ../src/remote-viewer.c:1221
 msgid "Setting up Spice session..."
 msgstr "ಸ್ಪೈಸ್ ಅಧಿವೇಶನವನ್ನು ಸಿದ್ಧಗೊಳಿಸಲಾಗುತ್ತಿದೆ..."
 
-#: ../src/remote-viewer.c:1243
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
+msgstr ""
+
+#: ../src/remote-viewer.c:1120
 #, c-format
-msgid "Invalid file %s"
-msgstr "ಅಮಾನ್ಯವಾದ ಕಡತ %s"
+msgid "Invalid file %s: "
+msgstr ""
 
-#: ../src/remote-viewer.c:1250
+#: ../src/remote-viewer.c:1128
 msgid "Cannot determine the connection type from URI"
 msgstr "URI ಇಂದ ಸಂಪರ್ಕದ ಬಗೆಯನ್ನು ನಿರ್ಧರಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
-msgstr "ಈ ಬಗೆಗಾಗಿ ಒಂದು ಅಧಿವೇಶನವನ್ನು ರಚಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ:%s"
-
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
+msgstr "ಸಂಪರ್ಕ ವಿವರಗಳು"
+
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
+msgstr "ಉದಾಹರಣೆಗೆ, spice://foo.example.org:5900"
+
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
+msgstr ""
+
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr "ಗ್ಲೇಡ್ ಕುರಿತು"
@@ -219,8 +227,7 @@ msgstr ""
 
 #: ../src/virt-viewer-about.xml.h:4
 msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt"
-msgstr ""
-"GTK-VNC, SPICE-GTK ಮತ್ತು libvirt ನೊಂದಿಗೆ ನಿರ್ಮಿಸಲಾದ ದೂರಸ್ಥ ಗಣಕತೆರೆ ಕ್ಲೈಂಟ್"
+msgstr "GTK-VNC, SPICE-GTK ಮತ್ತು libvirt ನೊಂದಿಗೆ ನಿರ್ಮಿಸಲಾದ ದೂರಸ್ಥ ಗಣಕತೆರೆ ಕ್ಲೈಂಟ್"
 
 #: ../src/virt-viewer-about.xml.h:5
 msgid "virt-manager.org"
@@ -260,123 +267,118 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr "ಫೆಡೋರ ಟ್ರಾನ್ಸಲೇಶನ್ ಟೀಮ್"
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr "ನೀವು ಈ ಅಧಿವೇಶನವನ್ನು ಮುಚ್ಚಲು ಬಯಸುವಿರಾ?"
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr "ಪುನಃ ನನ್ನನ್ನು ಕೇಳಬೇಡ"
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr "%d ಪ್ರದರ್ಶಕಕ್ಕಾಗಿ ಕಾಯಲಾಗುತ್ತಿದೆ..."
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
-msgstr "%s ಅತಿಥಿಗಾಗಿ ಗೊತ್ತಿರದ ಗ್ರಾಫಿಕ್ ಬಗೆ"
+msgid "Unsupported graphic type '%s'"
+msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr "ssh ಗೆ ಸಂಪರ್ಕವು ವಿಫಲಗೊಂಡಿದೆ."
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
-msgstr ""
-"ಚಾನಲ್‌ನೊಂದಿಗೆ ಸಂಪರ್ಕಸಾಧಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ, SSH ಅನ್ನು ಮಾತ್ರ ಬೆಂಬಲಿಸಲಾಗುತ್ತದೆ."
+msgstr "ಚಾನಲ್‌ನೊಂದಿಗೆ ಸಂಪರ್ಕಸಾಧಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ, SSH ಅನ್ನು ಮಾತ್ರ ಬೆಂಬಲಿಸಲಾಗುತ್ತದೆ."
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr "ಚಾನಲ್‌ನೊಂದಿಗೆ ಸಂಪರ್ಕಸಾಧಿಸುವುದನ್ನು ಬೆಂಬಲಿಸಲಾಗುತ್ತದೆ."
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr "ಗ್ರಾಫಿಕ್ ಪೂರೈಕೆಗಣಕದೊಂದಿಗೆ ಸಂಪರ್ಕಸಾಧಿಸಲಾಗುತ್ತಿದೆ"
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr "ಅತಿಥಿ ಡೊಮೈನ್ ಅನ್ನು ಸ್ಥಗಿತಗೊಳಿಸಲಾಗಿದೆ"
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr "ಗ್ರಾಫಿಕ್ ಪೂರೈಕೆಗಣಕದೊಂದಿಗೆ ಸಂಪರ್ಕಿತಗೊಂಡಿದೆ"
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr "%s ಎಂಬ ಗ್ರಾಫಿಕ್ ಪೂರೈಕೆಗಣಕದೊಂದಿಗೆ ಸಂಪರ್ಕಿತಗೊಂಡಿದೆ"
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
-"%s ನಲ್ಲಿನ ದೂರದ ಗಣಕತೆರೆ ಪೂರೈಕೆಗಣಕದೊಂದಿಗೆ ದೃಢೀಕರಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s\n"
-"ಸಂಪರ್ಕಕ್ಕಾಗಿ ಇನ್ನೊಮ್ಮೆ ಪ್ರಯತ್ನಿಸಬೇಕೆ?"
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr "ದೂರದ ಗಣಕತೆರೆ ಪೂರೈಕೆಗಣಕದೊಂದಿಗೆ ದೃಢೀಕರಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s"
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr "USB ಮರುನಿರ್ದೇಶನ ದೋಷ: %s"
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr "ಗಾತ್ರ ಬದಲಾವಣೆ ಮಟ್ಟವು  %d-%d ರ ನಡುವೆ ಇರಬೇಕು\n"
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr "%d ಅನ್ನು ತೋರಿಸು"
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr "ಅಮಾನ್ಯವಾದ ಕಿಯೋಸ್ಕ್-ನಿರ್ಗಮನದ ಆರ್ಗ್ಯುಮೆಂಟ್: %s"
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr "ಕಿಟಕಿಯ ಗಾತ್ರ ಬದಲಾವಣೆ, ಪ್ರತಿಶತದಲ್ಲಿ"
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
-"ಪೂರ್ಣತೆರೆ ಕ್ರಮದಲ್ಲಿ ತೆರೆ (ಕ್ಲೈಂಟ್‌ನ ರೆಸಲ್ಯೂಶನ್‌ಗೆ ಹೊಂದಿಕೆಯಾಗುವಂತೆ ಅತಿಥಿಯನ್ನು"
-" ಸರಿಹೊಂದಿಸುತ್ತದೆ)."
+"ಪೂರ್ಣತೆರೆ ಕ್ರಮದಲ್ಲಿ ತೆರೆ (ಕ್ಲೈಂಟ್‌ನ ರೆಸಲ್ಯೂಶನ್‌ಗೆ ಹೊಂದಿಕೆಯಾಗುವಂತೆ ಅತಿಥಿಯನ್ನು "
+"ಸರಿಹೊಂದಿಸುತ್ತದೆ)."
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr "ಹಾಟ್‌ಕೀಲಿಗಳನ್ನು ಅಗತ್ಯಾನುಗುಣಗೊಳಿಸು"
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr "ಕಿಯೋಸ್ಕ್ ಕ್ರಮವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸು"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr "ಕಿಯೋಸ್ಕ್ ಕ್ರಮದಲ್ಲಿ ಒದಗಿಸಲಾದ ಸ್ಥಿತಿಯಲ್ಲಿ ನಿರ್ಗಮಿಸು"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr "<never|on-disconnect>"
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr "ವರ್ಬೋಸ್ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸು"
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr "ದೋಷನಿದಾನ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸು"
 
@@ -394,11 +396,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr "ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ"
@@ -419,6 +423,10 @@ msgstr "ಬಳಕೆದಾರ ಹೆಸರು:"
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -451,38 +459,40 @@ msgstr "Virt Viewer"
 #: ../src/virt-viewer-main.c:80
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options"
-msgstr ""
-"ಲಭ್ಯವಿರುವ ಆಜ್ಞಾಸಾಲಿನ ಆಯ್ಕೆಗಳ ಸಂಪೂರ್ಣ ಪಟ್ಟಿಗಾಗಿ  '%s --help' ಅನ್ನು ಚಲಾಯಿಸಿ"
+msgstr "ಲಭ್ಯವಿರುವ ಆಜ್ಞಾಸಾಲಿನ ಆಯ್ಕೆಗಳ ಸಂಪೂರ್ಣ ಪಟ್ಟಿಗಾಗಿ  '%s --help' ಅನ್ನು ಚಲಾಯಿಸಿ"
 
 #: ../src/virt-viewer-main.c:86
 msgid "Virtual machine graphical console"
 msgstr "- ವರ್ಚುವಲ್ ಗಣಕದ ಗ್ರಾಫಿಕಲ್‌ ಕನ್ಸೋಲ್"
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
+
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
 "\n"
-"ಬಳಕೆ: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
-"\n"
-"%s\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
 "\n"
+msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr "ಮರುನಿರ್ದೇಶನಕ್ಕಾಗಿ USB ಸಾಧನಗಳನ್ನು ಆರಿಸಿ"
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr "ಬೆಂಬಲವಿರದ ದೃಢೀಕರಣದ ಬಗೆ %d"
@@ -491,117 +501,127 @@ msgstr "ಬೆಂಬಲವಿರದ ದೃಢೀಕರಣದ ಬಗೆ %d"
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr "Ctrl+Alt+_Del"
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr "Ctrl+Alt+_Backspace"
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr "Ctrl+Alt+F_1"
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr "Ctrl+Alt+F_2"
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr "Ctrl+Alt+F_3"
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr "Ctrl+Alt+F_4"
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr "Ctrl+Alt+F_5"
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr "Ctrl+Alt+F_6"
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr "Ctrl+Alt+F_7"
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr "Ctrl+Alt+F_8"
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr "Ctrl+Alt+F_9"
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr "Ctrl+Alt+F1_0"
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr "Ctrl+Alt+F11"
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr "Ctrl+Alt+F12"
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr "ತೆರೆಚಿತ್ರ"
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr "ಸಂಪರ್ಕ ಕಡಿದುಹಾಕು"
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr "USB ಸಾಧನವನ್ನು ಆರಿಸುವಿಕೆ"
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr "ಕೀಲಿಯ ಸಂಯೋಜನೆಯನ್ನು ಕಳುಹಿಸು"
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr "ಪೂರ್ಣತೆರೆಯಿಂದ ನಿರ್ಗಮಿಸು"
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr "Ctrl+Alt"
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr "(ಸೂಚಕವನ್ನು ಮುಕ್ತಗೊಳಿಸಲು %s ಅನ್ನು ಒತ್ತಿ)"
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr "%s%s%s - %s"
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr " "
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr "ಈ ಸಂಪರ್ಕವನ್ನು ಸಿದ್ಧಗೊಳಿಸಲು ಕನಿಷ್ಟ %s ಆವೃತ್ತಿ %s ಅಗತ್ಯವಿದೆ"
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr "ಅತಿಥಿ ಡೊಮೈನ್ ಮರಳಿ-ಆರಂಭಗೊಳ್ಳಲು ಕಾಯಲಾಗುತ್ತಿದೆ"
 
@@ -610,59 +630,69 @@ msgstr "ಅತಿಥಿ ಡೊಮೈನ್ ಮರಳಿ-ಆರಂಭಗೊಳ್
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr "%s ಎಂಬ ಅತಿಥಿಗಾಗಿ ಗ್ರಾಫಿಕ್‌ನ ಬಗೆಯನ್ನು ನಿರ್ಧರಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr "%s ಎಂಬ ಅತಿಥಿಗಾಗಿ ಆತಿಥೇಯವನ್ನು ನಿರ್ಧರಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr "libvirt ಆರಂಭಗೊಳ್ಳುವವರೆಗೆ ಕಾಯಲಾಗುತ್ತಿದೆ"
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr "ಅತಿಥಿ ಡೊಮೈನ್ ಅನ್ನು ಪತ್ತೆ ಮಾಡಲಾಗುತ್ತಿದೆ"
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr "ಅತಿಥಿ ಡೊಮೈನ್ ನಿರ್ಮಾಣಗೊಳ್ಳಲು ಕಾಯಲಾಗುತ್ತಿದೆ"
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr "ಅತಿಥಿ ಡೊಮೈನ್ ಸ್ಥಿತಿಯನ್ನು ಪರಿಶೀಲಿಸಲಾಗುತ್ತಿದೆ"
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr "ಅತಿಥಿ ಡೊಮೈನ್ ಮರಳಿ-ಆರಂಭಗೊಳ್ಳಲು ಕಾಯಲಾಗುತ್ತಿದೆ"
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr "[ಯಾವುದೂ ಇಲ್ಲ]"
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr "ಕಡತ (_F)"
@@ -675,35 +705,39 @@ msgstr "ಸ್ಮಾರ್ಟ್ ಕಾರ್ಡ್ ಸೇರಿಸುವಿಕ�
 msgid "Smartcard removal"
 msgstr "ಸ್ಮಾರ್ಟ್ ಕಾರ್ಡ್ ತೆಗೆದುಹಾಕುವಿಕೆ"
 
-#: ../src/virt-viewer.xml.h:6
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:7
 msgid "_View"
 msgstr "ನೋಟ (_V)"
 
-#: ../src/virt-viewer.xml.h:7
+#: ../src/virt-viewer.xml.h:8
 msgid "Full screen"
 msgstr "ಪೂರ್ಣ ತೆರೆ"
 
-#: ../src/virt-viewer.xml.h:8
+#: ../src/virt-viewer.xml.h:9
 msgid "_Zoom"
 msgstr "ಹಿಗ್ಗಿಸು/ಕುಗ್ಗಿಸು (_Z)"
 
-#: ../src/virt-viewer.xml.h:9
+#: ../src/virt-viewer.xml.h:10
 msgid "Displays"
 msgstr "ಪ್ರದರ್ಶಕಗಳು"
 
-#: ../src/virt-viewer.xml.h:10
+#: ../src/virt-viewer.xml.h:11
 msgid "Release cursor"
 msgstr "ತೆರೆಸೂಚಕವನ್ನು ಮುಕ್ತಗೊಳಿಸು"
 
-#: ../src/virt-viewer.xml.h:11
+#: ../src/virt-viewer.xml.h:12
 msgid "_Send key"
 msgstr "ಕಳುಹಿಸುವ ಕೀಲಿ (_S)"
 
-#: ../src/virt-viewer.xml.h:12
+#: ../src/virt-viewer.xml.h:13
 msgid "_Help"
 msgstr "ನೆರವು (_H)"
 
-#: ../src/virt-viewer.xml.h:13
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -730,3 +764,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 240c81c..58980d5 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Automatically generated, 2010
 # eukim <eukim@redhat.com>, 2013
@@ -12,18 +12,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: 2015-01-12 06:21-0500\n"
 "Last-Translator: Daniel Berrange <dan-transifex@berrange.com>\n"
-"Language-Team: Korean (http://www.transifex.com/projects/p/virt-viewer/language/ko/)\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/virt-viewer/"
+"language/ko/)\n"
+"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.7.3\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr "원격 뷰어"
 
@@ -77,26 +78,26 @@ msgstr "바인딩 플래그 "
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
-msgstr "remote-viewer 버전 %s\n"
+msgid "remote-viewer version %s"
+msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr "버전 정보 보기 "
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr "창 제목 설정 "
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr "Spice 컨트롤러 통신을 사용하여 연결을 오픈합니다 "
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
@@ -105,17 +106,17 @@ msgstr ""
 "%s\n"
 "사용 가능한 명령행 옵션의 전체 목록을 보려면 '%s --help'를 실행하십시오\n"
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr "오류: Spice 컨트롤러를 사용하는 도중 불필요한 인수가 지정되었습니다\n"
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr "오류: 여러 URI를 처리할 수 없습니다\n"
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr "연결 초기화 실패 "
 
@@ -128,83 +129,90 @@ msgstr "컨트롤러에 의해 디스플레이가 비활성화됨 "
 msgid "Controller connection failed: %s"
 msgstr "컨트롤러 연결에 실패함: %s"
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
-msgstr ""
-
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
-msgstr "상세 연결 정보"
-
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
 #: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
-msgstr ""
-
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
-msgstr ""
-
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
-msgstr "Spice 세션을 생성할 수 없음 "
-
-#: ../src/remote-viewer.c:1221
 msgid "Setting up Spice session..."
 msgstr "Spice 세션 설정 중..."
 
-#: ../src/remote-viewer.c:1243
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
+msgstr ""
+
+#: ../src/remote-viewer.c:1120
 #, c-format
-msgid "Invalid file %s"
-msgstr "잘못된 파일 %s"
+msgid "Invalid file %s: "
+msgstr ""
 
-#: ../src/remote-viewer.c:1250
+#: ../src/remote-viewer.c:1128
 msgid "Cannot determine the connection type from URI"
 msgstr "URI에서 연결 유형을 지정할 수 없음 "
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
-msgstr "이러한 유형의 세션을 생성할 수 없음: %s"
-
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
+msgstr "상세 연결 정보"
+
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
+msgstr ""
+
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr "Glade에 관하여 "
@@ -257,120 +265,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr "Fedora 번역팀 "
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr "세션을 종료하시겠습니까?"
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr "다시 묻지 않습니다 "
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr "디스플레이 %d를 기다리는 중..."
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
-msgstr "게스트 %s의 그래픽 유형을 알 수 없습니다 "
+msgid "Unsupported graphic type '%s'"
+msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr "ssh 연결을 실패했습니다. "
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr "채널에 연결할 수 없습니다, SSH만 지원됩니다. "
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr "지원되지 않는 채널에 연결합니다. "
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr "그래픽 서버에 연결 중 "
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr "게스트 도메인이 종료되었습니다 "
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr "그래픽 서버에 연결 "
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr "그래픽 서버 %s에 연결할 수 없음 "
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
-"%s의 원격 데스크톱 서버에 인증할 수 없습니다: %s\n"
-"연결을 다시 시도 하시겠습니까? "
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr "원격 데스크탑 서버로 인증할 수 없음: %s"
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr "USB 리디렉션 오류: %s"
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr "디스플레이 %d"
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr "윈도우의 줌 레벨 (백분율) "
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr "핫키 사용자 정의 "
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr "상세 정보 보기 "
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr "디버그 정보 보기 "
 
@@ -388,11 +392,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr "인증이 필요함 "
@@ -413,6 +419,10 @@ msgstr "사용자 이름 "
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -445,37 +455,41 @@ msgstr "가상 머신 뷰어 "
 #: ../src/virt-viewer-main.c:80
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options"
-msgstr "사용 가능한 명령행 옵션의 전체 목록을 보려면 '%s --help'를 실행하십시오 "
+msgstr ""
+"사용 가능한 명령행 옵션의 전체 목록을 보려면 '%s --help'를 실행하십시오 "
 
 #: ../src/virt-viewer-main.c:86
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
+
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
 "\n"
-"사용법: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
-"\n"
-"%s\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
 "\n"
+msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr "리디렉션을 위한 USB 장치 선택 "
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr "지원되지 않는 인증 유형 %d"
@@ -484,117 +498,127 @@ msgstr "지원되지 않는 인증 유형 %d"
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr "Ctrl+Alt+Del(_D) "
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr "Ctrl+Alt+Backspace(_B)"
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr "Ctrl+Alt+F_1"
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr "Ctrl+Alt+F_2"
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr "Ctrl+Alt+F_3"
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr "Ctrl+Alt+F_4"
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr "Ctrl+Alt+F_5"
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr "Ctrl+Alt+F_6"
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr "Ctrl+Alt+F_7"
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr "Ctrl+Alt+F_8"
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr "Ctrl+Alt+F_9"
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr "Ctrl+Alt+F1_0"
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr "Ctrl+Alt+F11"
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr "Ctrl+Alt+F12"
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr "스크린샷 "
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr "연결 해제 "
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr "USB 장치 선택 "
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr "조합 키 전송"
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr "전체 화면 해제 "
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr "Ctrl+Alt"
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr "(포인터를 개방하려면 %s를 누르십시오)"
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr "%s%s%s - %s"
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr " "
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr "다시 시작할 게스트 도메인을 기다리는 중 "
 
@@ -603,59 +627,69 @@ msgstr "다시 시작할 게스트 도메인을 기다리는 중 "
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr "게스트 %s의 그래픽 유형을 지정할 수 없음 "
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr "게스트 %s의 호스트를 지정할 수 없음 "
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr "libvirt 시작을 기다리는 중 "
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr "게스트 도메인 검색 중 "
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr "게스트 도메인이 생성되기를 기다리는 중 "
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr "게스트 도메인 상태 확인 중 "
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr "시작할 게스트 도메인을 기다리는 중 "
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr "[없음]"
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr "파일(_F)"
@@ -668,35 +702,39 @@ msgstr "스마트카드 삽입 "
 msgid "Smartcard removal"
 msgstr "스마트카드 제거 "
 
-#: ../src/virt-viewer.xml.h:6
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:7
 msgid "_View"
 msgstr "보기(_V)"
 
-#: ../src/virt-viewer.xml.h:7
+#: ../src/virt-viewer.xml.h:8
 msgid "Full screen"
 msgstr "전체 화면 "
 
-#: ../src/virt-viewer.xml.h:8
+#: ../src/virt-viewer.xml.h:9
 msgid "_Zoom"
 msgstr "줌(_Z) "
 
-#: ../src/virt-viewer.xml.h:9
+#: ../src/virt-viewer.xml.h:10
 msgid "Displays"
 msgstr "디스플레이 "
 
-#: ../src/virt-viewer.xml.h:10
+#: ../src/virt-viewer.xml.h:11
 msgid "Release cursor"
 msgstr "커서 개방 "
 
-#: ../src/virt-viewer.xml.h:11
+#: ../src/virt-viewer.xml.h:12
 msgid "_Send key"
 msgstr "키 전송(_S)"
 
-#: ../src/virt-viewer.xml.h:12
+#: ../src/virt-viewer.xml.h:13
 msgid "_Help"
 msgstr "도움말(_H) "
 
-#: ../src/virt-viewer.xml.h:13
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -723,3 +761,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/kw.po b/po/kw.po
index ba5a5aa..80173d9 100644
--- a/po/kw.po
+++ b/po/kw.po
@@ -2,23 +2,24 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Cornish\n"
+"Language: kw\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: kw\n"
-"Plural-Forms: nplurals=4; plural= (n==1) ? 0 : (n==2) ? 1 : (n == 3) ? 2 : 3\n"
+"Plural-Forms: nplurals=4; plural= (n==1) ? 0 : (n==2) ? 1 : (n == 3) ? 2 : "
+"3\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +73,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +122,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +245,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +372,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +399,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +441,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +477,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +606,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +681,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +740,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/kw@kkcor.po b/po/kw@kkcor.po
index ffe32d0..827103c 100644
--- a/po/kw@kkcor.po
+++ b/po/kw@kkcor.po
@@ -2,23 +2,24 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Cornish (Common Orthography)\n"
+"Language: kw@kkcor\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: kw@kkcor\n"
-"Plural-Forms: nplurals=4; plural= (n==1) ? 0 : (n==2) ? 1 : (n == 3) ? 2 : 3\n"
+"Plural-Forms: nplurals=4; plural= (n==1) ? 0 : (n==2) ? 1 : (n == 3) ? 2 : "
+"3\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +73,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +122,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +245,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +372,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +399,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +441,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +477,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +606,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +681,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +740,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/kw@uccor.po b/po/kw@uccor.po
index 82d3204..7917662 100644
--- a/po/kw@uccor.po
+++ b/po/kw@uccor.po
@@ -2,23 +2,24 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Cornish (Unified Orthography)\n"
+"Language: kw@uccor\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: kw@uccor\n"
-"Plural-Forms: nplurals=4; plural= (n==1) ? 0 : (n==2) ? 1 : (n == 3) ? 2 : 3\n"
+"Plural-Forms: nplurals=4; plural= (n==1) ? 0 : (n==2) ? 1 : (n == 3) ? 2 : "
+"3\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +73,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +122,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +245,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +372,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +399,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +441,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +477,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +606,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +681,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +740,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/kw_GB.po b/po/kw_GB.po
index 4d09e8e..96d020b 100644
--- a/po/kw_GB.po
+++ b/po/kw_GB.po
@@ -2,23 +2,24 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Cornish (United Kingdom)\n"
+"Language: kw-GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: kw-GB\n"
-"Plural-Forms: nplurals=4; plural= (n==1) ? 0 : (n==2) ? 1 : (n == 3) ? 2 : 3\n"
+"Plural-Forms: nplurals=4; plural= (n==1) ? 0 : (n==2) ? 1 : (n == 3) ? 2 : "
+"3\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +73,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +122,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +245,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +372,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +399,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +441,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +477,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +606,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +681,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +740,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/ky.po b/po/ky.po
index e017404..4ba26ba 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Kirghiz\n"
+"Language: ky\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ky\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/lt.po b/po/lt.po
index b124c2c..e10381c 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -2,23 +2,24 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Lithuanian\n"
+"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: lt\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 or n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 or n%100>=20) ? 1 : 2)\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +73,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +122,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +245,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +372,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +399,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +441,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +477,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +606,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +681,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +740,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/lv.po b/po/lv.po
index 3cd13e6..f96e476 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -2,23 +2,24 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Latvian\n"
+"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: lv\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
+"2)\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +73,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +122,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +245,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +372,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +399,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +441,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +477,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +606,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +681,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +740,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/mai.po b/po/mai.po
index a59c0ed..a6080e3 100644
--- a/po/mai.po
+++ b/po/mai.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Maithili\n"
+"Language: mai\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: mai\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/mk.po b/po/mk.po
index b4bfc5d..0434277 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Macedonian\n"
+"Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: mk\n"
 "Plural-Forms: nplurals=2; plural= n==1 || n%10==1 ? 0 : 1\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/ml.po b/po/ml.po
index 5c2d1aa..078c974 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Ani Peter <apeter@redhat.com>, 2010,2012-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: 2015-01-12 06:21-0500\n"
 "Last-Translator: Daniel Berrange <dan-transifex@berrange.com>\n"
-"Language-Team: Malayalam (http://www.transifex.com/projects/p/virt-viewer/language/ml/)\n"
+"Language-Team: Malayalam (http://www.transifex.com/projects/p/virt-viewer/"
+"language/ml/)\n"
+"Language: ml\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ml\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.7.3\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr "റിമോട്ട് വ്യൂവര്‍"
 
@@ -73,47 +74,46 @@ msgstr "ബൈന്‍ഡ് ചെയ്യുന്ന ഫ്ലാഗുക�
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
-msgstr "remote-viewer പതിപ്പു് %s\n"
+msgid "remote-viewer version %s"
+msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr "പതിപ്പിനെപ്പറ്റിയുള്ള വിവരം കാണിയ്ക്കുക"
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr "ജാലകത്തിന്റെ തലക്കെട്ട് സജ്ജമാക്കുക"
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr "സ്പയിസ് കണ്ട്രോളര്‍ ആശയവിനിമയം ഉപയോഗിച്ചു് കണക്ഷന്‍ തുറക്കുക"
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr "റിമോട്ട് വ്യൂവര്‍ ക്ലയന്റ്"
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 "%s\n"
-"ലഭ്യമായ കമാന്‍ഡ് ലൈന്‍ ഐച്ഛികങ്ങളുടെ പൂര്‍ണ്ണ പട്ടിക കാണുന്നതിനായി '%s --help' പ്രവര്‍ത്തിപ്പിയ്ക്കുക\n"
+"ലഭ്യമായ കമാന്‍ഡ് ലൈന്‍ ഐച്ഛികങ്ങളുടെ പൂര്‍ണ്ണ പട്ടിക കാണുന്നതിനായി '%s --help' "
+"പ്രവര്‍ത്തിപ്പിയ്ക്കുക\n"
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
-msgstr ""
-"പിശക്: സ്പയിസ് കണ്ട്രോളര്‍ ഉപയോഗിയ്ക്കുമ്പോള്‍ നല്‍കുന്ന അധികമായ "
-"ആര്‍ഗ്യുമെന്റുകള്‍\n"
+msgstr "പിശക്: സ്പയിസ് കണ്ട്രോളര്‍ ഉപയോഗിയ്ക്കുമ്പോള്‍ നല്‍കുന്ന അധികമായ ആര്‍ഗ്യുമെന്റുകള്‍\n"
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr "പിശക്: അനവധി യുആര്‍ഐ കൈകാര്യം ചെയ്യുവാന്‍ സാധ്യമല്ല\n"
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr "കണക്ഷന്‍ ആരംഭിയ്ക്കുന്നതില്‍ പരാജയം"
 
@@ -126,83 +126,90 @@ msgstr "കണ്ട്രോളര്‍ പ്രദര്‍ശനം പ്�
 msgid "Controller connection failed: %s"
 msgstr "കണ്ട്രോളറിനുള്ള കണക്ഷന്‍ പരാജയപ്പെട്ടു: %s"
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
-msgstr "കണക്ഷന്‍ വിശദാംശങ്ങള്‍"
-
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
-msgstr "_കണക്ഷനുള്ള വിലാസം"
-
 #: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
-msgstr "ഉദാഹരണത്തിനു്, spice://foo.example.org:5900"
-
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
-msgstr "_ഏറ്റവും പുതിയ കണക്ഷനുകള്‍"
-
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
-msgstr "ഒരു സ്പയിസ് സെഷന്‍ തയ്യാറാക്കുവാന്‍ സാധ്യമല്ല"
-
-#: ../src/remote-viewer.c:1221
 msgid "Setting up Spice session..."
 msgstr "സ്പയിസ് സെഷന്‍ സജ്ജമാക്കുന്നു..."
 
-#: ../src/remote-viewer.c:1243
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
+msgstr ""
+
+#: ../src/remote-viewer.c:1120
 #, c-format
-msgid "Invalid file %s"
-msgstr "തെറ്റായ ഫയല്‍ %s"
+msgid "Invalid file %s: "
+msgstr ""
 
-#: ../src/remote-viewer.c:1250
+#: ../src/remote-viewer.c:1128
 msgid "Cannot determine the connection type from URI"
 msgstr "യുആര്‍ഐയില്‍ നിന്നും കണക്ഷന്‍ രീതി കണ്ടുപിടിയ്ക്കുവാന്‍ സാധ്യമല്ല"
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
-msgstr "ഈ തരത്തിനുള്ളൊരു സെഷന്‍ തയ്യാറാക്കുവാന്‍ സാധ്യമല്ല: %s"
-
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
+msgstr "കണക്ഷന്‍ വിശദാംശങ്ങള്‍"
+
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
+msgstr "ഉദാഹരണത്തിനു്, spice://foo.example.org:5900"
+
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
+msgstr ""
+
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr "ഗ്ലേഡിനെപ്പറ്റി"
@@ -217,9 +224,7 @@ msgstr ""
 
 #: ../src/virt-viewer-about.xml.h:4
 msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt"
-msgstr ""
-"GTK-VNC, SPICE-GTK, libvirt എന്നിവ ഉപയോഗിച്ചുള്ളൊരു റിമോട്ട് ഡസ്ക്ടോപ്പ് "
-"ക്ലയന്റ്"
+msgstr "GTK-VNC, SPICE-GTK, libvirt എന്നിവ ഉപയോഗിച്ചുള്ളൊരു റിമോട്ട് ഡസ്ക്ടോപ്പ് ക്ലയന്റ്"
 
 #: ../src/virt-viewer-about.xml.h:5
 msgid "virt-manager.org"
@@ -241,136 +246,132 @@ msgid ""
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
 msgstr ""
-"ഈ പ്രോഗ്രാം സ്വതന്ത്ര സോഫ്റ്റ്‌വെയര്‍ ആകുന്നു; നിങ്ങള്‍ക്കിത് ഗ്നു ജനറല്‍ പബ്ലിക്ലൈസന്‍സിന്റെ നിബന്ധനകള്‍ പ്രകാരം (രണ്ടാം ലക്കം അല്ലെങ്കില്‍ നിങ്ങളുടെ താല്‍പര്യമനുസരിച്ച് അതിലും പുതിയ ലക്കം) വീണ്ടും വിതരണം ചെയ്യുകയോ മാറ്റം വരുത്തുകയോ ചെയ്യാം. ഫ്രീ സോഫ്റ്റ്‌വെയര്‍ ഫൌണ്ടേഷന്‍ ആണ് ഈ ലൈസന്‍സ് പ്രസിദ്ധീകരിച്ചിട്ടുള്ളത്.\n"
+"ഈ പ്രോഗ്രാം സ്വതന്ത്ര സോഫ്റ്റ്‌വെയര്‍ ആകുന്നു; നിങ്ങള്‍ക്കിത് ഗ്നു ജനറല്‍ പബ്ലിക്ലൈസന്‍സിന്റെ നിബന്ധനകള്‍ "
+"പ്രകാരം (രണ്ടാം ലക്കം അല്ലെങ്കില്‍ നിങ്ങളുടെ താല്‍പര്യമനുസരിച്ച് അതിലും പുതിയ ലക്കം) വീണ്ടും "
+"വിതരണം ചെയ്യുകയോ മാറ്റം വരുത്തുകയോ ചെയ്യാം. ഫ്രീ സോഫ്റ്റ്‌വെയര്‍ ഫൌണ്ടേഷന്‍ ആണ് ഈ ലൈസന്‍സ് "
+"പ്രസിദ്ധീകരിച്ചിട്ടുള്ളത്.\n"
 "\n"
-"വളരെ ഫലപ്രദമായ പ്രോഗ്രാം എന്ന പ്രതീക്ഷയിലാകുന്നു ഈ പ്രോഗ്രാം വിതരണം ചെയ്തത്.ഇതിന് വാറന്റി ലഭ്യമല്ല. കൂടുതല്‍ വിവരങ്ങള്‍ക്കായി ഗ്നു ജനറല്‍ പബ്ളിക് ലൈസന്‍സ് കാണുക.\n"
+"വളരെ ഫലപ്രദമായ പ്രോഗ്രാം എന്ന പ്രതീക്ഷയിലാകുന്നു ഈ പ്രോഗ്രാം വിതരണം ചെയ്തത്.ഇതിന് വാറന്റി "
+"ലഭ്യമല്ല. കൂടുതല്‍ വിവരങ്ങള്‍ക്കായി ഗ്നു ജനറല്‍ പബ്ളിക് ലൈസന്‍സ് കാണുക.\n"
 "\n"
-"ഈ പ്രോഗ്രാമിനൊപ്പം നിങ്ങള്‍ക്ക് ഗ്നു ജനറല്‍ പബ്ലിക് ലൈസന്‍സിന്റെ ഒരു പകര്‍പ്പും ലഭിച്ചിരിക്കണം, ഇല്ലായെങ്കില്‍, ‌താഴെ പറയുന്ന മേല്‍വിലാസത്തിലേക്ക് എഴുതുക:  Free Software\n"
+"ഈ പ്രോഗ്രാമിനൊപ്പം നിങ്ങള്‍ക്ക് ഗ്നു ജനറല്‍ പബ്ലിക് ലൈസന്‍സിന്റെ ഒരു പകര്‍പ്പും ലഭിച്ചിരിക്കണം, "
+"ഇല്ലായെങ്കില്‍, ‌താഴെ പറയുന്ന മേല്‍വിലാസത്തിലേക്ക് എഴുതുക:  Free Software\n"
 "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
 
 #: ../src/virt-viewer-about.xml.h:20
 msgid "The Fedora Translation Team"
 msgstr "ഫെഡോറാ പ്രാദേശികവത്കരണ സംഘം"
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr "ഈ സെഷന്‍ അടയ്ക്കണമോ?"
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr "ഇനി ചോദിയ്ക്കരുതു്"
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr "%d പ്രദര്‍ശനത്തിനായി കാത്തിരിയ്ക്കുന്നു..."
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
-msgstr "ഗസ്റ്റ് %s-നുള്ള അപരിചിതമായ ഗ്രാഫിക് രീതി"
+msgid "Unsupported graphic type '%s'"
+msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr "ssh-ലേക്കുള്ള കണക്ഷന്‍ പരാജയപ്പെട്ടു."
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
-msgstr ""
-"ചാനലിലേക്കു് കണക്ട് ചെയ്യുവാന്‍ സാധ്യമല്ല, എസ്എസ്എചിനു് മാത്രം പിന്തുണ "
-"ലഭ്യമുള്ളൂ."
+msgstr "ചാനലിലേക്കു് കണക്ട് ചെയ്യുവാന്‍ സാധ്യമല്ല, എസ്എസ്എചിനു് മാത്രം പിന്തുണ ലഭ്യമുള്ളൂ."
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr "ചാനലിലേക്കുള്ള കണക്ഷനു് പിന്തുണയില്ല."
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr "ഗ്രാഫിക് സര്‍വറിലേക്കു് കണക്ട് ചെയ്യുന്നു"
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr "ഗസ്റ്റ് ഡൊമെയിന്‍ അടച്ചുപൂട്ടിയിരിയ്ക്കുന്നു"
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr "ഗ്രാഫിക് സര്‍വറിലേക്കു് കണക്ട് ചെയ്തിരിയ്ക്കുന്നു"
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr "ഗ്രാഫിക് സര്‍വര്‍ %s-ലേക്കു് കണക്ട് ചെയ്യുവാന്‍ സാധ്യമല്ല"
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
-"%s-ല്‍ റിമോട്ട് ഡസ്ക്ടോപ്പ് സര്‍വറിലേക്കു് ആധികാരികത ഉറപ്പാക്കുവാന്‍ സാധ്യമല്ല: %s\n"
-"വീണ്ടും ശ്രമിയ്ക്കണമോ?"
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
-msgstr ""
-"റിമോട്ട് ഡസ്ക്ടോപ്പ് സര്‍വറിനൊപ്പം ആധികാരികത ഉറപ്പാക്കുവാന്‍ സാധ്യമല്ല: %s"
+msgstr "റിമോട്ട് ഡസ്ക്ടോപ്പ് സര്‍വറിനൊപ്പം ആധികാരികത ഉറപ്പാക്കുവാന്‍ സാധ്യമല്ല: %s"
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr "യുഎസ്ബി റീഡയറക്ഷന്‍ പിശക്: %s"
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr "സൂം ലവല്‍ %d-%d ആയിരിയ്ക്കണം\n"
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr "%d പ്രദര്‍ശിപ്പിയ്ക്കുക"
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr "തെറ്റായ kiosk-quit ആര്‍ഗ്യുമെന്റ്: %s"
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr "ജാലകത്തിന്റെ സൂം ലവല്‍, ശതമാനത്തില്‍"
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
-msgstr ""
-"സ്ക്രീന്‍ പൂര്‍ണ്ണവലിപ്പത്തില്‍ തുറക്കുക (ക്ലയന്റിനു് പാകത്തിനു് ഗസ്റ്റ് "
-"റിസല്യൂഷന്‍ സജ്ജമാക്കുന്നു)"
+msgstr "സ്ക്രീന്‍ പൂര്‍ണ്ണവലിപ്പത്തില്‍ തുറക്കുക (ക്ലയന്റിനു് പാകത്തിനു് ഗസ്റ്റ് റിസല്യൂഷന്‍ സജ്ജമാക്കുന്നു)"
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr "എഴുപ്പവഴികള്‍ യഥേഷ്ടമാക്കുക"
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr "കിയോസ്ക് മോഡ് പ്രവര്‍ത്തന സജ്ജമാക്കുക"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr "കിയോസ്ക് മോഡിലുള്ള നല്‍കിയിരിയ്ക്കുന്ന അവസ്ഥയില്‍ പുറത്തു് കടക്കുക"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr "<never|on-disconnect>"
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr "വെര്‍ബോസ് വിവരം കാണിയ്ക്കുക"
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr "ഡീബഗ്ഗിങ് വിവരം കാണിയ്ക്കുക"
 
@@ -388,11 +389,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr "ആധികാരികത ഉറപ്പാക്കല്‍ ആവശ്യമുണ്ടു്"
@@ -413,6 +416,10 @@ msgstr "ഉപയോക്തൃനാമം:"
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -446,38 +453,40 @@ msgstr "വിര്‍ട്ട് വ്യൂവര്‍"
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options"
 msgstr ""
-"ലഭ്യമായ കമാന്‍ഡ് ലൈന്‍ ഐച്ഛികങ്ങളുടെ പൂര്‍ണ്ണ പട്ടിക കാണുന്നതിനായി '%s "
-"--help' പ്രവര്‍ത്തിപ്പിയ്ക്കുക"
+"ലഭ്യമായ കമാന്‍ഡ് ലൈന്‍ ഐച്ഛികങ്ങളുടെ പൂര്‍ണ്ണ പട്ടിക കാണുന്നതിനായി '%s --help' പ്രവര്‍ത്തിപ്പിയ്ക്കുക"
 
 #: ../src/virt-viewer-main.c:86
 msgid "Virtual machine graphical console"
 msgstr "വിര്‍ച്ച്വല്‍ മഷീന്‍ ഗ്രാഫിക്കല്‍ കണ്‍സോള്‍"
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
+
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
-"\n"
-"%s\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
 "\n"
+msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr "യുഎസ്ബി ഡിവൈസുകള്‍ തെരഞ്ഞെടുക്കുക"
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr "പിന്തുണയില്ലാത്ത ആധികാരികത ഉറപ്പാക്കല്‍ രീതി %d"
@@ -486,117 +495,127 @@ msgstr "പിന്തുണയില്ലാത്ത ആധികാരി�
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr "Ctrl+Alt+_Del"
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr "Ctrl+Alt+_Backspace"
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr "Ctrl+Alt+F_1"
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr "Ctrl+Alt+F_2"
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr "Ctrl+Alt+F_3"
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr "Ctrl+Alt+F_4"
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr "Ctrl+Alt+F_5"
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr "Ctrl+Alt+F_6"
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr "Ctrl+Alt+F_7"
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr "Ctrl+Alt+F_8"
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr "Ctrl+Alt+F_9"
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr "Ctrl+Alt+F1_0"
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr "Ctrl+Alt+F11"
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr "Ctrl+Alt+F12"
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr "സ്ക്രീന്‍ഷോട്ട്"
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr "കണക്ഷന്‍ വിഛേദിയ്ക്കുക"
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr "യുഎസ്ബി ഡിവൈസ് തെരഞ്ഞെടുക്കല്‍"
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr "കീ കൂട്ടം അയയ്ക്കുക"
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr "പൂര്‍ണ്ണസ്ക്രീനില്‍ നിന്നും മാറുക"
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr "Ctrl+Alt"
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr "(പോയിന്റര്‍ വിടുന്നതിനായി %s അമര്‍ത്തുക)"
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr "%s%s%s - %s"
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr " "
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr "ഈ കണക്ഷന്‍ സജ്ജമാക്കുന്നതിനായി കുറഞ്ഞതു് %s പതിപ്പു് %s ആവശ്യമുണ്ടു്"
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr "ഗസ്റ്റ് ഡൊമെയിന്‍ വീണ്ടും ആരംഭിയ്ക്കുന്നതിനായി കാത്തിരിയ്ക്കുന്നു"
 
@@ -605,59 +624,69 @@ msgstr "ഗസ്റ്റ് ഡൊമെയിന്‍ വീണ്ടും
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr "%s ഗസ്റ്റിനുള്ള ഗ്രാഫിക് രീതി കണ്ടുപിടിയ്ക്കുവാന്‍ സാധ്യമല്ല"
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr "ഗസ്റ്റ് %s-നുള്ള ഹോസ്റ്റ് കണ്ടുപിടിയ്ക്കുവാന്‍ സാധ്യമല്ല"
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr "ആരംഭിയ്ക്കുന്നതിനായി libvirt-നു് വേണ്ടി കാത്തിരിയ്ക്കുന്നു"
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr "ഗസ്റ്റ് ഡൊമെയിന്‍ കണ്ടുപിടിയ്ക്കുന്നു"
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr "ഗസ്റ്റ് ഡൊമെയിന്‍ തയ്യാറാക്കുന്നതിനായി കാത്തിരിയ്ക്കുന്നു"
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr "ഗസ്റ്റ് ഡൊമെയിന്‍ അവസ്ഥ പരിശോധിയ്ക്കുന്നു"
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr "ഗസ്റ്റ് ഡൊമെയിന്‍ ആരംഭിയ്ക്കുന്നതിനായി കാത്തിരിയ്ക്കുന്നു"
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr "[ഒന്നുമില്ല]"
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr "_ഫയല്‍"
@@ -670,35 +699,39 @@ msgstr "സ്മാര്‍ട്ട്കാര്‍ഡ് ഇടല്‍"
 msgid "Smartcard removal"
 msgstr "സ്മാര്‍ട്ട്കാര്‍ഡ് നീക്കം ചെയ്യല്‍"
 
-#: ../src/virt-viewer.xml.h:6
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:7
 msgid "_View"
 msgstr "_കാഴ്ച"
 
-#: ../src/virt-viewer.xml.h:7
+#: ../src/virt-viewer.xml.h:8
 msgid "Full screen"
 msgstr "സ്ക്രീന്‍ പൂര്‍ണ്ണവലിപ്പത്തില്‍"
 
-#: ../src/virt-viewer.xml.h:8
+#: ../src/virt-viewer.xml.h:9
 msgid "_Zoom"
 msgstr "_വലുതാക്കുക"
 
-#: ../src/virt-viewer.xml.h:9
+#: ../src/virt-viewer.xml.h:10
 msgid "Displays"
 msgstr "പ്രദര്‍ശനങ്ങള്‍"
 
-#: ../src/virt-viewer.xml.h:10
+#: ../src/virt-viewer.xml.h:11
 msgid "Release cursor"
 msgstr "കര്‍സര്‍ റിലീസ് ചെയ്യുക"
 
-#: ../src/virt-viewer.xml.h:11
+#: ../src/virt-viewer.xml.h:12
 msgid "_Send key"
 msgstr "കീ _അയയ്ക്കുക"
 
-#: ../src/virt-viewer.xml.h:12
+#: ../src/virt-viewer.xml.h:13
 msgid "_Help"
 msgstr "_സഹായം"
 
-#: ../src/virt-viewer.xml.h:13
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -725,3 +758,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/mn.po b/po/mn.po
index c78fad1..ecb9340 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Mongolian\n"
+"Language: mn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: mn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/mr.po b/po/mr.po
index c178362..a433be5 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # sandeeps <sshedmak@redhat.com>, 2010,2012
 # sandeeps <sshedmak@redhat.com>, 2010,2012-2013
@@ -10,18 +10,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: 2015-01-12 06:21-0500\n"
 "Last-Translator: Daniel Berrange <dan-transifex@berrange.com>\n"
-"Language-Team: Marathi (http://www.transifex.com/projects/p/virt-viewer/language/mr/)\n"
+"Language-Team: Marathi (http://www.transifex.com/projects/p/virt-viewer/"
+"language/mr/)\n"
+"Language: mr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: mr\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.7.3\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr "रिमोट व्युअर"
 
@@ -75,26 +76,26 @@ msgstr "बाइंडिंगसाठीचे फ्लॅग्स्"
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
-msgstr "remote-viewer आवृत्ती %s\n"
+msgid "remote-viewer version %s"
+msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr "आवृत्तीविषयी माहिती दाखवा"
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr "पटलाचे शीर्षक सेट करा"
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr "स्पाइस कंट्रोलर संपर्काचा वापर करून जोडणी उघडा"
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr "दूरस्त व्युअर क्लाएंट"
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
@@ -103,17 +104,17 @@ msgstr ""
 "%s\n"
 "उपलब्ध आदेश ओळ पर्यायांची संपूर्ण सूची पहाण्यासाठी '%s --help' चालवा\n"
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr "त्रुटी: स्पाइस् कंट्रोलरचा वापर करतेवेळी अगाऊ घटक दिले\n"
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr "त्रुटी: एकापेक्षा जास्त URIs हाताळणे अशक्य\n"
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr "जोडणी सुरू करण्यास अपयशी"
 
@@ -126,83 +127,90 @@ msgstr "कंट्रोलरतर्फे डिस्पले बंद
 msgid "Controller connection failed: %s"
 msgstr "कंट्रोलर जोडणी अपयशी: %s"
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
-msgstr "जोडणी तपशील"
-
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
-msgstr "जोडणी पत्ता (_C)"
-
 #: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
-msgstr "उदाहरणार्थ, spice://foo.example.org:5900"
-
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
-msgstr "सर्वात नवीन जोडण्या (_R)"
-
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
-msgstr "स्पाइस सत्र निर्माण करणे अशक्य"
-
-#: ../src/remote-viewer.c:1221
 msgid "Setting up Spice session..."
 msgstr "स्पाइस सत्राची मांडणी अशक्य..."
 
-#: ../src/remote-viewer.c:1243
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
+msgstr ""
+
+#: ../src/remote-viewer.c:1120
 #, c-format
-msgid "Invalid file %s"
-msgstr "अवैध फाइल %s"
+msgid "Invalid file %s: "
+msgstr ""
 
-#: ../src/remote-viewer.c:1250
+#: ../src/remote-viewer.c:1128
 msgid "Cannot determine the connection type from URI"
 msgstr "URI पासून जोडणी प्रकार ओळखणे अशक्य"
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
-msgstr "या प्रकारकरीता सत्र निर्माण करणे अशक्य: %s"
-
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
+msgstr "जोडणी तपशील"
+
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
+msgstr "उदाहरणार्थ, spice://foo.example.org:5900"
+
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
+msgstr ""
+
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr "ग्लेड विषयी"
@@ -257,122 +265,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr "Fedora भाषांतरन गट"
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr "सत्र बंद करायचे?"
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr "मला पुन्हा विचारू नका"
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr "डिस्पले %d करीता प्रतिक्षा करत आहे..."
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
-msgstr "अतिथी %s करीता अपरिचीत ग्राफिक प्रकार"
+msgid "Unsupported graphic type '%s'"
+msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr "ssh सह जोडणी अपयशी."
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr "वाहिनीसह जोडणी करणे अशक्य, SSH फक्त याकरीता समर्थन पुरवतो."
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr "वाहिनीसह जोडणी असमर्थीत आहे."
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr "ग्राफिक सर्व्हरसह जोडणी करत आहे"
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr "अतिथी डोमैन बंद झाले"
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr "ग्राफिक सर्व्हरसह जोडणी केली"
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr "ग्राफिक सर्व्हर %s सह जोडणी अशक्य"
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
-"%s: %s येथे रिमोट डेस्कटॉप सर्व्हरसह ओळख पटवणे अशक्य\n"
-"जोडणीकरीता पुन्हा प्रयत्न करायचे?"
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr "रिमोट डेस्कटॉप सर्व्हरसह ओळख पटवणे अशक्य: %s"
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr "USB पुनःनिर्देशन त्रुटी: %s"
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr "झूम स्तर %d-%d अंतर्गत पाहिजे\n"
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr "डिस्पले %d"
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr "अवैध kiosk-quit बाब: %s"
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr "पटलाचे झूम स्तर, टक्केवारित"
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
-msgstr ""
-"पडदाभर मोडमध्ये खुले करा (क्लाएंट घट्ट बसवण्याकरिता अतिथी रेजोल्युशन सुस्थीत"
-" करते)"
+msgstr "पडदाभर मोडमध्ये खुले करा (क्लाएंट घट्ट बसवण्याकरिता अतिथी रेजोल्युशन सुस्थीत करते)"
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr "हॉटकिज पसंतीचे करा"
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr "किओस्क मोड सुरू करा"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr "किओस्क मोडमध्ये दिलेल्या अटीवर बाहेर पडा"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr "<never|on-disconnect>"
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr "शब्दात्मक माहिती दाखवा"
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr "डिबगिंग माहिती दाखवत आहे"
 
@@ -390,11 +392,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr "ओळख पटवणे आवश्यक"
@@ -415,6 +419,10 @@ msgstr "वापरकर्तानाव:"
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -453,31 +461,34 @@ msgstr "उपलब्ध आदेश ओळ पर्यायांची �
 msgid "Virtual machine graphical console"
 msgstr "वर्च्युअल मशीन ग्राफिकल कंसोल"
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
+
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
 "\n"
-"वापर: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
-"\n"
-"%s\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
 "\n"
+msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr "रिडायरेक्शनकरीता USB साधने पसंत करा"
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr "असमर्थीत ओळखपटवणे प्रकार %d"
@@ -486,117 +497,127 @@ msgstr "असमर्थीत ओळखपटवणे प्रकार %d"
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr "Ctrl+Alt+Del (_D)"
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr "Ctrl+Alt+Backspace (_B)"
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr "Ctrl+Alt+F1 (_1)"
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr "Ctrl+Alt+F2 (_2)"
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr "Ctrl+Alt+F3 (_3)"
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr "Ctrl+Alt+F4 (_4)"
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr "Ctrl+Alt+F5 (_5)"
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr "Ctrl+Alt+F6 (_6)"
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr "Ctrl+Alt+F7 (_7)"
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr "Ctrl+Alt+F8 (_8)"
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr "Ctrl+Alt+F9 (_9)"
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr "Ctrl+Alt+F10 (_0)"
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr "Ctrl+Alt+F11"
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr "Ctrl+Alt+F12"
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr "स्क्रीनशॉट"
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr "जोडणी खंडीत करा"
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr "USB साधनची निवड"
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr "कि जोडणी पाठवा"
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr "पडदाभर सोडा"
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr "Ctrl+Alt"
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr "(पॉइंटर सोडण्याकरीता %s दाबा)"
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr "%s%s%s - %s"
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr " "
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr "ह्या जोडणीच्या सेटअपकरिता किमान %s आवृत्ती %s आवश्यक आहे"
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr "अतिथी डोमैनला पुनःसुरू करण्यासाठी वाट पहात आहे"
 
@@ -605,59 +626,69 @@ msgstr "अतिथी डोमैनला पुनःसुरू करण
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr "अतिथी %s करीता ग्राफिक प्रकार ओळखणे अशक्य"
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr "अतिथी %s करीता यजमान ओळखणे अशक्य"
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr "libvirt सुरू होण्याची वाट पहात आहे"
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr "अतिथी डोमैन शोधत आहे"
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr "अतिथी डोमैन निर्माण करण्यास वाट पहात आहे"
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr "अतिथी डोमैन स्थिती तपासत आहे"
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr "अतिथी डोमैनला पुनःसुरू करण्यास वाट पहात आहे"
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr "[काहिच नाही]"
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr "फाइल (_F)"
@@ -670,35 +701,39 @@ msgstr "स्मार्टकार्ड अंतर्भुत करण�
 msgid "Smartcard removal"
 msgstr "स्मार्टकार्ड काढून टाकणे"
 
-#: ../src/virt-viewer.xml.h:6
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:7
 msgid "_View"
 msgstr "अवलोकन (_V)"
 
-#: ../src/virt-viewer.xml.h:7
+#: ../src/virt-viewer.xml.h:8
 msgid "Full screen"
 msgstr "पडदाभर"
 
-#: ../src/virt-viewer.xml.h:8
+#: ../src/virt-viewer.xml.h:9
 msgid "_Zoom"
 msgstr "झूम करा (_Z)"
 
-#: ../src/virt-viewer.xml.h:9
+#: ../src/virt-viewer.xml.h:10
 msgid "Displays"
 msgstr "डिस्प्लेज्"
 
-#: ../src/virt-viewer.xml.h:10
+#: ../src/virt-viewer.xml.h:11
 msgid "Release cursor"
 msgstr "रिलिज् कर्सर"
 
-#: ../src/virt-viewer.xml.h:11
+#: ../src/virt-viewer.xml.h:12
 msgid "_Send key"
 msgstr "सेंड कि (_S)"
 
-#: ../src/virt-viewer.xml.h:12
+#: ../src/virt-viewer.xml.h:13
 msgid "_Help"
 msgstr "मदत (_H)"
 
-#: ../src/virt-viewer.xml.h:13
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -725,3 +760,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/ms.po b/po/ms.po
index 7f7fb3a..2936d4a 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Malay\n"
+"Language: ms\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ms\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 8f75db0..f550660 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Kjartan Maraas <kmaraas@gnome.org>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: 2015-01-12 06:21-0500\n"
 "Last-Translator: Daniel Berrange <dan-transifex@berrange.com>\n"
-"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/virt-viewer/language/nb/)\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/virt-"
+"viewer/language/nb/)\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.7.3\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -73,43 +74,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr "Vis versjonsinformasjon"
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr "Åpne tilkobling med Spice-kontroll kommunikasjon"
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr "Klarte ikke å sette opp tilkobling"
 
@@ -122,83 +123,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
-msgstr ""
-
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
-msgstr ""
-
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
 #: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
-msgstr ""
-
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
-msgstr ""
-
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
-msgstr ""
-
-#: ../src/remote-viewer.c:1221
 msgid "Setting up Spice session..."
 msgstr "Setter opp en Spice-økt…"
 
-#: ../src/remote-viewer.c:1243
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
+msgstr ""
+
+#: ../src/remote-viewer.c:1120
 #, c-format
-msgid "Invalid file %s"
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
+#: ../src/remote-viewer.c:1128
 msgid "Cannot determine the connection type from URI"
 msgstr "Kan ikke bestemme tilkoblingstype fra URI"
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
-msgstr ""
-
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
+msgstr ""
+
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -238,118 +246,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr "Venter på skjerm %d…"
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
-msgstr "Ukjent grafikktype for gjest %s"
+msgid "Unsupported graphic type '%s'"
+msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr "Tilkobling til SSH feilet."
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr "Zoom-nivå i vinduer i prosent"
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr "Vis mer informasjon"
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr "Vis feilsøkingsinformasjon"
 
@@ -367,11 +373,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -392,6 +400,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -430,26 +442,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr "Velg USB-enheter for omdirigering"
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -458,117 +478,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr "Koble fra"
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr "Forlat fullskjerm"
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr "%s%s%s - %s"
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr "Venter på at domene for gjest skal starte på nytt"
 
@@ -577,59 +607,69 @@ msgstr "Venter på at domene for gjest skal starte på nytt"
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr "Kan ikke bestemme grafikktype for gjest %s"
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr "Kan ikke bestemme vert for gjest %s"
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr "Finner domene for gjest"
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -642,35 +682,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -697,3 +741,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/nds.po b/po/nds.po
index c0362e1..113e0ea 100644
--- a/po/nds.po
+++ b/po/nds.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Low German\n"
+"Language: nds\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nds\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/ne.po b/po/ne.po
index e00fd95..0f3930c 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Nepali\n"
+"Language: ne\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 7219ced..0fb9b04 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Geert Warrink <geert.warrink@onsnet.nu>, 2010-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: 2015-01-12 06:21-0500\n"
 "Last-Translator: Daniel Berrange <dan-transifex@berrange.com>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/virt-viewer/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/virt-viewer/"
+"language/nl/)\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.7.3\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr "Viewer op afstand"
 
@@ -73,46 +74,47 @@ msgstr "De bindingsvlaggen"
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
-msgstr "remote-viewer versie %s\n"
+msgid "remote-viewer version %s"
+msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr "Toon versie informatie"
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr "Stel venstertitel in"
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr "Open verbinding met Spice controller communicatie"
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr "Viewer cliënt op afstand "
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 "%s\n"
-"Voer '%s --help' uit voor een volledige lijst met beschikbare commandoregel opties\n"
+"Voer '%s --help' uit voor een volledige lijst met beschikbare commandoregel "
+"opties\n"
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 "Fout: extra argumenten gegeven tijden het gebruik van de Spice controller\n"
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr "Fout: kan meerdere URI's niet verwerken\n"
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr "Verbinding initiëren mislukte"
 
@@ -125,83 +127,90 @@ msgstr "Display uitgezet door controller"
 msgid "Controller connection failed: %s"
 msgstr "Controller verbinding mislukte: %s"
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
-msgstr "Verbindingsdetails"
-
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
-msgstr "_Verbindingsadres"
-
 #: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
-msgstr "Bijvoorbeeld, spice://foo.example.org:5900"
-
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
-msgstr "_Recente verbindingen"
-
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
-msgstr "Kon geen Spice sessie aanmaken"
-
-#: ../src/remote-viewer.c:1221
 msgid "Setting up Spice session..."
 msgstr "Spice sessie opzetten..."
 
-#: ../src/remote-viewer.c:1243
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
+msgstr ""
+
+#: ../src/remote-viewer.c:1120
 #, c-format
-msgid "Invalid file %s"
-msgstr "Ongeldig bestand %s"
+msgid "Invalid file %s: "
+msgstr ""
 
-#: ../src/remote-viewer.c:1250
+#: ../src/remote-viewer.c:1128
 msgid "Cannot determine the connection type from URI"
 msgstr "Kan het connectie type niet van URI bepalen"
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
-msgstr "Kan sessie niet aanmaken voor dit type: %s"
-
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
+msgstr "Verbindingsdetails"
+
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
+msgstr "Bijvoorbeeld, spice://foo.example.org:5900"
+
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
+msgstr ""
+
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr "Over Glade"
@@ -257,122 +266,118 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr "Het Fedora vertaal team"
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr "Wil je de sessie afsluiten?"
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr "Vraag me dit niet weer"
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr "Wachten op display %d..."
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
-msgstr "Onbekend grafisch type voor de gast %s"
+msgid "Unsupported graphic type '%s'"
+msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr "Verbinden met ssh mislukte."
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr "Kan geen verbinding maken met kanaal, alleen SSH wordt ondersteund"
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr "Verbinding maken met kanaal wordt niet ondersteund."
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr "Verbinding maken met grafische server"
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr "Gast domein werd afgesloten"
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr "Verbonden met grafische server"
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr "Ka niet verbinden met de grafische server %s"
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
-"Kon geen authenticatieverkrijgen met desktop server op afstand op %s: %s\n"
-"Verbinding opnieuw proberen?"
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr "Kon geen authenticatie verkrijgen met desktop server op afstand: %s"
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr "USB omleidingsfout: %s"
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr "Zoom niveau moet tussen %d-%d zijn\n"
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr "Display %d"
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr "Ongeldig kiosk-quit argument: %s"
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr "Zoom niveau in percentage van het venster"
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 "Open in volledig-scherm modus (past gastresolutie aan om te passen bij die "
 "van de cliënt)."
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr "Pas sneltoetsen aan"
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr "Zet kiosk modus aan"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr "Sluit af bij gegeven conditie in kiosk modus"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr "<never|on-disconnect>"
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr "Toon uitgebreide informatie"
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr "Toon debug informatie"
 
@@ -390,11 +395,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr "Authenticatie is vereist"
@@ -415,6 +422,10 @@ msgstr "Gebruikersnaam:"
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -455,31 +466,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr "Virtuele machine grafische console"
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
+
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
 "\n"
-"Gebruik: %s [OPTIES] DOMEIN-NAAM|ID|UUID\n"
-"\n"
-"%s\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
 "\n"
+msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr "Selecteer USB apparaten voor omleiding"
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr "Niet-ondersteund authenticatie type %d"
@@ -488,117 +502,127 @@ msgstr "Niet-ondersteund authenticatie type %d"
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr "Ctrl+Alt+_Del"
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr "Ctrl+Alt+_Backspace"
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr "Ctrl+Alt+F_1"
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr "Ctrl+Alt+F_2"
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr "Ctrl+Alt+F_3"
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr "Ctrl+Alt+F_4"
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr "Ctrl+Alt+F_5"
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr "Ctrl+Alt+F_6"
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr "Ctrl+Alt+F_7"
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr "Ctrl+Alt+F_8"
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr "Ctrl+Alt+F_9"
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr "Ctrl+Alt+F1_0"
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr "Ctrl+Alt+F11"
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr "Ctrl+Alt+F12"
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr "Schermafdruk"
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr "Verbinding verbreken"
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr "USB apparaat selectie"
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr "Stuur sleutel combinatie"
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr "Verlaat volledig scherm"
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr "Ctrl+Alt"
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr "(Druk op %s om wijzer vrij te geven)"
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr "%s%s%s - %s"
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr " "
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr "%s versie %s is tenminste vereist om deze verbinding in te stellen"
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr "Wacht tot gast domein opnieuw opgestart wordt"
 
@@ -607,59 +631,69 @@ msgstr "Wacht tot gast domein opnieuw opgestart wordt"
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr "Kan het grafische type voor de gast %s niet bepalen"
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr "Kan de host voor de gast %s niet bepalen"
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr "Wacht op het opstarten van libvirt"
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr "Zoek naar gast domein"
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr "Wacht tot gast domein aangemaakt is"
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr "Controleer gast domein status"
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr "Wacht tot gast domein gestart wordt"
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr "[geen]"
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr "_Bestand"
@@ -672,35 +706,39 @@ msgstr "Breng smartcard in"
 msgid "Smartcard removal"
 msgstr "Verwijder Smartcard"
 
-#: ../src/virt-viewer.xml.h:6
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:7
 msgid "_View"
 msgstr "_View"
 
-#: ../src/virt-viewer.xml.h:7
+#: ../src/virt-viewer.xml.h:8
 msgid "Full screen"
 msgstr "Volledig scherm"
 
-#: ../src/virt-viewer.xml.h:8
+#: ../src/virt-viewer.xml.h:9
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../src/virt-viewer.xml.h:9
+#: ../src/virt-viewer.xml.h:10
 msgid "Displays"
 msgstr "Displays"
 
-#: ../src/virt-viewer.xml.h:10
+#: ../src/virt-viewer.xml.h:11
 msgid "Release cursor"
 msgstr "Geef cursor vrij"
 
-#: ../src/virt-viewer.xml.h:11
+#: ../src/virt-viewer.xml.h:12
 msgid "_Send key"
 msgstr "_Stuur sleutel"
 
-#: ../src/virt-viewer.xml.h:12
+#: ../src/virt-viewer.xml.h:13
 msgid "_Help"
 msgstr "_Hulp"
 
-#: ../src/virt-viewer.xml.h:13
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -727,3 +765,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/nn.po b/po/nn.po
index 5dc0c3a..ccd693c 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Norwegian Nynorsk\n"
+"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/nso.po b/po/nso.po
index f061a41..719e951 100644
--- a/po/nso.po
+++ b/po/nso.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Northern Sotho\n"
+"Language: nso\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nso\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/or.po b/po/or.po
index 43432cd..a0d2354 100644
--- a/po/or.po
+++ b/po/or.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Manoj Kumar Giri <mgiri@redhat.com>, 2010,2012-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: 2015-01-12 06:21-0500\n"
 "Last-Translator: Daniel Berrange <dan-transifex@berrange.com>\n"
-"Language-Team: Oriya (http://www.transifex.com/projects/p/virt-viewer/language/or/)\n"
+"Language-Team: Oriya (http://www.transifex.com/projects/p/virt-viewer/"
+"language/or/)\n"
+"Language: or\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: or\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.7.3\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr "ସୁଦୂର ପ୍ରଦର୍ଶିକା"
 
@@ -73,26 +74,26 @@ msgstr "ବନ୍ଧନ ପତାକାଗୁଡ଼ିକ"
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
-msgstr "remote-viewer ସଂସ୍କରଣ %s\n"
+msgid "remote-viewer version %s"
+msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr "ସଂସ୍କରଣ ସୂଚନା ଦେଖାନ୍ତୁ"
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr "ୱିଣ୍ଡୋ ଶୀର୍ଷକ ସେଟ କରନ୍ତୁ"
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr "ସ୍ପାଇସ ନିୟନ୍ତ୍ରକ ଯୋଗାଯୋଗ ମାଧ୍ଯମରେ ସଂଯୋଗକୁ ଖୋଲନ୍ତୁ"
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
@@ -101,19 +102,18 @@ msgstr ""
 "%s\n"
 "ଉପଲବ୍ଧ ପାଠ୍ଯ ନିର୍ଦ୍ଦେଶ ବିକଳ୍ପର ସଂପୂର୍ଣ୍ଣ ତାଲିକା ଦେଖିବା ପାଇଁ '%s --help' କୁ ଚଳାନ୍ତୁ\n"
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
-"ତ୍ରୁଟି: ଅତିରିକ୍ତ ସ୍ୱତନ୍ତ୍ରଚରଗୁଡ଼ିକ ଦିଆଯାଇଥାଏ ଯେତେବେଳେ ସ୍ପାଇସ ନିୟନ୍ତ୍ରକ "
-"ବ୍ୟବହାର କରାଯାଇଥାଏ\n"
+"ତ୍ରୁଟି: ଅତିରିକ୍ତ ସ୍ୱତନ୍ତ୍ରଚରଗୁଡ଼ିକ ଦିଆଯାଇଥାଏ ଯେତେବେଳେ ସ୍ପାଇସ ନିୟନ୍ତ୍ରକ ବ୍ୟବହାର କରାଯାଇଥାଏ\n"
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr "ତ୍ରୁଟି: ଏକାଧିକ URI ଗୁଡ଼ିକୁ ନିୟନ୍ତ୍ରଣ କରିପାରିବେ ନାହିଁ\n"
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr " ସଂଯୋଗ ଆରମ୍ଭ କରିବାରେ ବିଫଳ"
 
@@ -126,83 +126,90 @@ msgstr "ନିୟନ୍ତ୍ରକ ଦ୍ୱାରା ପ୍ରଦର୍ଶନ�
 msgid "Controller connection failed: %s"
 msgstr "ନିୟନ୍ତ୍ରକ ସଂଯୋଗ ଅସଫଳ ହେଲା:%s"
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
-msgstr ""
-
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
-msgstr "ସଂଯୋଗ ବିବରଣୀ"
-
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
 #: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
-msgstr ""
-
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
-msgstr ""
-
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
-msgstr "ସ୍ପାଇସ ଅଧିବେଶନ ପ୍ରସ୍ତୁତ ହୋଇପାରିଲା ନାହିଁ"
-
-#: ../src/remote-viewer.c:1221
 msgid "Setting up Spice session..."
 msgstr "ସ୍ପାଇସ ଅଧିବେଶନ ସେଟ କରୁଅଛି..."
 
-#: ../src/remote-viewer.c:1243
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
+msgstr ""
+
+#: ../src/remote-viewer.c:1120
 #, c-format
-msgid "Invalid file %s"
-msgstr "ଅବୈଧ ଫାଇଲ %s"
+msgid "Invalid file %s: "
+msgstr ""
 
-#: ../src/remote-viewer.c:1250
+#: ../src/remote-viewer.c:1128
 msgid "Cannot determine the connection type from URI"
 msgstr "URI ରୁ ସଂଯୋଗ ପ୍ରକାରକୁ ନିର୍ଦ୍ଧାରଣ କରିପାରିବେ ନାହିଁ"
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
-msgstr "ଏହି ପ୍ରକାର ପାଇଁ ସ୍ପାଇସ ଅଧିବେଶନ ପ୍ରସ୍ତୁତ ହୋଇପାରିଲା ନାହିଁ: %s"
-
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
+msgstr "ସଂଯୋଗ ବିବରଣୀ"
+
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
+msgstr ""
+
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr "ଗ୍ଲେଡ ବିଷୟରେ"
@@ -216,8 +223,7 @@ msgstr ""
 #: ../src/virt-viewer-about.xml.h:4
 msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt"
 msgstr ""
-"GTK-VNC, SPICE-GTK ଏବଂ libvirt ସହାୟତାରେ ଏକ ସୁଦୂର ଡେସ୍କଟପ କ୍ଲାଏଣ୍ଟ ପ୍ରସ୍ତୁତ "
-"ହୋଇଛି"
+"GTK-VNC, SPICE-GTK ଏବଂ libvirt ସହାୟତାରେ ଏକ ସୁଦୂର ଡେସ୍କଟପ କ୍ଲାଏଣ୍ଟ ପ୍ରସ୍ତୁତ ହୋଇଛି"
 
 #: ../src/virt-viewer-about.xml.h:5
 msgid "virt-manager.org"
@@ -257,121 +263,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr "Fedora ଅନୁବାଦନ ଗୋଷ୍ଠି"
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr "ଆପଣ ଅଧିବେଶନକୁ ବନ୍ଦ କରିବାକୁ ଚାହୁଁଛନ୍ତି କି?"
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr "ମୋତେ ପୁନର୍ବାର ପଚାରନ୍ତୁ ନାହିଁ"
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr "%d କୁ ଅପେକ୍ଷା କରିଅଛି..."
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
-msgstr "ଅତିଥି %s ପାଇଁ ଅଜ୍ଞାତ ଲେଖାଚିତ୍ର ପ୍ରକାର"
+msgid "Unsupported graphic type '%s'"
+msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr "ssh ସହିତ ସଂଯୋଗ ବିଫଳ ହୋଇଛି।"
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr "ଚ୍ୟାନେଲ ସହିତ ସଂଯୋଗ କରିପାରିବେ ନାହିଁ, କେବଳ SSH ସମର୍ଥିତ।"
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr "ଚ୍ୟାନେଲ ସହିତ ସଂଯୋଗ ଅସମର୍ଥିତ।"
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr "ଆଲେଖିକ ସର୍ଭର ସହିତ ସଂଯୋଗ କରୁଅଛି"
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr "ଅତିଥି ଡମେନ ବନ୍ଦ ଅଛି"
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr "ଆଲେଖି ସର୍ଭର ସହ ସଂଯୁକ୍ତ"
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr "ଆଲେଖୀ ସର୍ଭର %s ସହିତ ସଂଯୋଗ କରିବାରେ ଅସମର୍ଥ"
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
-"%s ରେ ସୁଦୂର ଡେସ୍କଟପ ସର୍ଭର ସହିତ ବୈଧିକରଣ କରିବାରେ ଅସମର୍ଥ: %s\n"
-"ପୁଣିଥରେ ଚେଷ୍ଟା କରିବେ କି?"
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr "ସୁଦୂର ଡେସ୍କଟପ ସର୍ଭର ସହିତ ବୈଧିକରଣ କରିବାରେ ଅସମର୍ଥ: %s"
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr "USB ଦିଗପରିବର୍ତ୍ତନ ତ୍ରୁଟି: %s"
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr "ଆକାର ବୃଦ୍ଧି ସ୍ତର ନିଶ୍ଚିତ ଭାବରେ %d-%d ମଧ୍ଯରେ ରହିବା ଉଚିତ\n"
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr "%d  ଦର୍ଶାଅ"
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr "ଅବୈଧ kiosk-quit ସ୍ୱତନ୍ତ୍ରଚର: %s"
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr "ୱିଣ୍ଡୋର ଆକାର ବୃଦ୍ଧି ସ୍ତର, ଶତକଡ଼ାରେ"
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
-msgstr ""
-"ସମ୍ପୂର୍ଣ୍ଣ ପରଦା ଧାରାରେ ଖୋଲନ୍ତୁ  (ଅତିଥି ବିଭେଦନକୁ କ୍ଲାଏଣ୍ଟ ସହିତ ମେଳାଇଥାଏ)।"
+msgstr "ସମ୍ପୂର୍ଣ୍ଣ ପରଦା ଧାରାରେ ଖୋଲନ୍ତୁ  (ଅତିଥି ବିଭେଦନକୁ କ୍ଲାଏଣ୍ଟ ସହିତ ମେଳାଇଥାଏ)।"
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr "ହଟ-କିଗୁଡ଼ିକୁ ଇଚ୍ଛାମୁତାବକ କରନ୍ତୁ"
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr "kiosk ଧାରାକୁ ସକ୍ରିୟ କରନ୍ତୁ"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr "kiosk ଧାରାରେ ଦିଆଯାଇଥିବା ସର୍ତ୍ତରେ ବିଦାୟ ନିଅନ୍ତୁ"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr "<never|on-disconnect>"
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr "ଶବ୍ଦାଡ଼ମ୍ବରପୂର୍ଣ୍ଣ ସୂଚନା ଦର୍ଶାନ୍ତୁ"
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr "ତ୍ରୁଟିନିବାରଣ ସୂଚନା ଦର୍ଶାନ୍ତୁ"
 
@@ -389,11 +390,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr "ବୈଧିକରଣ ଆବଶ୍ଯକ"
@@ -414,6 +417,10 @@ msgstr "ଚାଳକ ନାମ:"
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -446,39 +453,40 @@ msgstr "Virt ପ୍ରଦର୍ଶିକା"
 #: ../src/virt-viewer-main.c:80
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options"
-msgstr ""
-"ଉପଲବ୍ଧ ନିର୍ଦ୍ଦେଶନାମା ବିକଳ୍ପଗୁଡ଼ିକର ସମ୍ପୂର୍ଣ୍ଣ ତାଲିକା ଦେଖିବା ପାଇଁ '%s --help'"
-" ଚଲାନ୍ତୁ"
+msgstr "ଉପଲବ୍ଧ ନିର୍ଦ୍ଦେଶନାମା ବିକଳ୍ପଗୁଡ଼ିକର ସମ୍ପୂର୍ଣ୍ଣ ତାଲିକା ଦେଖିବା ପାଇଁ '%s --help' ଚଲାନ୍ତୁ"
 
 #: ../src/virt-viewer-main.c:86
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
+
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
 "\n"
-"ବ୍ୟବହାର ବିଧି: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
-"\n"
-"%s\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
 "\n"
+msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr "ଦିଗ ପରିବର୍ତ୍ତନ ପାଇଁ USB ଉପକରଣଗୁଡ଼ିକୁ ବାଛନ୍ତୁ"
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr "ଅସମର୍ଥିତ ପ୍ରାଧିକରଣ ପ୍ରକାର %d"
@@ -487,117 +495,127 @@ msgstr "ଅସମର୍ଥିତ ପ୍ରାଧିକରଣ ପ୍ରକାର
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr "Ctrl+Alt+_Del"
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr "Ctrl+Alt+_Backspace"
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr "Ctrl+Alt+F_1"
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr "Ctrl+Alt+F_2"
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr "Ctrl+Alt+F_3"
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr "Ctrl+Alt+F_4"
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr "Ctrl+Alt+F_5"
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr "Ctrl+Alt+F_6"
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr "Ctrl+Alt+F_7"
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr "Ctrl+Alt+F_8"
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr "Ctrl+Alt+F_9"
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr "Ctrl+Alt+F1_0"
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr "Ctrl+Alt+F11"
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr "Ctrl+Alt+F12"
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr "ଆଶୁଚିତ୍ର"
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr "ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ ହୋଇଛି"
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr "USB ଉପକରଣ ଚୟନ"
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr "କି ଯୁଗଳକୁ ପଠାନ୍ତୁ"
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr "ସମ୍ପୁର୍ଣ୍ଣ ପରଦା ଛାଡ଼ି ଦିଅନ୍ତୁ"
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr "Ctrl+Alt"
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr "(ସୂଚକକୁ ଛାଡ଼ିବା ପାଇଁ %s କୁ ଦବାନ୍ତୁ)"
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr "%s%s%s - %s"
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr " "
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr "ଏହି ସଂଯୋଗକୁ ବ୍ୟବସ୍ଥା କରିବା ପାଇଁ ଅତିକମରେ %s ସଂସ୍କରଣ %s ଆବଶ୍ୟକ କରିଥାଏ"
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr "ପୁନଚାଳନ ପାଇଁ ଅତିଥି ଡମେନକୁ ଅପେକ୍ଷା କରିଛି"
 
@@ -606,59 +624,69 @@ msgstr "ପୁନଚାଳନ ପାଇଁ ଅତିଥି ଡମେନକୁ �
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr "ଅତିଥି %s ପାଇଁ ଆଲେଖିକ ପ୍ରକାରକୁ ନିର୍ଦ୍ଧାରଣ କରିପାରିବେ ନାହିଁ"
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr "ଅତିଥି %s ପାଇଁ ହୋଷ୍ଟ ନିର୍ଦ୍ଧାରଣ କରିପାରିବେ ନାହିଁ"
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr "libvirt କୁ ଆରମ୍ଭ ହେବା ପାଇଁ ଅପେକ୍ଷା କରୁଅଛି"
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr "ଅତିଥି ଡମେନକୁ ଖୋଜୁଅଛି"
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr "ନିର୍ମାଣ କରିବା ପାଇଁ ଅତିଥି ଡମେନକୁ ଅପେକ୍ଷା କରିଛି"
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr "ଅତିଥି ଡମେନ ସ୍ଥିତିକୁ ଯାଞ୍ଚ କରୁଅଛି"
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr "ଅତିଥି ଡମେନ ଆରମ୍ଭ ହେବାକୁ ଯାଉଛି"
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr "[କିଛି ନାହିଁ]"
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr "ଫାଇଲ (_F)"
@@ -671,35 +699,39 @@ msgstr "ସ୍ମାର୍ଟକାର୍ଡ ଭର୍ତ୍ତିକରିବ�
 msgid "Smartcard removal"
 msgstr "ସ୍ମାର୍ଟକାର୍ଡ ବାହାର କରିବା "
 
-#: ../src/virt-viewer.xml.h:6
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:7
 msgid "_View"
 msgstr "ଦୃଶ୍ଯ (_V)"
 
-#: ../src/virt-viewer.xml.h:7
+#: ../src/virt-viewer.xml.h:8
 msgid "Full screen"
 msgstr "ସଂପୂର୍ଣ୍ଣ ପରଦା"
 
-#: ../src/virt-viewer.xml.h:8
+#: ../src/virt-viewer.xml.h:9
 msgid "_Zoom"
 msgstr "ବଡ଼ କରନ୍ତୁ (_Z)"
 
-#: ../src/virt-viewer.xml.h:9
+#: ../src/virt-viewer.xml.h:10
 msgid "Displays"
 msgstr "ପ୍ରଦର୍ଶନୀ"
 
-#: ../src/virt-viewer.xml.h:10
+#: ../src/virt-viewer.xml.h:11
 msgid "Release cursor"
 msgstr "ସୂଚକକୁ ଛାଡ଼ନ୍ତୁ"
 
-#: ../src/virt-viewer.xml.h:11
+#: ../src/virt-viewer.xml.h:12
 msgid "_Send key"
 msgstr "କି ପଠାନ୍ତୁ (_S)"
 
-#: ../src/virt-viewer.xml.h:12
+#: ../src/virt-viewer.xml.h:13
 msgid "_Help"
 msgstr "ସହାୟତା (_H)"
 
-#: ../src/virt-viewer.xml.h:13
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -726,3 +758,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/pa.po b/po/pa.po
index 489c1bf..93b36d8 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Amandeep Singh Saini <asaini@redhat.com>, 2013
 # Jaswinder Singh <jsingh@redhat.com>, 2010,2012
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: 2015-01-12 06:21-0500\n"
 "Last-Translator: Daniel Berrange <dan-transifex@berrange.com>\n"
-"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/virt-viewer/language/pa/)\n"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/virt-"
+"viewer/language/pa/)\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pa\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.7.3\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr "ਰਿਮੋਟ ਦਰਸ਼ਕ"
 
@@ -74,26 +75,26 @@ msgstr "ਬਾਈਂਡਿੰਗ ਫਲੈਗ"
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
-msgstr "remote-viewer ਸੰਸਕਰਣ %s\n"
+msgid "remote-viewer version %s"
+msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr "ਸੰਸਕਰਣ ਜਾਣਕਾਰੀ ਵਿਖਾਓ"
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr "ਵਿੰਡੋ ਦਾ ਸਿਰਲੇਖ ਨਿਰਧਾਰਿਤ ਕਰੋ"
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr "ਸਪਾਈਸ ਕੰਟਰੋਲਰ ਕਮਿਊਨੀਕੇਸ਼ਨ ਵਰਤ ਕੇ ਸੰਪਰਕ ਖੋਲ੍ਹੋ"
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
@@ -102,17 +103,17 @@ msgstr ""
 "%s\n"
 "ਪੂਰੀਆਂ ਕਮਾਂਡ ਲਾਈਨ ਚੋਣਾਂ ਦੀ ਸੂਚੀ ਵੇਖਣ ਵਾਸਤੇ '%s --help' ਚਲਾਉ\n"
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr "ਗਲਤੀ: ਸਪਾਈਸ ਕੰਟਰੋਲਰ ਵਰਤਣ ਵੇਲੇ ਜਿਆਦਾ ਆਰਗੂਮੈਂਟ ਦਿੱਤੇ ਸੀ\n"
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr "ਗਲਤੀ: ਬਹੁਤੇ URIs ਨਹੀਂ ਲੈ ਸਕਦਾ\n"
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr "ਸੰਪਰਕ ਚਾਲੂ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"
 
@@ -125,83 +126,90 @@ msgstr "ਕੰਟਰੋਲਰ ਦੁਆਰਾ ਪ੍ਰਦਰਸ਼ਨ ਅਯੋਗ
 msgid "Controller connection failed: %s"
 msgstr "ਕੰਟਰੋਲਰ ਕੁਨੈਕਸ਼ਨ ਅਸਫਲ ਹੋਇਆ: %s"
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
-msgstr ""
-
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
-msgstr "ਕੁਨੈਕਸ਼ਨ ਵੇਰਵੇ"
-
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
 #: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
-msgstr ""
-
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
-msgstr ""
-
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
-msgstr "ਸਪਾਈਸ ਸੈਸ਼ਨ ਬਣਾ ਨਹੀਂ ਸਕਿਆ"
-
-#: ../src/remote-viewer.c:1221
 msgid "Setting up Spice session..."
 msgstr "ਸਪਾਈਸ ਸੈਸ਼ਨ ਬਣਾ ਰਿਹਾ ਹੈ..."
 
-#: ../src/remote-viewer.c:1243
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
+msgstr ""
+
+#: ../src/remote-viewer.c:1120
 #, c-format
-msgid "Invalid file %s"
-msgstr "ਅਯੋਗ ਫਾਈਲ %s"
+msgid "Invalid file %s: "
+msgstr ""
 
-#: ../src/remote-viewer.c:1250
+#: ../src/remote-viewer.c:1128
 msgid "Cannot determine the connection type from URI"
 msgstr "URI ਤੋਂ ਕੁਨੈਕਸ਼ਨ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦਾ"
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
-msgstr "ਇਸ ਕਿਸਮ ਲਈ ਸ਼ੈਸ਼ਨ ਨਹੀਂ ਬਣਾ ਸਕਿਆ: %s"
-
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
+msgstr "ਕੁਨੈਕਸ਼ਨ ਵੇਰਵੇ"
+
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
+msgstr ""
+
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr "ਗਲੇਡ ਬਾਰੇ"
@@ -254,120 +262,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr "ਫੇਡੋਰਾ ਅਨੁਵਾਦ ਟੀਮ"
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr "ਕੀ ਤੁਸੀਂ ਸੈਸ਼ਨ ਬੰਦ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr "ਮੈਨੂੰ ਦੁਬਾਰਾ ਨਾ ਪੁੱਛਿਓ"
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr "ਝਲਕ %d ਦੀ ਉਡੀਕ ਕਰ ਰਿਹਾ ਹੈ..."
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
-msgstr "ਪ੍ਰਾਹੁਣੇ %s ਲਈ ਗਰਾਫਿਕਸ ਕਿਸਮ ਅਣਪਛਾਤੀ ਹੈ"
+msgid "Unsupported graphic type '%s'"
+msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr "ssh ਨਾਲ ਜੁੜਨ ਤੋਂ ਅਸਫਲ ਹੋਇਆ।"
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr "ਚੈਨਲ ਨਾਲ ਜੁੜ ਨਹੀਂ ਸਕਦਾ, ਸਿਰਫ SSH ਸਮਰਥਿਤ ਹੈ।"
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr "ਚੈਨਲ ਨਾਲ ਜੁੜਨ ਨੂੰ ਸਮਰਥਨ ਨਹੀਂ ਹੈ।"
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr "ਗਰਾਫਿਕਸ ਸਰਵਰ ਨਾਲ ਜੁੜ ਰਿਹਾ ਹੈ"
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr "ਪ੍ਰਾਹੁਣਾ ਡੋਮੇਨ ਸ਼ੱਟ-ਡਾਊਨ ਹੋ ਗਿਆ ਹੈ"
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr "ਗਰਾਫਿਕਸ ਸਰਵਰ ਨਾਲ ਜੁੜ ਗਿਆ"
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr "ਗਰਾਫਿਕਸ ਸਰਵਰ %s ਨਾਲ ਜੁੜਨ ਤੋਂ ਅਸਮਰਥ"
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
-"%s ਤੋਂ ਰਿਮੋਟ ਡੈਸਕਟਾਪ ਸਰਵਰ ਨਾਲ ਪ੍ਰਮਾਣਿਤ ਕਰਨ ਤੋਂ ਅਸਮਰਥ: %s\n"
-"ਸੰਪਰਕ ਦੀ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰਨੀ ਹੈ?"
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr "ਰਿਮੋਟ ਸਰਵਰ ਨਾਲ ਪ੍ਰਮਾਣਿਤ ਕਰਨ ਤੋਂ ਅਸਮਰਥ: %s"
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr "USB ਰੀਡਾਇਰੈਕਸ਼ਨ ਗਲਤੀ: %s"
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr "ਜ਼ੂਮ ਪੱਧਰ %d-%d ਵਿਚਕਾਰ ਹੋਣਾ ਜਰੂਰੀ ਹੈ\n"
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr "ਡਿਸਪਲੇਅ %d"
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr "ਅਯੋਗ kiosk-quit ਆਰਗੂਮੈਂਟ: %s"
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr "ਵਿੰਡੋ ਦਾ ਜ਼ੂਮ ਪੱਧਰ, ਪ੍ਰਤੀਸ਼ਤ ਵਿੱਚ"
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr "hotkeys ਚੁਣਿੰਦਾਪਨ ਕਰੋ"
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr "kiosk ਮੋਡ ਯੋਗ ਕਰੋ"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr "kiosk ਮੋਡ ਵਿੱਚ ਦਿੱਤੀ ਗਈ ਸਥਿਤੀ ਆਉਣ ਤੇ ਛੱਡ ਦਿਓ"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr "<never|on-disconnect>"
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr "ਵਰਬੋਜ਼ ਜਾਣਕਾਰੀ ਵਿਖਾਓ"
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr "ਡੀਬੱਗਿੰਗ ਜਾਣਕਾਰੀ ਵਿਖਾਓ"
 
@@ -385,11 +389,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr "ਪ੍ਰਮਾਣਿਕਤਾ ਲੋੜੀਂਦੀ ਹੈ"
@@ -410,6 +416,10 @@ msgstr "ਯੂਜ਼ਰ ਨਾਂ:"
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -448,31 +458,34 @@ msgstr "ਪੂਰੀਆਂ ਉਪਲੱਬਧ ਕਮਾਂਡ ਲਾਈਨ ਚ�
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
+
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
 "\n"
-"ਵਰਤੋਂ: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
-"\n"
-"%s\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
 "\n"
+msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr "ਰੀਡਾਇਰੈਕਸ਼ਨ ਲਈ USB ਜੰਤਰ ਚੁਣੋ"
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr "ਅਸਮਰਥਿਤ ਪ੍ਰਮਾਣਿਕਤਾ ਕਿਸਮ %d"
@@ -481,117 +494,127 @@ msgstr "ਅਸਮਰਥਿਤ ਪ੍ਰਮਾਣਿਕਤਾ ਕਿਸਮ %d"
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr "Ctrl+Alt+_Del"
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr "Ctrl+Alt+_Backspace"
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr "Ctrl+Alt+F_1"
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr "Ctrl+Alt+F_2"
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr "Ctrl+Alt+F_3"
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr "Ctrl+Alt+F_4"
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr "Ctrl+Alt+F_5"
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr "Ctrl+Alt+F_6"
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr "Ctrl+Alt+F_7"
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr "Ctrl+Alt+F_8"
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr "Ctrl+Alt+F_9"
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr "Ctrl+Alt+F1_0"
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr "Ctrl+Alt+F11"
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr "Ctrl+Alt+F12"
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr "ਸਕਰੀਨ-ਸ਼ਾਟ"
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr "ਸੰਪਰਕ ਤੋੜੋ"
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr "USB ਜੰਤਰ ਚੋਣ"
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr "ਚਾਬੀ ਮਿਸ਼ਰਨ ਭੇਜੋ"
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr "ਪੂਰੀ ਸਕਰੀਨ ਛੱਡੋ"
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr "Ctrl+Alt"
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr "(ਪੁਆਇੰਟਰ ਛੱਡਣ ਲਈ %s ਦੱਬੋ)"
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr "%s%s%s - %s"
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr " "
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr "ਇਸ ਸੰਪਰਕ ਦੇ ਸੈੱਟਅੱਪ ਲਈ ਘੱਟੋ-ਘੱਟ %s ਸੰਸਕਰਣ %s ਲੋੜੀਂਦਾ ਹੈ"
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr "ਪ੍ਰਾਹੁਣਾ ਡੋਮੇਨ ਦੇ ਮੁੜ-ਚਾਲੂ ਹੋਣ ਦੀ ਉਡੀਕ ਕਰ ਰਿਹਾ ਹੈ"
 
@@ -600,59 +623,69 @@ msgstr "ਪ੍ਰਾਹੁਣਾ ਡੋਮੇਨ ਦੇ ਮੁੜ-ਚਾਲੂ �
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr "ਪ੍ਰਾਹੁਣਾ %s ਲਈ ਗਰਾਫਿਕ ਕਿਸਮ ਪਤਾ ਨਹੀਂ ਕਰ ਸਕਦਾ"
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr "ਪ੍ਰਾਹੁਣਾ %s ਲਈ ਹੋਸਟ ਪਤਾ ਨਹੀਂ ਕਰ ਸਕਦਾ"
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr "libvirt ਦੇ ਸ਼ੁਰੂ ਹੋਣ ਦੀ ਉਡੀਕ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr "ਪ੍ਰਾਹੁਣਾ ਡੋਮੇਨ ਲੱਭ ਰਿਹਾ ਹੈ"
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr "ਪ੍ਰਾਹੁਣਾ ਡੋਮੇਨ ਦੇ ਬਣਾਏ ਜਾਣ ਦੀ ਉਡੀਕ ਕਰ ਰਿਹਾ ਹੈ"
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr "ਪ੍ਰਾਹੁਣਾ ਡੋਮੇਨ ਦੀ ਹਾਲਤ ਜਾਂਚ ਰਿਹਾ ਹੈ"
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr "ਪ੍ਰਾਹੁਣਾ ਡੋਮੇਨ ਦੇ ਚਾਲੂ ਹੋਣ ਦੀ ਉਡੀਕ ਕਰ ਰਿਹਾ ਹੈ"
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr "[ਕੋਈ ਨਹੀਂ]"
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr "ਫਾਈਲ (_F)"
@@ -665,35 +698,39 @@ msgstr "ਸਮਾਰਟ-ਕਾਰਡ ਅੰਦਰ ਪਾਉਣਾ"
 msgid "Smartcard removal"
 msgstr "ਸਮਾਰਡ-ਕਾਰਡ ਹਟਾਉਣਾ"
 
-#: ../src/virt-viewer.xml.h:6
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:7
 msgid "_View"
 msgstr "ਵੇਖੋ (_V)"
 
-#: ../src/virt-viewer.xml.h:7
+#: ../src/virt-viewer.xml.h:8
 msgid "Full screen"
 msgstr "ਪੂਰਾ ਪਰਦਾ"
 
-#: ../src/virt-viewer.xml.h:8
+#: ../src/virt-viewer.xml.h:9
 msgid "_Zoom"
 msgstr "ਜ਼ੂਮ (_Z)"
 
-#: ../src/virt-viewer.xml.h:9
+#: ../src/virt-viewer.xml.h:10
 msgid "Displays"
 msgstr "ਪ੍ਰਦਰਸ਼ਿਤ ਕਰਦਾ ਹੈ"
 
-#: ../src/virt-viewer.xml.h:10
+#: ../src/virt-viewer.xml.h:11
 msgid "Release cursor"
 msgstr "ਕਰਸਰ ਛੱਡੋ"
 
-#: ../src/virt-viewer.xml.h:11
+#: ../src/virt-viewer.xml.h:12
 msgid "_Send key"
 msgstr "ਕੁੰਜੀ ਭੇਜੋ (_S)"
 
-#: ../src/virt-viewer.xml.h:12
+#: ../src/virt-viewer.xml.h:13
 msgid "_Help"
 msgstr "ਮਦਦ (_H)"
 
-#: ../src/virt-viewer.xml.h:13
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -720,3 +757,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 5a82786..f2992c9 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,25 +1,28 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Piotr Drąg <piotrdrag@gmail.com>, 2010,2012-2014
+# Piotr Drąg <piotrdrag@gmail.com>, 2015. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
-"PO-Revision-Date: 2015-01-12 06:21-0500\n"
-"Last-Translator: Daniel Berrange <dan-transifex@berrange.com>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/virt-viewer/language/pl/)\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
+"PO-Revision-Date: 2015-08-28 11:17-0400\n"
+"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/virt-viewer/"
+"language/pl/)\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Zanata 3.5.1\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Zanata 3.7.3\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr "Zdalne przeglądanie"
 
@@ -73,45 +76,46 @@ msgstr "Flagi dowiązania"
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
-msgstr "remote-viewer wersja %s\n"
+msgid "remote-viewer version %s"
+msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr "Wyświetla informację o wersji"
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr "Ustawia tytuł okna"
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr "Otwiera połączenie używając komunikacji kontrolera Spice"
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr "Klient zdalnej przeglądarki"
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 "%s\n"
-"Wykonanie polecenia \"%s --help\" wyświetli pełną listę dostępnych opcji wiersza poleceń\n"
+"Polecenie „%s --help” wyświetli pełną listę dostępnych opcji wiersza "
+"poleceń\n"
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr "Błąd: podano dodatkowe parametry podczas używania kontrolera Spice\n"
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr "Błąd: nie można obsłużyć wielu adresów URI\n"
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr "Zainicjowanie połączenia się nie powiodło"
 
@@ -124,83 +128,90 @@ msgstr "Ekran został wyłączony przez kontroler"
 msgid "Controller connection failed: %s"
 msgstr "Połączenie kontrolera się nie powiodło: %s"
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
-msgstr ""
+msgstr "_Zmień płytę CD"
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
+msgstr "przetworzenie adresu URI oVirt się nie powiodło"
+
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
-msgstr ""
+msgstr "Maszyna wirtualna oVirt %s nie jest uruchomiona"
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
-msgstr ""
+msgstr "Maszyna wirtualna oVirt %s nie posiada ekranu"
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
-msgstr ""
-
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
-msgstr "Szczegóły połączenia"
-
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
-msgstr "_Adres połączenia"
+msgid "oVirt VM %s has unknown display type: %d"
+msgstr "Maszyna wirtualna oVirt %s posiada nieznany typ ekranu: %d"
 
 #: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
-msgstr "Na przykład spice://foo.example.org:5900"
-
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
-msgstr "_Ostatnie połączenia"
-
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
-msgstr "Nie można utworzyć sesji Spice"
-
-#: ../src/remote-viewer.c:1221
 msgid "Setting up Spice session..."
-msgstr "Ustawianie sesji Spice..."
+msgstr "Ustawianie sesji Spice…"
 
-#: ../src/remote-viewer.c:1243
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
+msgstr ""
+
+#: ../src/remote-viewer.c:1120
 #, c-format
-msgid "Invalid file %s"
-msgstr "Nieprawidłowy plik %s"
+msgid "Invalid file %s: "
+msgstr ""
 
-#: ../src/remote-viewer.c:1250
+#: ../src/remote-viewer.c:1128
 msgid "Cannot determine the connection type from URI"
 msgstr "Nie można ustalić typu połączenia z adresu URI"
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
-msgstr "Nie można utworzyć sesji dla tego typu: %s"
-
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
+msgstr "Szczegóły połączenia"
+
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
+msgstr "Na przykład spice://foo.example.org:5900"
+
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
+msgstr ""
+
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr "O programie Glade"
@@ -210,8 +221,8 @@ msgid ""
 "Copyright (C) 2007-2012 Daniel P. Berrange\n"
 "Copyright (C) 2007-2014 Red Hat, Inc."
 msgstr ""
-"Copyright (C) 2007-2012 Daniel P. Berrange\n"
-"Copyright (C) 2007-2014 Red Hat, Inc."
+"Copyright © 2007-2012 Daniel P. Berrange\n"
+"Copyright © 2007-2014 Red Hat, Inc."
 
 #: ../src/virt-viewer-about.xml.h:4
 msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt"
@@ -241,140 +252,138 @@ msgid ""
 msgstr ""
 "Niniejszy program jest wolnym oprogramowaniem; można go rozprowadzać dalej\n"
 "i/lub modyfikować na warunkach Powszechnej Licencji Publicznej GNU, wydanej\n"
-"przez Fundację Wolnego Oprogramowania (Free Software Foundation) - według\n"
+"przez Fundację Wolnego Oprogramowania (Free Software Foundation) — według\n"
 "wersji drugiej tej Licencji lub którejś z późniejszych wersji.\n"
 "\n"
 "Niniejszy program rozpowszechniany jest z nadzieją, iż będzie on użyteczny\n"
-"- jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji\n"
+"— jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji\n"
 "PRZYDATNOŚCI HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ. W celu\n"
 "uzyskania bliższych informacji należy zapoznać się z Powszechną Licencją\n"
 "Publiczną GNU.\n"
 "\n"
 "Z pewnością wraz z niniejszym programem dostarczono także egzemplarz\n"
 "Powszechnej Licencji Publicznej GNU (GNU General Public License); jeśli nie\n"
-"- proszę napisać do Free Software Foundation, Inc., 59 Temple Place, Suite\n"
+"— proszę napisać do Free Software Foundation, Inc., 59 Temple Place, Suite\n"
 "330, Boston, MA  02111-1307 USA.\n"
 
 #: ../src/virt-viewer-about.xml.h:20
 msgid "The Fedora Translation Team"
 msgstr "Zespół tłumaczenia Fedory"
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr "Zamknąć sesję?"
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr "Bez pytania ponownie"
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
-msgstr "Oczekiwanie na ekran %d..."
+msgstr "Oczekiwanie na ekran %d…"
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
-msgstr "Nieznany typ grafiki dla gościa %s"
+msgid "Unsupported graphic type '%s'"
+msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr "Połączenie z ssh się nie powiodło."
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr "Nie można połączyć się z kanałem, obsługiwane jest tylko SSH."
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr "Łączenie z kanałem jest nieobsługiwane."
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
+"Ekran może zostać podłączony tylko przez bibliotekę libvirt za pomocą opcji "
+"--attach"
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr "Łączenie z serwerem grafiki"
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr "Domena gościa została wyłączona"
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr "Połączono z serwerem grafiki"
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr "Nie można połączyć się z serwerem grafiki %s"
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
-"Nie można uwierzytelnić z serwerem zdalnego pulpitu w %s: %s\n"
-"Ponowić połączenie?"
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr "Nie można uwierzytelnić z serwerem zdalnego pulpitu: %s"
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr "Błąd przekierowania USB: %s"
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr "Poziom powiększenia musi być w zakresie %d-%d\n"
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr "Ekran %d"
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr "Nieprawidłowy parametr kiosk-quit: %s"
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr "Poziom powiększenia okna, w procentach"
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 "Otwiera w trybie pełnoekranowym (dostosowuje rozdzielczość gościa, aby "
 "pasowała do klienta)"
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr "Dostosowuje skróty"
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr "Włącza tryb kiosku"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr "Kończy działanie po podanym warunku w trybie kiosku"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
-msgstr "<nigdy|po-rozłączeniu>"
+msgstr "<never|on-disconnect>"
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr "Wyświetla więcej informacji"
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr "Wyświetla informacje o debugowaniu"
 
@@ -386,17 +395,23 @@ msgid ""
 "<b>%s</b>\n"
 "\n"
 msgstr ""
+"Wymagane jest uwierzytelnienie dla połączenia %s, aby:\n"
+"\n"
+"<b>%s</b>\n"
+"\n"
 
 #: ../src/virt-viewer-auth.c:92
 #, c-format
 msgid "Authentication is required for the %s connection:\n"
-msgstr ""
+msgstr "Wymagane jest uwierzytelnienie dla połączenia %s:\n"
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr "Wymagane jest uwierzytelnienie"
@@ -415,12 +430,16 @@ msgstr "Nazwa użytkownika:"
 
 #: ../src/virt-viewer-auth.xml.h:5
 msgid "Show password"
+msgstr "Wyświetlanie hasła"
+
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
 msgstr ""
 
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
-msgstr "%s wersja %s\n"
+msgstr "%s w wersji %s\n"
 
 #: ../src/virt-viewer-main.c:62
 msgid "Direct connection with no automatic tunnels"
@@ -450,157 +469,169 @@ msgstr "Przeglądarka wirtualizacji"
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options"
 msgstr ""
-"Wykonanie polecenia \"%s --help\" wyświetli pełną listę dostępnych opcji "
-"wiersza poleceń"
+"Polecenie „%s --help” wyświetli pełną listę dostępnych opcji wiersza poleceń"
 
 #: ../src/virt-viewer-main.c:86
 msgid "Virtual machine graphical console"
 msgstr "Graficzna konsola maszyny wirtualnej"
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
+
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
 "\n"
-"Użycie: %s [OPCJE] NAZWA-DOMENY|IDENTYFIKATOR|UUID\n"
-"\n"
-"%s\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
 "\n"
+msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
-msgstr ""
+msgstr "Nieprawidłowe hasło"
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr "Wybór urządzeń USB do przekierowania"
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr "Nieobsługiwany typ uwierzytelnienia %d"
 
 #: ../src/virt-viewer-vm-connection.c:64
 msgid "No virtual machine found"
+msgstr "Nie odnaleziono żadnej maszyny wirtualnej"
+
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr "Ctrl+Alt+_Del"
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr "Ctrl+Alt+_Backspace"
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr "Ctrl+Alt+F_1"
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr "Ctrl+Alt+F_2"
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr "Ctrl+Alt+F_3"
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr "Ctrl+Alt+F_4"
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr "Ctrl+Alt+F_5"
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr "Ctrl+Alt+F_6"
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr "Ctrl+Alt+F_7"
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr "Ctrl+Alt+F_8"
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr "Ctrl+Alt+F_9"
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr "Ctrl+Alt+F1_0"
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr "Ctrl+Alt+F11"
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr "Ctrl+Alt+F12"
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr "Zrzut ekranu"
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
-msgstr ""
+msgstr "Nieznane"
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr "Rozłącza"
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr "Wybór urządzenia USB"
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr "Wysyła kombinację klawiszy"
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr "Opuszcza pełny ekran"
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr "Ctrl+Alt"
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr "(Naciśnięcie klawiszy %s uwalnia wskaźnik)"
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
-msgstr "%s%s%s - %s"
+msgstr "%s%s%s — %s"
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr " "
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr "Wymagane jest %s co najmniej w wersji %s, aby ustawić to połączenie"
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr "Oczekiwanie na ponowne uruchomienie domeny gościa"
 
@@ -609,123 +640,153 @@ msgstr "Oczekiwanie na ponowne uruchomienie domeny gościa"
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr "Nie można określić typu grafiki dla gościa %s"
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr "Nie można określić gospodarza dla gościa %s"
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
-msgstr ""
+msgstr "Nie można uzyskać dostępu do gościa „%s”"
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
-msgstr ""
+msgstr "Maszyna wirtualna %s nie jest uruchomiona"
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr "Oczekiwanie na uruchomienie biblioteki libvirt"
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr "Wyszukiwanie domeny gościa"
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr "Oczekiwanie na utworzenie domeny gościa"
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr "Sprawdzanie stanu domeny gościa"
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr "Oczekiwanie na uruchomienie domeny gościa"
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
-msgstr ""
+msgstr "Nie można połączyć się z biblioteką libvirt za pomocą adresu URI: %s."
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr "[brak]"
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
+msgstr "Uwierzytelnienie się nie powiodło."
+
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr "_Plik"
 
 #: ../src/virt-viewer.xml.h:4
 msgid "Smartcard insertion"
-msgstr "Włożenie karty smart card"
+msgstr "Włożenie karty smartcard"
 
 #: ../src/virt-viewer.xml.h:5
 msgid "Smartcard removal"
-msgstr "Usunięcie karty smart card"
+msgstr "Usunięcie karty smartcard"
+
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
+msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
+#: ../src/virt-viewer.xml.h:7
 msgid "_View"
 msgstr "_Widok"
 
-#: ../src/virt-viewer.xml.h:7
+#: ../src/virt-viewer.xml.h:8
 msgid "Full screen"
 msgstr "Pełny ekran"
 
-#: ../src/virt-viewer.xml.h:8
+#: ../src/virt-viewer.xml.h:9
 msgid "_Zoom"
 msgstr "P_owiększenie"
 
-#: ../src/virt-viewer.xml.h:9
+#: ../src/virt-viewer.xml.h:10
 msgid "Displays"
 msgstr "Ekrany"
 
-#: ../src/virt-viewer.xml.h:10
+#: ../src/virt-viewer.xml.h:11
 msgid "Release cursor"
 msgstr "Zwolnienie kursora"
 
-#: ../src/virt-viewer.xml.h:11
+#: ../src/virt-viewer.xml.h:12
 msgid "_Send key"
 msgstr "Wyślij klawi_sz"
 
-#: ../src/virt-viewer.xml.h:12
+#: ../src/virt-viewer.xml.h:13
 msgid "_Help"
 msgstr "Pomo_c"
 
-#: ../src/virt-viewer.xml.h:13
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
-msgstr ""
+msgstr "_Informacje o gościu"
 
 #: ../src/virt-viewer-guest-details.xml.h:1
 msgid "Guest Details"
-msgstr ""
+msgstr "Informacje o gościu"
 
 #: ../src/virt-viewer-guest-details.xml.h:2
 msgid "Name:"
-msgstr ""
+msgstr "Nazwa:"
 
 #: ../src/virt-viewer-guest-details.xml.h:3
 msgid "GUID:"
-msgstr ""
+msgstr "GUID:"
 
 #: ../src/virt-viewer-vm-connection.xml.h:1
 msgid "Choose a virtual machine"
-msgstr ""
+msgstr "Wybór maszyny wirtualnej"
 
 #: ../src/virt-viewer-vm-connection.xml.h:2
 msgid "Name"
-msgstr ""
+msgstr "Nazwa"
 
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
+msgstr "Dostępne maszyny wirtualne"
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 09b2fd6..2b15fd7 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Pedro Marques Daniel <danielthpro@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: 2015-01-12 06:21-0500\n"
 "Last-Translator: Daniel Berrange <dan-transifex@berrange.com>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/virt-viewer/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/virt-viewer/"
+"language/pt/)\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.7.3\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -73,43 +74,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -122,83 +123,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -238,118 +246,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -367,11 +373,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -392,6 +400,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -430,26 +442,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -458,117 +478,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr "Ctrl+Alt+F_1"
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr "Ctrl+Alt+F_2"
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr "Ctrl+Alt+F_3"
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr "Ctrl+Alt+F_4"
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr "Ctrl+Alt+F_5"
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr "Ctrl+Alt+F_6"
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr "Ctrl+Alt+F_7"
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr "Ctrl+Alt+F_8"
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr "Ctrl+Alt+F_9"
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr "Ctrl+Alt+F1_0"
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr "Ctrl+Alt+F11"
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr "Ctrl+Alt+F12"
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr "Ctrl+Alt"
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -577,59 +607,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -642,35 +682,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -697,3 +741,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3659c4b..9a5173d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,28 +1,30 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Glaucia Freitas <gcintra@redhat.com>, 2012
 # Glaucia Freitas <gcintra@redhat.com>, 2012-2013
 # Marcelo Barbosa <firemanxbr@fedoraproject.org>, 2013
 # Paulo Sergio Klaus <klauspaulo@gmail.com>, 2014
+# Marco Aurélio Krause <ouesten@me.com>, 2015. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
-"PO-Revision-Date: 2015-01-12 06:21-0500\n"
-"Last-Translator: Daniel Berrange <dan-transifex@berrange.com>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/virt-viewer/language/pt_BR/)\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
+"PO-Revision-Date: 2015-10-28 04:11-0400\n"
+"Last-Translator: Marco Aurélio Krause <ouesten@me.com>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/virt-"
+"viewer/language/pt_BR/)\n"
+"Language: pt-BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt-BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.7.3\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr "Visualizador remoto"
 
@@ -76,46 +78,47 @@ msgstr "As bandeiras de união"
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
-msgstr "versão remote-viewer %s\n"
+msgid "remote-viewer version %s"
+msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr "Exibir informações de versão"
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr "Setando título da janela"
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr "Abrir conexão usando a comunicação do controlador Spice"
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
-msgstr ""
+msgstr "Visualizador remoto"
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 "%s\n"
-"Execute '%s --help' para ver uma lista completa de opções de linhas de comando disponíveis\n"
+"Execute '%s --help' para ver uma lista completa de opções de linhas de "
+"comando disponíveis\n"
 "\n"
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr "Erro: argumentos extras passados ao usar o controlador Spice\n"
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr "Erro: não é possível manipular múltiplas URIs\n"
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr "Falha ao iniciar a conexão "
 
@@ -128,83 +131,90 @@ msgstr "Exibir desabilitado pelo controlador"
 msgid "Controller connection failed: %s"
 msgstr "Conexão de controlador falhou:%s"
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
-msgstr ""
+msgstr "Alterar _CD"
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
-msgstr ""
-
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
-msgstr "Detalhes da conexão"
-
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
 #: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
-msgstr ""
-
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
-msgstr ""
-
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
-msgstr "Não foi possível criar uma sessão Spice"
-
-#: ../src/remote-viewer.c:1221
 msgid "Setting up Spice session..."
 msgstr "Configurando uma sessão Spice"
 
-#: ../src/remote-viewer.c:1243
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
+msgstr ""
+
+#: ../src/remote-viewer.c:1120
 #, c-format
-msgid "Invalid file %s"
-msgstr "Arquivo inválido %s"
+msgid "Invalid file %s: "
+msgstr ""
 
-#: ../src/remote-viewer.c:1250
+#: ../src/remote-viewer.c:1128
 msgid "Cannot determine the connection type from URI"
 msgstr "Não foi possíve determinar o tipo de conexão a partir do URI"
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
-msgstr "Não foi possível criar uma sessão para este tpo: %s"
-
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
+msgstr "Detalhes da conexão"
+
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
+msgstr "Por exemplo, spice://foo.example.org:5900"
+
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
+msgstr ""
+
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr "Sobre o Glade"
@@ -214,6 +224,8 @@ msgid ""
 "Copyright (C) 2007-2012 Daniel P. Berrange\n"
 "Copyright (C) 2007-2014 Red Hat, Inc."
 msgstr ""
+"Copyright (C) 2007-2012 Daniel P. Berrange\n"
+"Copyright (C) 2007-2014 Red Hat, Inc."
 
 #: ../src/virt-viewer-about.xml.h:4
 msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt"
@@ -240,133 +252,136 @@ msgid ""
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
 msgstr ""
-"Este programa é um software livre; você pode redistribuí-lo e/ou modificá-lo sob os termos do GNU - General Public License como publicado pela Fundação de Software Livre; tanto a versão 2 da Licensa quanto (na sua opinião) qualquer versão posterior a esta.\n"
+"Este programa é um software livre; você pode redistribuí-lo e/ou modificá-lo "
+"sob os termos do GNU - General Public License como publicado pela Fundação "
+"de Software Livre; tanto a versão 2 da Licensa quanto (na sua opinião) "
+"qualquer versão posterior a esta.\n"
 "\n"
 "Este programa é distribuído esperando que seja útiil, \n"
-"mas SEM NENHUMA GARANTIA; sem até mesmo a garantia implicada de MERCANTIBILIDADE  ou SERVIÇO PARA UM PROPÓSITO ESPECÍFICO.  Seja GNU - General Public License para mais detalhes. \n"
+"mas SEM NENHUMA GARANTIA; sem até mesmo a garantia implicada de "
+"MERCANTIBILIDADE  ou SERVIÇO PARA UM PROPÓSITO ESPECÍFICO.  Seja GNU - "
+"General Public License para mais detalhes. \n"
 "\n"
-"Você deve ter recebido uma cópia do GNU - General Public License junto com este programa; Caso não o tenha recebido, escreva para a Fundação de Software Livre, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n"
+"Você deve ter recebido uma cópia do GNU - General Public License junto com "
+"este programa; Caso não o tenha recebido, escreva para a Fundação de "
+"Software Livre, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n"
 
 #: ../src/virt-viewer-about.xml.h:20
 msgid "The Fedora Translation Team"
 msgstr "A equipe de Tradução do Fedora "
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr "Você quer fechar a sessão?"
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr "Não me pergunte novamente"
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr "Esperando pelo display %d..."
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
-msgstr "Tipo de gráfico desconhecido para convidados %s"
+msgid "Unsupported graphic type '%s'"
+msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr "Falha ao conectar com o ssh."
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr "Não foi possível conectar o canal, SSH somente suportado."
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr "A conexão com o canal não é suportada."
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr "Conectando ao servidor de gráfico"
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr "Domínio de convidado precisa ser fechado"
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr "Conectado ao servidor de gráfico"
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr "Incapaz de conectar ao servidor de gráfico %s"
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
-"Incapaz de autenticar com o servidor de desktop remoto em %s: %s Tentar "
-"conexão novamente?"
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr "Incapaz de autenticar com o servidor remoto: %s"
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr "Erro de redirecionamento do USB:%s"
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr "Zoom nível deve ser dentro de %d-%d\n"
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr "Exibir %d"
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr "Inválido kiosk-quit argumento: %s"
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr "Nível de zoom da janela, em porcentagem"
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 "Abra no modo tela cheia (ajusta a resolução do convidado para caber no "
 "cliente)"
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr "Personalize teclas de atalho "
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr "Ativar kiosk modo"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr "Sair em determinada condição em kiosk modo "
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr "<never|on-disconnect>"
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr "Exibir informações de verbose"
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr "Exibir informações de depuração"
 
@@ -384,11 +399,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr "Autenticação requerida"
@@ -407,6 +424,10 @@ msgstr "Nome de usuário:"
 
 #: ../src/virt-viewer-auth.xml.h:5
 msgid "Show password"
+msgstr "Exibir senha"
+
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
 msgstr ""
 
 #: ../src/virt-viewer-main.c:38
@@ -449,150 +470,163 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
+
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
 "\n"
-"Uso: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
-"\n"
-"%s\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
 "\n"
+msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
-msgstr ""
+msgstr "Senha inválida"
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr "Selecionar os dispositivos do USB para redirecionamento"
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr "Autenticação não suportada tipo %d"
 
 #: ../src/virt-viewer-vm-connection.c:64
 msgid "No virtual machine found"
+msgstr "Nenhuma máquina virtual foi encontrada"
+
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr "Ctrl+Alt+_Del"
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr "Ctrl+Alt+_Backspace"
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr "Ctrl+Alt+F_1"
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr "Ctrl+Alt+F_2"
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr "Ctrl+Alt+F_3"
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr "Ctrl+Alt+F_4"
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr "Ctrl+Alt+F_5"
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr "Ctrl+Alt+F_6"
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr "Ctrl+Alt+F_7"
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr "Ctrl+Alt+F_8"
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr "Ctrl+Alt+F_9"
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr "Ctrl+Alt+F1_0"
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr "Ctrl+Alt+F11"
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr "Ctrl+Alt+F12"
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr "Screenshot"
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
-msgstr ""
+msgstr "Desconhecido"
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr "Desconectar"
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr "Seleção de dispositivo de USB"
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr "Enviar combinação de teclas"
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr "Deixar tela cheia"
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr "Ctrl+Alt"
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr "(Pressione %s para liberar o ponteiro)"
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr "%s%s%s - %s"
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr " "
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr "Pelo menos %s versão %s é necessária para configurar esta conexão"
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr "Esperando pelo domínio do convidado para reiniciar"
 
@@ -601,59 +635,69 @@ msgstr "Esperando pelo domínio do convidado para reiniciar"
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr "Não é possível determinar o tipo de gráfico para o convidado %s"
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr "Não foi possível determinar o host para os convidados %s"
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr "Aguardando libvirt para iniciar"
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr "Encontrando o domínio do convidado"
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr "Esperando pelo domínio do convidado a ser criado"
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr "Verificando o status do domínio do convidado"
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr "Esperando pelo domínio do convidado para iniciar"
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr "[nenhum]"
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
+msgstr "falha na autenticação."
+
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr "_Arquivo"
@@ -666,35 +710,39 @@ msgstr "Inserção do Smartcard "
 msgid "Smartcard removal"
 msgstr "Remoção do Smartcard"
 
-#: ../src/virt-viewer.xml.h:6
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:7
 msgid "_View"
 msgstr "_Visualizar"
 
-#: ../src/virt-viewer.xml.h:7
+#: ../src/virt-viewer.xml.h:8
 msgid "Full screen"
 msgstr "Tela cheia"
 
-#: ../src/virt-viewer.xml.h:8
+#: ../src/virt-viewer.xml.h:9
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../src/virt-viewer.xml.h:9
+#: ../src/virt-viewer.xml.h:10
 msgid "Displays"
 msgstr "Displays"
 
-#: ../src/virt-viewer.xml.h:10
+#: ../src/virt-viewer.xml.h:11
 msgid "Release cursor"
 msgstr "Liberar o cursor"
 
-#: ../src/virt-viewer.xml.h:11
+#: ../src/virt-viewer.xml.h:12
 msgid "_Send key"
 msgstr "_Chave de Envio"
 
-#: ../src/virt-viewer.xml.h:12
+#: ../src/virt-viewer.xml.h:13
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../src/virt-viewer.xml.h:13
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -704,20 +752,36 @@ msgstr ""
 
 #: ../src/virt-viewer-guest-details.xml.h:2
 msgid "Name:"
-msgstr ""
+msgstr "Nome:"
 
 #: ../src/virt-viewer-guest-details.xml.h:3
 msgid "GUID:"
-msgstr ""
+msgstr "GUID:"
 
 #: ../src/virt-viewer-vm-connection.xml.h:1
 msgid "Choose a virtual machine"
-msgstr ""
+msgstr "Escolha uma máquina virtual"
 
 #: ../src/virt-viewer-vm-connection.xml.h:2
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
+msgstr "Máquinas virtuais disponíveis"
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 8c3f56a..11036d6 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2,23 +2,24 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Romanian\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ro\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +73,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +122,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +245,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +372,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +399,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +441,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +477,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +606,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +681,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +740,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 32a4d7d..90bd92d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,29 +1,33 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Alexander Savchenko, 2014
 # Automatically generated, 2010
 # triplepointfive <iya777@yandex.ru>, 2012
 # Yulia <ypoyarko@redhat.com>, 2010, 2012
 # Yulia <yulia.poyarkova@redhat.com>, 2013
+# Ilyas B Arinov <arinov.ilyas@gmail.com>, 2015. #zanata
+# yuliya <ypoyarko@redhat.com>, 2015. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
-"PO-Revision-Date: 2015-01-12 06:21-0500\n"
-"Last-Translator: Daniel Berrange <dan-transifex@berrange.com>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/virt-viewer/language/ru/)\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
+"PO-Revision-Date: 2015-06-07 07:46-0400\n"
+"Last-Translator: Ilyas B Arinov <arinov.ilyas@gmail.com>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/virt-viewer/"
+"language/ru/)\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Zanata 3.5.1\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Zanata 3.7.3\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr "Удаленный просмотр"
 
@@ -77,26 +81,26 @@ msgstr "Флаги привязки"
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
-msgstr "remote-viewer, версия %s\n"
+msgid "remote-viewer version %s"
+msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr "Показать версию"
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr "Изменить заголовок окна"
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr "Открыть соединение с помощью контроллера Spice"
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
-msgstr ""
+msgstr "Клиент удаленного просмотра"
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
@@ -105,17 +109,17 @@ msgstr ""
 "%s\n"
 "Выполните «%s --help» для просмотра полного списка параметров\n"
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr "Ошибка. Лишние аргументы при использовании контроллера Spice\n"
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr "Ошибка. Обработка нескольких URI не допускается.\n"
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr "Не удалось установить соединение"
 
@@ -128,83 +132,90 @@ msgstr "Дисплей отключен контроллером"
 msgid "Controller connection failed: %s"
 msgstr "Ошибка подключения контроллера: %s"
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
-msgstr ""
+msgstr "_Сменить CD"
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
+msgstr "не удалось обработать oVirt uri"
+
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
-msgstr ""
+msgstr "Виртуальная машина oVirt %s не работает"
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
-msgstr ""
+msgstr "Отсутствует дисплей у ВМ oVirt %s"
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
-msgstr ""
-
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
-msgstr "Свойства подключения"
-
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
-msgstr ""
+msgid "oVirt VM %s has unknown display type: %d"
+msgstr "Неизвестный тип дисплея виртуальной машины oVirt %s: %d"
 
 #: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
-msgstr ""
-
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
-msgstr ""
-
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
-msgstr "Не удалось создать сеанс Spice"
-
-#: ../src/remote-viewer.c:1221
 msgid "Setting up Spice session..."
 msgstr "Инициализация сеанса Spice..."
 
-#: ../src/remote-viewer.c:1243
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
+msgstr ""
+
+#: ../src/remote-viewer.c:1120
 #, c-format
-msgid "Invalid file %s"
-msgstr "Недопустимый файл %s"
+msgid "Invalid file %s: "
+msgstr ""
 
-#: ../src/remote-viewer.c:1250
+#: ../src/remote-viewer.c:1128
 msgid "Cannot determine the connection type from URI"
 msgstr "Не удалось определить тип подключения в URI"
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
-msgstr "Не удалось создать сеанс этого типа: %s"
-
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
+msgstr "Свойства подключения"
+
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
+msgstr "Например, spice://foo.example.org:5900"
+
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
+msgstr ""
+
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr "О  Glade"
@@ -214,6 +225,8 @@ msgid ""
 "Copyright (C) 2007-2012 Daniel P. Berrange\n"
 "Copyright (C) 2007-2014 Red Hat, Inc."
 msgstr ""
+"(C) 2007-2012 Daniel P. Berrange\n"
+"(C) 2007-2014 Red Hat, Inc."
 
 #: ../src/virt-viewer-about.xml.h:4
 msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt"
@@ -260,120 +273,118 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr "Команда локализации Fedora"
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr "Закрыть сеанс?"
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr "Больше не спрашивать"
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr "Ожидание просмотра %d..."
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
-msgstr "Неизвестный тип графической подсистемы для гостя %s"
+msgid "Unsupported graphic type '%s'"
+msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr "Ошибка соединения ssh."
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr "Не удалось подключиться к каналу. Поддерживается только  SSH."
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr "Подключение к каналу не поддерживается."
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
-msgstr ""
+msgstr "Дисплей может быть подключён только через libvirt с --attach"
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr "Подключение к графическому серверу"
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr "Гостевой домен завершил работу"
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr "Установлено соединение с графическим сервером"
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr "Не удалось установить соединение с сервером %s"
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
-"Не удалось пройти аутентификацию на удаленном сервере: %s: %s\n"
-"Повторить попытку подключения?"
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr "Не удалось пройти аутентификацию на удаленном сервере: %s"
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr "Ошибка перенаправления USB: %s"
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
-msgstr ""
+msgstr "Уровень увеличения должен быть между %d-%d\n"
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr "Экран %d"
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
-msgstr ""
+msgstr "недопустимый аргумент kiosk-quit: %s"
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr "Масштаб окна в процентах"
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
+"Открыть в полноэкранном режиме (регулирует разрешение гостя для соответствия "
+"клиенту)"
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr "Настроить комбинации клавиш"
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
-msgstr ""
+msgstr "Включить режим киоска"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
-msgstr ""
+msgstr "Выйти по заданному условию в режиме киоска"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
-msgstr ""
+msgstr "<never|on-disconnect>"
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr "Подробный вывод"
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr "Показать сообщения диагностики"
 
@@ -385,17 +396,23 @@ msgid ""
 "<b>%s</b>\n"
 "\n"
 msgstr ""
+"Требуется аутентификация для соединения %s с:\n"
+"\n"
+"<b>%s</b>\n"
+"\n"
 
 #: ../src/virt-viewer-auth.c:92
 #, c-format
 msgid "Authentication is required for the %s connection:\n"
-msgstr ""
+msgstr "Требуется аутентификация для соединения %s:\n"
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr "Требуется проверка подлинности"
@@ -414,6 +431,10 @@ msgstr "Пользователь:"
 
 #: ../src/virt-viewer-auth.xml.h:5
 msgid "Show password"
+msgstr "Показать пароль"
+
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
 msgstr ""
 
 #: ../src/virt-viewer-main.c:38
@@ -452,152 +473,165 @@ msgstr "Выполните «%s --help» для просмотра полног�
 
 #: ../src/virt-viewer-main.c:86
 msgid "Virtual machine graphical console"
-msgstr ""
+msgstr "Графическая консоль виртуальной машины"
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
+
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
 "\n"
-"Формат: %s [ПАРАМЕТРЫ] ДОМЕН|ID|UUID\n"
-"\n"
-"%s\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
 "\n"
+msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
-msgstr ""
+msgstr "Неверный пароль"
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr "Выбрать устройства USB для перенаправления"
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr "Неподдерживаемый тип аутентификации  %d"
 
 #: ../src/virt-viewer-vm-connection.c:64
 msgid "No virtual machine found"
+msgstr "Виртуальная машина не найдена"
+
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr "Ctrl+Alt+_Del"
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr "Ctrl+Alt+_Backspace"
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr "Ctrl+Alt+F_1"
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr "Ctrl+Alt+F_2"
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr "Ctrl+Alt+F_3"
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr "Ctrl+Alt+F_4"
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr "Ctrl+Alt+F_5"
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr "Ctrl+Alt+F_6"
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr "Ctrl+Alt+F_7"
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr "Ctrl+Alt+F_8"
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr "Ctrl+Alt+F_9"
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr "Ctrl+Alt+F1_0"
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr "Ctrl+Alt+F11"
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr "Ctrl+Alt+F12"
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr "Снимок экрана"
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
-msgstr ""
+msgstr "Неизвестно"
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr "Отключиться"
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr "Выбор устройства USB"
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr "Отправить комбинацию клавиш"
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr "Выйти из полноэкранного режима"
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr "Ctrl+Alt"
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr "(нажмите %s для освобождения курсора)"
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr "%s%s%s - %s"
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr " "
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
 #, c-format
-msgid "At least %s version %s is required to setup this connection"
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer-file.c:833
+#, c-format
+msgid "At least %s version %s is required to setup this connection"
+msgstr "Чтобы установить соединение требуется по крайней мере %s версии %s"
+
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr "Ожидание перезапуска гостевого домена"
 
@@ -606,59 +640,69 @@ msgstr "Ожидание перезапуска гостевого домена"
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr "Не удалось определить тип графической подсистемы для гостя %s"
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr "Не удалось определить хост для гостя %s"
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
-msgstr ""
+msgstr "Гость '%s' недосягаем"
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
-msgstr ""
+msgstr "Виртуальная машина %s не запущена"
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr "Ожидание запуска libvirt"
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr "Поиск гостевого домена"
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr "Ожидание создания гостевого домена"
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr "Проверка статуса гостевого домена"
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr "Ожидание запуска гостевого домена"
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
-msgstr ""
+msgstr "Невозможно подключиться к libvirt с URI: %s."
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr "[нет]"
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
+msgstr "Сбой аутентификации."
+
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr "_Файл"
@@ -671,58 +715,78 @@ msgstr "Подключение смарт-карты"
 msgid "Smartcard removal"
 msgstr "Удаление смарт-карты"
 
-#: ../src/virt-viewer.xml.h:6
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:7
 msgid "_View"
 msgstr "_Просмотр"
 
-#: ../src/virt-viewer.xml.h:7
+#: ../src/virt-viewer.xml.h:8
 msgid "Full screen"
 msgstr "Во весь экран"
 
-#: ../src/virt-viewer.xml.h:8
+#: ../src/virt-viewer.xml.h:9
 msgid "_Zoom"
 msgstr "_Масштаб"
 
-#: ../src/virt-viewer.xml.h:9
+#: ../src/virt-viewer.xml.h:10
 msgid "Displays"
 msgstr "Экраны"
 
-#: ../src/virt-viewer.xml.h:10
+#: ../src/virt-viewer.xml.h:11
 msgid "Release cursor"
 msgstr "Освободить курсор"
 
-#: ../src/virt-viewer.xml.h:11
+#: ../src/virt-viewer.xml.h:12
 msgid "_Send key"
 msgstr "О_тправить клавишу"
 
-#: ../src/virt-viewer.xml.h:12
+#: ../src/virt-viewer.xml.h:13
 msgid "_Help"
 msgstr "_Справка"
 
-#: ../src/virt-viewer.xml.h:13
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
-msgstr ""
+msgstr "_Детали гостя"
 
 #: ../src/virt-viewer-guest-details.xml.h:1
 msgid "Guest Details"
-msgstr ""
+msgstr "Детали гостя"
 
 #: ../src/virt-viewer-guest-details.xml.h:2
 msgid "Name:"
-msgstr ""
+msgstr "Имя:"
 
 #: ../src/virt-viewer-guest-details.xml.h:3
 msgid "GUID:"
-msgstr ""
+msgstr "GUID:"
 
 #: ../src/virt-viewer-vm-connection.xml.h:1
 msgid "Choose a virtual machine"
-msgstr ""
+msgstr "Выберите виртуальную машину"
 
 #: ../src/virt-viewer-vm-connection.xml.h:2
 msgid "Name"
-msgstr ""
+msgstr "Имя"
 
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
+msgstr "Доступные виртуальные машины"
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
 msgstr ""
diff --git a/po/si.po b/po/si.po
index eb89b2c..b06b4f0 100644
--- a/po/si.po
+++ b/po/si.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Sinhala\n"
+"Language: si\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: si\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/sk.po b/po/sk.po
index 06c7f48..7f63fbf 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Michal Hriň <michal.hrin@yahoo.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: 2015-01-12 06:21-0500\n"
 "Last-Translator: Daniel Berrange <dan-transifex@berrange.com>\n"
-"Language-Team: Slovak (http://www.transifex.com/projects/p/virt-viewer/language/sk/)\n"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/virt-viewer/"
+"language/sk/)\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.7.3\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -73,43 +74,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr "Zobraziť informácie o verzii"
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr "Zlyhala inicializácia spojenia"
 
@@ -122,83 +123,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr "Spojenie radiču zlyhalo: %s"
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
-msgstr ""
-
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
-msgstr "Detaily spojenia"
-
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
 #: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
-msgstr ""
-
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
-msgstr ""
-
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
-msgstr "Nie je možné vytvoriť Spice sedenie"
-
-#: ../src/remote-viewer.c:1221
 msgid "Setting up Spice session..."
 msgstr "Nastavuje sa Spice sedenie..."
 
-#: ../src/remote-viewer.c:1243
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
+msgstr ""
+
+#: ../src/remote-viewer.c:1120
 #, c-format
-msgid "Invalid file %s"
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
+#: ../src/remote-viewer.c:1128
 msgid "Cannot determine the connection type from URI"
 msgstr "Nie je možné určiť typ spojenia z URI"
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
-msgstr ""
-
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
+msgstr "Detaily spojenia"
+
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
+msgstr ""
+
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -238,118 +246,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr "ssh spojenie zlyhalo."
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr "Nie je možne pripojenie do kanálu, podporované je iba SSH."
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr "Pripájanie na grafický server"
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr "Nie je možné spojenie ku grafickému serveru %s"
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr "Chyba USB presmerovania: %s"
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -367,11 +373,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -392,6 +400,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -430,26 +442,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -458,117 +478,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr "Ctrl+Alt+_Del"
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr "Ctrl+Alt+_Backspace"
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr "Ctrl+Alt+F_1"
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr "Ctrl+Alt+F_2"
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr "Ctrl+Alt+F_3"
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr "Ctrl+Alt+F_4"
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr "Ctrl+Alt+F_5"
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr "Ctrl+Alt+F_6"
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr "Ctrl+Alt+F_7"
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr "Ctrl+Alt+F_8"
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr "Ctrl+Alt+F_9"
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr "Ctrl+Alt+F1_0"
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr "Odpojiť"
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr "Výber USB zariadenia"
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr "Opustiť režim celej obrazovky"
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr "Ctrl+Alt"
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr "(Stlačte %s pre uvoľnenie ukazovateľa)"
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr "%s%s%s - %s"
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr " "
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -577,59 +607,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr "_Súbor"
@@ -642,35 +682,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:7
 msgid "_View"
 msgstr "_Zobraziť"
 
-#: ../src/virt-viewer.xml.h:7
+#: ../src/virt-viewer.xml.h:8
 msgid "Full screen"
 msgstr "Celá obrazovka"
 
-#: ../src/virt-viewer.xml.h:8
+#: ../src/virt-viewer.xml.h:9
 msgid "_Zoom"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:9
+#: ../src/virt-viewer.xml.h:10
 msgid "Displays"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:10
+#: ../src/virt-viewer.xml.h:11
 msgid "Release cursor"
 msgstr "Uvoľniť kurzor"
 
-#: ../src/virt-viewer.xml.h:11
+#: ../src/virt-viewer.xml.h:12
 msgid "_Send key"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:12
+#: ../src/virt-viewer.xml.h:13
 msgid "_Help"
 msgstr "_Pomoc"
 
-#: ../src/virt-viewer.xml.h:13
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -697,3 +741,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 7eae041..3d8b082 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,23 +2,24 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Slovenian\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0)\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0)\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +73,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +122,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +245,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +372,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +399,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +441,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +477,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +606,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +681,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +740,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/sq.po b/po/sq.po
index 1e4bf80..bf594c2 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Albanian\n"
+"Language: sq\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 58fbdc6..9a2ad0b 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -2,23 +2,24 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Serbian\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sr\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +73,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +122,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +245,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +372,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +399,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +441,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +477,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +606,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +681,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +740,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 27999fa..0d82c8d 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -2,23 +2,24 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Serbian (LATIN)\n"
+"Language: sr@latin\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sr@latin\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +73,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +122,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +245,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +372,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +399,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +441,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +477,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +606,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +681,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +740,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 096ec28..09c16ad 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,27 +1,29 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # denka <dennis@dennis.se>, 2014
 # Göran Uddeborg <goeran@uddeborg.se>, 2013-2014
 # Klap Hest <jojje3000@hotmail.com>, 2013
+# Göran Uddeborg <goeran@uddeborg.se>, 2015. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
-"PO-Revision-Date: 2015-01-12 06:21-0500\n"
-"Last-Translator: Daniel Berrange <dan-transifex@berrange.com>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/virt-viewer/language/sv/)\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
+"PO-Revision-Date: 2015-08-31 01:47-0400\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/virt-viewer/"
+"language/sv/)\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.7.3\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr "Fjärrvisare"
 
@@ -75,45 +77,46 @@ msgstr "Bindningsflaggorna"
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
-msgstr "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
+msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr "Visa versionsinformation"
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr "Ange fönstertitel"
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr "Öppna anslutning med Spice-styrning av kommunikationen"
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr "Fjärrvisarklient"
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 "%s\n"
-"Kör ”%s --help” för att se hela listan över tillgängliga kommandoradsflaggor\n"
+"Kör ”%s --help” för att se hela listan över tillgängliga "
+"kommandoradsflaggor\n"
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr "Fel: extra argument angivna vid användning av Spice-styrning\n"
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr "Fel: kan inte hantera flera URI:er\n"
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr "Misslyckades att initiera anslutningen"
 
@@ -126,83 +129,90 @@ msgstr "Visningen avaktiverad av styrenhet"
 msgid "Controller connection failed: %s"
 msgstr "Styranslutning misslyckades: %s"
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
-msgstr ""
+msgstr "_Byt CD"
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
+msgstr "kunde inte analysera ovirt-uri"
+
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
-msgstr ""
+msgstr "oVirt-VM %s kör inte"
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
-msgstr ""
+msgstr "oVirt-VM %s har ingen display"
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
-msgstr ""
-
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
-msgstr "Anslutningsdetaljer"
-
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
-msgstr "_Anslutningsadress"
+msgid "oVirt VM %s has unknown display type: %d"
+msgstr "oVirt-VM %s har en okänd display-typ: %d"
 
 #: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
-msgstr "Till exempel, spice://apa.exempel.se:5900"
-
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
-msgstr "_Senaste anslutningar"
-
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
-msgstr "Kunde inte skapa en Spice-session"
-
-#: ../src/remote-viewer.c:1221
 msgid "Setting up Spice session..."
 msgstr "Sätter upp en Spice-session …"
 
-#: ../src/remote-viewer.c:1243
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
+msgstr ""
+
+#: ../src/remote-viewer.c:1120
 #, c-format
-msgid "Invalid file %s"
-msgstr "Ogiltig fil %s"
+msgid "Invalid file %s: "
+msgstr ""
 
-#: ../src/remote-viewer.c:1250
+#: ../src/remote-viewer.c:1128
 msgid "Cannot determine the connection type from URI"
 msgstr "Kan inte avgöra anslutningstypen från URI:n"
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
-msgstr "Kunde inte skapa en session för denna typ: %s"
-
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
+msgstr "Anslutningsdetaljer"
+
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
+msgstr "Till exempel, spice://apa.exempel.se:5900"
+
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
+msgstr ""
+
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr "Om Glade"
@@ -239,132 +249,135 @@ msgid ""
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
 msgstr ""
-"Detta program är fri programvara.  Du kan distribuera det och/eller modifiera det under villkoren i GNU General Public License, publicerad av Free Software Foundation, antingen version 2 eller (om du så vill) någon senare version.\n"
+"Detta program är fri programvara.  Du kan distribuera det och/eller "
+"modifiera det under villkoren i GNU General Public License, publicerad av "
+"Free Software Foundation, antingen version 2 eller (om du så vill) någon "
+"senare version.\n"
 "\n"
-"Detta program distribueras i hopp om att det ska vara användbart, men UTAN NÅGON GARANTI, även utan underförstådd garanti vid KÖP eller LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General Public License för ytterligare information.\n"
+"Detta program distribueras i hopp om att det ska vara användbart, men UTAN "
+"NÅGON GARANTI, även utan underförstådd garanti vid KÖP eller LÄMPLIGHET FÖR "
+"NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General Public License för ytterligare "
+"information.\n"
 "\n"
-"Du bör ha fått en kopia av GNU General Public License tillsammans med detta program. Om inte, skriv till Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA\n"
+"Du bör ha fått en kopia av GNU General Public License tillsammans med detta "
+"program. Om inte, skriv till Free Software Foundation, Inc., 59 Temple "
+"Place, Suite 330, Boston, MA 02111-1307  USA\n"
 
 #: ../src/virt-viewer-about.xml.h:20
 msgid "The Fedora Translation Team"
 msgstr "Fedoras översättningsgrupp"
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr "Vill du stänga sessionen?"
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr "Fråga mig inte igen"
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr "Väntar på display %d …"
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
-msgstr "Okänd grafiktyp för gästen %s"
+msgid "Unsupported graphic type '%s'"
+msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr "Anslutning till ssh misslyckades."
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr "Kan inte ansluta till kanalen, endast SSH stödjs."
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr "Anslutning till kanalen stödjs inte."
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
-msgstr ""
+msgstr "Kan bara ansluta till displayen via libvirt med --attach"
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr "Anslutning till grafikserver"
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr "Gästdomänen är avstängd"
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr "Ansluten till grafikserver"
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr "Kan inte ansluta till grafikservern %s"
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
-"Kan inte autenticera med fjärskrivbordsservern på %s: %s\n"
-"Försök ansluta igen?"
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr "Kan inte autenticera med fjärskrivbordsserver: %s"
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr "USB-omdirigeringsfel: %s"
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr "Zoom-nivån måste vara inom %d-%d\n"
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr "Display %d"
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr "Ogiltigt helskärmsargument: %s"
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr "Zoom-nivå för fönstret, i procent"
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
-"Öppna i fullskärmsläge (ställ upplösningen på gästen till att passa "
-"klienten)"
+"Öppna i fullskärmsläge (ställ upplösningen på gästen till att passa klienten)"
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr "Anpassa snabbtangenter"
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr "Aktivera kioskläge"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr "Avsluta på angivet villkor i kioskläge"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr "<aldrig | vid-frånkoppling>"
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr "Visa utförlig information"
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr "Visa felsökningsinformation"
 
@@ -376,17 +389,23 @@ msgid ""
 "<b>%s</b>\n"
 "\n"
 msgstr ""
+"Autenticering krävs för %s-anslutningen till:\n"
+"\n"
+"<b>%s</b>\n"
+"\n"
 
 #: ../src/virt-viewer-auth.c:92
 #, c-format
 msgid "Authentication is required for the %s connection:\n"
-msgstr ""
+msgstr "Autenticering krävs för %s-anslutningen:\n"
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr "Autenticering krävs"
@@ -405,6 +424,10 @@ msgstr "Användarnamn:"
 
 #: ../src/virt-viewer-auth.xml.h:5
 msgid "Show password"
+msgstr "Visa lösenord"
+
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
 msgstr ""
 
 #: ../src/virt-viewer-main.c:38
@@ -446,150 +469,163 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr "Grafisk konsol för virtuella maskiner"
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
+
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
 "\n"
-"Användning: %s [FLAGGOR] DOMÄNNAMN|ID|UUID\n"
-"\n"
-"%s\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
 "\n"
+msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
-msgstr ""
+msgstr "Felaktigt lösenord"
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr "Välj USB-enheter att omdirigera"
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr "Autenticeringstyp %d som inte stödjs"
 
 #: ../src/virt-viewer-vm-connection.c:64
 msgid "No virtual machine found"
+msgstr "Ingen virtuell maskin funnen"
+
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr "Ctrl+Alt+_Del"
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr "Ctrl+Alt+_Baksteg"
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr "Ctrl+Alt+F_1"
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr "Ctrl+Alt+F_2"
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr "Ctrl+Alt+F_3"
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr "Ctrl+Alt+F_4"
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr "Ctrl+Alt+F_5"
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr "Ctrl+Alt+F_6"
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr "Ctrl+Alt+F_7"
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr "Ctrl+Alt+F_8"
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr "Ctrl+Alt+F_9"
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr "Ctrl+Alt+F1_0"
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr "Ctrl+Alt+F11"
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr "Ctrl+Alt+F12"
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr "Skärmbild"
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
-msgstr ""
+msgstr "Okänd"
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr "Koppla ifrån"
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr "Val av USB-enhet"
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr "Skicka tangentbordskombination"
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr "Lämna helskärm"
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr "Ctrl+Alt"
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr "(Tryck %s för att släppa markören)"
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr "%s%s%s - %s"
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr " "
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr "Åtminstone %s version %s behövs för att skapa denna anslutning"
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr "Vänta på att gästdomänen startas om"
 
@@ -598,59 +634,69 @@ msgstr "Vänta på att gästdomänen startas om"
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr "Kan inte avgöra grafiktypen för gästen %s"
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr "Kan inte avgöra värden för gästen %s"
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
-msgstr ""
+msgstr "Gästen ”%s” är inte nåbar"
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
-msgstr ""
+msgstr "Den virtuella maskinen %s kör inte"
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr "Väntar på att libvirt skall starta"
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr "Letar reda på gästdomänen"
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr "Väntar på att gästdomänen skall skapas"
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr "Kontrollerar gästdomänens status"
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr "Väntar på att gästdomänen skall starta"
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
-msgstr ""
+msgstr "Kan inte ansluta till libvirt med URI: %s."
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr "[ingen]"
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
+msgstr "Autenticeringen misslyckades."
+
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr "_Arkiv"
@@ -663,58 +709,78 @@ msgstr "Insättning av smartkort"
 msgid "Smartcard removal"
 msgstr "Uttag av smartkort"
 
-#: ../src/virt-viewer.xml.h:6
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:7
 msgid "_View"
 msgstr "_Visa"
 
-#: ../src/virt-viewer.xml.h:7
+#: ../src/virt-viewer.xml.h:8
 msgid "Full screen"
 msgstr "Helskärm"
 
-#: ../src/virt-viewer.xml.h:8
+#: ../src/virt-viewer.xml.h:9
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../src/virt-viewer.xml.h:9
+#: ../src/virt-viewer.xml.h:10
 msgid "Displays"
 msgstr "Displayer"
 
-#: ../src/virt-viewer.xml.h:10
+#: ../src/virt-viewer.xml.h:11
 msgid "Release cursor"
 msgstr "Släpp markören"
 
-#: ../src/virt-viewer.xml.h:11
+#: ../src/virt-viewer.xml.h:12
 msgid "_Send key"
 msgstr "_Skicka tangent"
 
-#: ../src/virt-viewer.xml.h:12
+#: ../src/virt-viewer.xml.h:13
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: ../src/virt-viewer.xml.h:13
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
-msgstr ""
+msgstr "_Gästdetaljer"
 
 #: ../src/virt-viewer-guest-details.xml.h:1
 msgid "Guest Details"
-msgstr ""
+msgstr "Gästdetaljer"
 
 #: ../src/virt-viewer-guest-details.xml.h:2
 msgid "Name:"
-msgstr ""
+msgstr "Namn:"
 
 #: ../src/virt-viewer-guest-details.xml.h:3
 msgid "GUID:"
-msgstr ""
+msgstr "GUID:"
 
 #: ../src/virt-viewer-vm-connection.xml.h:1
 msgid "Choose a virtual machine"
-msgstr ""
+msgstr "Välj en virtuell maskin"
 
 #: ../src/virt-viewer-vm-connection.xml.h:2
 msgid "Name"
-msgstr ""
+msgstr "Namn"
 
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
+msgstr "Tillgängliga virtuella maskiner"
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
 msgstr ""
diff --git a/po/ta.po b/po/ta.po
index 2019d1f..7c647e2 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Felix I <ifelix25@gmail.com>, 2012
 # I. Felix <ifelix@redhat.com>, 2010
@@ -12,18 +12,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: 2015-01-12 06:21-0500\n"
 "Last-Translator: Daniel Berrange <dan-transifex@berrange.com>\n"
-"Language-Team: Tamil (http://www.transifex.com/projects/p/virt-viewer/language/ta/)\n"
+"Language-Team: Tamil (http://www.transifex.com/projects/p/virt-viewer/"
+"language/ta/)\n"
+"Language: ta\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ta\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.7.3\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr "தொலைநிலை காட்டி"
 
@@ -77,47 +78,46 @@ msgstr "பிணைக்கும் கொடிகள்"
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
-msgstr "remote-viewer பதிப்பு %s\n"
+msgid "remote-viewer version %s"
+msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr "காட்சி பதிப்பு தகவல்"
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr "சாளர தலைப்பை அமைக்கவும்"
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr "ஸ்பைஸ் கட்டுப்படுத்தி தொடர்பை பயன்படுத்தி இணைப்பை திறக்கவும்"
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr "தொலைநிலைக் காட்சிக் கிளை"
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 "%s\n"
-"கிடைக்கும் கட்டளை வரி விருப்பங்களின் முழு பட்டியலைக் காண '%s --help' கட்டளையை இயக்கவும்\n"
+"கிடைக்கும் கட்டளை வரி விருப்பங்களின் முழு பட்டியலைக் காண '%s --help' கட்டளையை "
+"இயக்கவும்\n"
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
-msgstr ""
-"பிழை: ஸ்பைஸ் கன்ட்ரோலரைப் பயன்படுத்தும் போது கூடுதல் அளவுருக்கள் "
-"கொடுக்கப்பட்டன\n"
+msgstr "பிழை: ஸ்பைஸ் கன்ட்ரோலரைப் பயன்படுத்தும் போது கூடுதல் அளவுருக்கள் கொடுக்கப்பட்டன\n"
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr "பிழை: பல URIகளைக் கையாள முடியாது\n"
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr "இணைப்பை துவக்க முடியவில்லை"
 
@@ -130,83 +130,90 @@ msgstr "கட்டுப்படுத்தியால் காட்ச�
 msgid "Controller connection failed: %s"
 msgstr "கட்டுப்படுத்தி இணைப்பு தோல்வியுற்றது: %s"
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
-msgstr "இணைப்பு விவரங்கள்"
-
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
-msgstr "இணைப்பு முகவரி (_C)"
-
 #: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
-msgstr "எடுத்துக்காட்டுக்கு spice://foo.example.org:5900"
-
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
-msgstr "சமீபத்திய இணைப்புகள் (_R)"
-
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
-msgstr "ஒரு ஸ்பைஸ் அமர்வை உருவாக்க முடியவில்லை"
-
-#: ../src/remote-viewer.c:1221
 msgid "Setting up Spice session..."
 msgstr "ஸ்பைஸ் அமர்வை அமைக்கிறது..."
 
-#: ../src/remote-viewer.c:1243
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
+msgstr ""
+
+#: ../src/remote-viewer.c:1120
 #, c-format
-msgid "Invalid file %s"
-msgstr "செல்லுபடியாகாத கோப்பு %s"
+msgid "Invalid file %s: "
+msgstr ""
 
-#: ../src/remote-viewer.c:1250
+#: ../src/remote-viewer.c:1128
 msgid "Cannot determine the connection type from URI"
 msgstr "URI-இலிருந்து இணைப்பு வகையை வரையறுக்க முடியாது"
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
-msgstr "இந்த வகைக்கு ஒரு அமர்வை உருவாக்க முடியாது: %s"
-
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
+msgstr "இணைப்பு விவரங்கள்"
+
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
+msgstr "எடுத்துக்காட்டுக்கு spice://foo.example.org:5900"
+
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
+msgstr ""
+
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr "Glade பற்றி"
@@ -261,124 +268,120 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr "Fedora மொழிபெயர்ப்பு குழு"
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr "அமர்வை மூட வேண்டுமா?"
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr "மீண்டும் என்னிடம் கேட்க வேண்டாம்"
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr "காட்சி %d-க்கு காத்திருக்கிறது..."
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
-msgstr "விருந்தினர் %sக்கான தெரியாத வரைகலை வகை"
+msgid "Unsupported graphic type '%s'"
+msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr "ssh-உடன் இணைக்க முடியவில்லை."
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr "சேனலுடன் இணைக்க வேண்டாம், SSH மட்டும் துணைபுரிகிறது."
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr "சேனலுடன் இணைப்பு துணைபுரியவில்லை."
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr "வரைகலை சேவையகத்துடன் இணைக்கிறது"
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr "விருந்தினர் டொமைன் நிறுத்தப்பட்டது"
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr "வரைகலை சேவையகத்துடன் இணைக்கப்பட்டது"
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr "வரைகலை சேவையகம் %s-க்கு இணைக்க முடியவில்லை"
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
-"தொலை பணிமேடை சேவையகம் %s-இலில் அங்கீகரிக்க முடியவில்லை: %s\n"
-"இணைப்பை மீண்டும் முயற்சிக்கவும்?"
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr "தொலை பணிமேடை சேவையகத்துடன் அங்கீகரிக்க முடியவில்லை: %s"
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr "USB மறுதிசையிடல் பிழை: %s"
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 "பெரிதாக்கும் நிலை %d-%d க்குள் இருக்க வேண்டும்\n"
 "\n"
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr "%d ஐக் காண்பி"
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr "செல்லுபடியாகாத kiosk-quit மதிப்புரு: %s"
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr "சாளரத்தின் அளவிடும் நிலை, சதவீதத்தில்"
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
-"முழுத்திரைப் பயன்முறையில் திறக்கவும் (விருந்தினர் தெளிவுத்திறனை "
-"கிளையன்ட்டுக்குப் பொருந்துமாறு சரிசெய்யவும்)"
+"முழுத்திரைப் பயன்முறையில் திறக்கவும் (விருந்தினர் தெளிவுத்திறனை கிளையன்ட்டுக்குப் "
+"பொருந்துமாறு சரிசெய்யவும்)"
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr "குறுக்குவிசைகளை தனிப்பயனாக்கவும்"
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr "kiosk பயன்முறையை "
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr "kiosk பயன்முறையில் கொடுக்கப்பட்டுள்ள நிபந்தனையில் வெளியே"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr "<never|on-disconnect>"
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr "காட்சி வெர்போஸ் தகவல்"
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr "பிழைத்திருத்த தகவலை காட்டவும்"
 
@@ -396,11 +399,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr "அங்கீகாரம் தேவை"
@@ -421,6 +426,10 @@ msgstr "பயனர்பெயர்:"
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -454,38 +463,40 @@ msgstr "Virt Viewer"
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options"
 msgstr ""
-"கிடைக்கும் கட்டளை வரி விருப்பங்களின் முழு பட்டியலைக் காண '%s --help' "
-"கட்டளையை இயக்கவும்"
+"கிடைக்கும் கட்டளை வரி விருப்பங்களின் முழு பட்டியலைக் காண '%s --help' கட்டளையை இயக்கவும்"
 
 #: ../src/virt-viewer-main.c:86
 msgid "Virtual machine graphical console"
 msgstr "மெய்நிகர் கணினி வரைவியல் "
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
+
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
 "\n"
-"பயன்பாடு: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
-"\n"
-"%s\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
 "\n"
+msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr "மறுதிசையிட USB சாதனங்களை தேர்ந்தெடுக்கவும்"
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr "துணைபுரியாத அங்கீகார வகை %d"
@@ -494,117 +505,127 @@ msgstr "துணைபுரியாத அங்கீகார வகை %d"
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr "Ctrl+Alt+_Del"
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr "Ctrl+Alt+_Backspace"
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr "Ctrl+Alt+F_1"
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr "Ctrl+Alt+F_2"
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr "Ctrl+Alt+F_3"
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr "Ctrl+Alt+F_4"
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr "Ctrl+Alt+F_5"
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr "Ctrl+Alt+F_6"
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr "Ctrl+Alt+F_7"
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr "Ctrl+Alt+F_8"
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr "Ctrl+Alt+F_9"
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr "Ctrl+Alt+F1_0"
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr "Ctrl+Alt+F11"
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr "Ctrl+Alt+F12"
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr "திரைப்பிடிப்பு"
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr "துண்டி"
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr "USB சாதன தேர்வு"
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr "விசைச் சேர்க்கையை அனுப்பு"
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr "முழுத்திரையை விட்டுவிலகு"
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr "Ctrl+Alt"
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr "(சுட்டியை விடுவிக்க %s ஐ அழுத்தவும்)"
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr "%s%s%s - %s"
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr " "
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr "இந்த இணைப்பை அமைக்க குறைந்தது %s பதிப்பு %s தேவை"
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr "மறுதுவக்க விருந்தினர் டொமைனுக்காக காத்திருக்கிறது"
 
@@ -613,59 +634,69 @@ msgstr "மறுதுவக்க விருந்தினர் டொம�
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr "விருந்தினர் %s-க்கு வரைகலை வகையை வரையறுக்க முடியாது"
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr "விருந்தினர் %s-க்கு புரவலனை வரையறுக்க முடியாது"
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr "libvirt தொடங்கக் காத்திருக்கிறது"
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr "விருந்தினர் டொமைனை தேடுகிறது"
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr "விருந்தினர் டொமைன் உருவாக்க காத்திருக்கிறது"
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr "விருந்தினர் நிலையை சரிபார்க்கிறது"
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr "துவக்க விருந்தினர் டொமைனுக்காக காத்திருக்கிறது"
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr "[ஒன்றுமில்லாத]"
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr "கோப்பு (_F)"
@@ -678,35 +709,39 @@ msgstr "ஸ்மார்ட் கார்டு நுழைத்தல்"
 msgid "Smartcard removal"
 msgstr "ஸ்மார்ட் கார்டு நீக்கல்"
 
-#: ../src/virt-viewer.xml.h:6
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:7
 msgid "_View"
 msgstr "பார்வை (_V)"
 
-#: ../src/virt-viewer.xml.h:7
+#: ../src/virt-viewer.xml.h:8
 msgid "Full screen"
 msgstr "முழுத்திரை"
 
-#: ../src/virt-viewer.xml.h:8
+#: ../src/virt-viewer.xml.h:9
 msgid "_Zoom"
 msgstr "அளவிடு (_Z)"
 
-#: ../src/virt-viewer.xml.h:9
+#: ../src/virt-viewer.xml.h:10
 msgid "Displays"
 msgstr "காட்சிகள்"
 
-#: ../src/virt-viewer.xml.h:10
+#: ../src/virt-viewer.xml.h:11
 msgid "Release cursor"
 msgstr "கர்சரை விடு"
 
-#: ../src/virt-viewer.xml.h:11
+#: ../src/virt-viewer.xml.h:12
 msgid "_Send key"
 msgstr "விசையை அனுப்பு (_S)"
 
-#: ../src/virt-viewer.xml.h:12
+#: ../src/virt-viewer.xml.h:13
 msgid "_Help"
 msgstr "உதவி (_H)"
 
-#: ../src/virt-viewer.xml.h:13
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -733,3 +768,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/te.po b/po/te.po
index 844555b..04ea8ee 100644
--- a/po/te.po
+++ b/po/te.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Krishnababu Krothapalli <kkrothap@redhat.com>, 2010,2012
 # Krishnababu Krothapalli <kkrothap@redhat.com>, 2010,2012,2014
@@ -11,18 +11,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: 2015-01-12 06:21-0500\n"
 "Last-Translator: Daniel Berrange <dan-transifex@berrange.com>\n"
-"Language-Team: Telugu (http://www.transifex.com/projects/p/virt-viewer/language/te/)\n"
+"Language-Team: Telugu (http://www.transifex.com/projects/p/virt-viewer/"
+"language/te/)\n"
+"Language: te\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.7.3\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr "దూరస్థ దర్శని"
 
@@ -76,26 +77,26 @@ msgstr "బందనం ఫ్లాగ్స్"
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
-msgstr "రిమోట్-వ్యూయర్ వర్షన్ %s\n"
+msgid "remote-viewer version %s"
+msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr "వర్షన్ సమాచారం ప్రదర్శించు"
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr "విండోలో శీర్షిక సెట్ చెయ్యండి"
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr "స్పైస్ కంట్రోలర్ కమ్యునికేషన్ వుపయోగించి అనుసంధానం తెరువుము"
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
@@ -104,17 +105,17 @@ msgstr ""
 "%s\n"
 "అందుబాటులోని కమాండ్ లైన్ ఐచ్చికాల జాబితా కొరకు '%s --help' నడుపుము\n"
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr "దోషం: స్పైస్ నియంత్రణి వుపయోగించునప్పుడు అదనపు ఆర్గుమెంట్లు యీయబడెను\n"
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr "దోషం: బహుళ URIలను సంభాలించలేదు\n"
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr "అనుసంధానం సిద్దపరచుటకు విఫలమైంది"
 
@@ -127,83 +128,90 @@ msgstr "నియంత్రికచే ప్రదర్శన అచేత�
 msgid "Controller connection failed: %s"
 msgstr "నియంత్రిక అనుసంధానం విఫలమైంది: %s"
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
-msgstr ""
-
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
-msgstr "అనుసంధానం వివరాలు"
-
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
 #: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
-msgstr ""
-
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
-msgstr ""
-
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
-msgstr "స్పైస్ సెషన్ సృష్టించలేకపోయింది"
-
-#: ../src/remote-viewer.c:1221
 msgid "Setting up Spice session..."
 msgstr "స్పైస్ సెషన్ అమర్చుచున్నది..."
 
-#: ../src/remote-viewer.c:1243
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
+msgstr ""
+
+#: ../src/remote-viewer.c:1120
 #, c-format
-msgid "Invalid file %s"
-msgstr "చెల్లని ఫైల్ %s"
+msgid "Invalid file %s: "
+msgstr ""
 
-#: ../src/remote-viewer.c:1250
+#: ../src/remote-viewer.c:1128
 msgid "Cannot determine the connection type from URI"
 msgstr "URI నుండి అనుసంధానం రకంను నిర్థారించలేము"
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
-msgstr "ఈ రకము కొరకు సెషన్ సృష్టించలేక పోయింది: %s"
-
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
+msgstr "అనుసంధానం వివరాలు"
+
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
+msgstr ""
+
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr "గ్లేడ్ గురించి"
@@ -216,9 +224,7 @@ msgstr ""
 
 #: ../src/virt-viewer-about.xml.h:4
 msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt"
-msgstr ""
-"GTK-VNC, SPICE-GTK మరియు libvirtతో నిర్మించబడిన వొక రిమోట్ డెస్కుటాప్ "
-"క్లైంట్"
+msgstr "GTK-VNC, SPICE-GTK మరియు libvirtతో నిర్మించబడిన వొక రిమోట్ డెస్కుటాప్ క్లైంట్"
 
 #: ../src/virt-viewer-about.xml.h:5
 msgid "virt-manager.org"
@@ -258,122 +264,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr "Fedora అనువాద సమూహం"
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr "సెషన్ మూసివేయాలనుకుంటున్నారా ?"
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr "నన్ను మళ్ళీ అడగవద్దు"
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr "ప్రదర్శన %d కొరకు వేచివుంది..."
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
-msgstr "అతిథి %s కొరకు తెలియని గ్రాఫిక్ రకం"
+msgid "Unsupported graphic type '%s'"
+msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr "ssh క్షేత్రముకు అనుసంధానించు."
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr "చానల్‌కు అనుసంధానం కాలేదు, SSH కు మాత్రమే తోడ్పాటు నిస్తోంది."
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr "చానల్ అనుసంధానంకు తోడ్పాటులేదు."
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr "గ్రాఫిక్ సేవికకు అనుసంధానమౌతోంది"
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr "అతిథి డొమైన్ మూసివేసింది"
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr "గ్రాఫిక్ సేవికకు అనుసంధానమైంది"
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr "గ్రాఫిక్ సేవిక %sకు అనుసంధానం కాలేక పోయింది"
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
-"%s వద్ద రిమోట్ డెస్కుటాప్ సేవికతో ధృవీకరించలేక పోయింది: %s\n"
-"అనుసంధానముకు మరలా ప్రయత్నించాలా?"
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr "రిమోట్ డెస్కుటాప్ సేవికతో ధృవీకరించలేక పోయింది: %s"
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr "USB రీడైరెక్షన్ దోషం: %s"
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr "జూమ్ స్థాయి తప్పకుండా %d-%d మధ్యన వుండాలి\n"
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr "%d ప్రదర్శించు"
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr "చెల్లని kiosk-quit ఆర్గుమెంట్: %s"
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr "విండో యొక్క జూమ్ స్థాయి, శాతంలో"
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
-msgstr ""
-"పూర్తి తెర రీతినందు తెరువుము (క్లైంట్‌కు అమరుటకు అతిథి రిజొల్యూషన్ "
-"సర్దుబాటుచేయి)"
+msgstr "పూర్తి తెర రీతినందు తెరువుము (క్లైంట్‌కు అమరుటకు అతిథి రిజొల్యూషన్ సర్దుబాటుచేయి)"
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr "అనుకూలీకరించి హాట్కీస్"
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr "kiosk రీతిని చేతనం చేయి"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr "ఇచ్చిన నియమంపై kiosk రీతినందు నిష్క్రమించు"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr "<never|on-disconnect>"
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr "వెర్బోస్ సమాచారమును ప్రదర్శించుము"
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr "డీబగ్గింగ్ సమాచారమును ప్రదర్శించుము"
 
@@ -391,11 +391,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr "ధృవీకరణము అవసరమైంది"
@@ -416,6 +418,10 @@ msgstr "వినియోగదారినామము:"
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -454,31 +460,34 @@ msgstr "అందుబాటులోని కమాండ్ లైన్ ఐ
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
+
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
 "\n"
-"వినియోగము: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
-"\n"
-"%s\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
 "\n"
+msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr "రీడైరెక్షన్ కొరకు USB పరికరాలను యెంపికచేయి"
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr "మద్దతీయని దృవీకరణ రకము %d"
@@ -487,117 +496,127 @@ msgstr "మద్దతీయని దృవీకరణ రకము %d"
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr "Ctrl+Alt+_Del"
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr "Ctrl+Alt+_Backspace"
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr "Ctrl+Alt+F_1"
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr "Ctrl+Alt+F_2"
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr "Ctrl+Alt+F_3"
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr "Ctrl+Alt+F_4"
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr "Ctrl+Alt+F_5"
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr "Ctrl+Alt+F_6"
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr "Ctrl+Alt+F_7"
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr "Ctrl+Alt+F_8"
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr "Ctrl+Alt+F_9"
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr "Ctrl+Alt+F1_0"
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr "Ctrl+Alt+F11"
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr "Ctrl+Alt+F12"
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr "స్క్రీన్‌షాట్"
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr "అననుసంధానించు"
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr "USB పరికర యెంపిక"
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr "కీ జోడీను పంపు"
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr "నిండుతెర విడు"
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr "Ctrl+Alt"
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr "(సూచీను విడుదల చేయుటకు %s వత్తండి)"
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr "%s%s%s - %s"
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr " "
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr "కనీసం% s వెర్షన్% s వద్ద ఈ కనెక్షన్ని సెటప్ చెయ్యడానికి అవసరం"
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr "అతిథి డొమైన్ పునఃప్రారంభం కొరకు వేచివుంది"
 
@@ -606,59 +625,69 @@ msgstr "అతిథి డొమైన్ పునఃప్రారంభం
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr "అతిథి %s కొరకు గ్రాఫిక్ రకంను నిర్థారించలేక పోయింది"
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr "అతిథి %s కొరకు అతిథేయను నిర్ధారించలేదు"
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr "libvirt ప్రారంభించడానికి కోసం వేచి ఉన్నారు"
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr "అతిథి డొమైన్‌ కనుగొనుచున్నది"
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr "అతిథి డొమైన్ సృష్టించబడుటకు వేచివుంది"
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr "అతిథి డొమైన్‌ స్థితి పరిశీలిస్తోంది"
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr "అతిథి డొమైన్ ప్రారంభమగుటకు వేచివుంది"
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr "[ఏదీకాదు]"
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr "ఫైలు (_F)"
@@ -671,35 +700,39 @@ msgstr "స్మార్టుకార్డ్ చొప్పింత"
 msgid "Smartcard removal"
 msgstr "స్మార్టుకార్డ్ తీసివేత"
 
-#: ../src/virt-viewer.xml.h:6
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:7
 msgid "_View"
 msgstr "దర్శించు (_V)"
 
-#: ../src/virt-viewer.xml.h:7
+#: ../src/virt-viewer.xml.h:8
 msgid "Full screen"
 msgstr "నిండు తెర"
 
-#: ../src/virt-viewer.xml.h:8
+#: ../src/virt-viewer.xml.h:9
 msgid "_Zoom"
 msgstr "జూమ్ (_Z)"
 
-#: ../src/virt-viewer.xml.h:9
+#: ../src/virt-viewer.xml.h:10
 msgid "Displays"
 msgstr "ప్రదర్శనలు"
 
-#: ../src/virt-viewer.xml.h:10
+#: ../src/virt-viewer.xml.h:11
 msgid "Release cursor"
 msgstr "సూచీ విడుదలచేయి"
 
-#: ../src/virt-viewer.xml.h:11
+#: ../src/virt-viewer.xml.h:12
 msgid "_Send key"
 msgstr "పంపు కీ(_S)"
 
-#: ../src/virt-viewer.xml.h:12
+#: ../src/virt-viewer.xml.h:13
 msgid "_Help"
 msgstr "సహాయము(_H)"
 
-#: ../src/virt-viewer.xml.h:13
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -726,3 +759,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/tg.po b/po/tg.po
index 344b6e4..0be08b4 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Tajik\n"
+"Language: tg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: tg\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/th.po b/po/th.po
index 166af5b..7b9f23c 100644
--- a/po/th.po
+++ b/po/th.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Thai\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: th\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/tr.po b/po/tr.po
index e4a6d6b..ebf67d7 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Necdet Yücel <necdetyucel@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: 2015-01-12 06:21-0500\n"
 "Last-Translator: Daniel Berrange <dan-transifex@berrange.com>\n"
-"Language-Team: Turkish (http://www.transifex.com/projects/p/virt-viewer/language/tr/)\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/virt-viewer/"
+"language/tr/)\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.7.3\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -73,43 +74,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr "Sürüm bilgisini göster"
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -122,83 +123,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr "Glade Hakkında"
@@ -238,118 +246,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr "Fedora Çeviri Ekibi"
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr "Ssh bağlantısı başarısız oldu."
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr "Grafik sunucuya bağlanıyor"
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr "Grafik sunucuya bağlandı"
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr "USB yönlendirme hatası: %s"
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr "Hata ayıklama bilgisini görüntüle"
 
@@ -367,11 +373,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr "Kimlik Doğrulama gerekli"
@@ -392,6 +400,10 @@ msgstr "Kullanıcı Adı:"
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -430,31 +442,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
+
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
 "\n"
-"Kullanım: %s [SEÇENEKLER] ALAN-ADI|ID|UUID\n"
-"\n"
-"%s\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
 "\n"
+msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -463,117 +478,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr "Ctrl+Alt+_Del"
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr "Ctrl+Alt+_Backspace"
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr "Ctrl+Alt+F_1"
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr "Ctrl+Alt+F_2"
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr "Ctrl+Alt+F_3"
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr "Ctrl+Alt+F_4"
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr "Ctrl+Alt+F_5"
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr "Ctrl+Alt+F_6"
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr "Ctrl+Alt+F_7"
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr "Ctrl+Alt+F_8"
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr "Ctrl+Alt+F_9"
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr "Ctrl+Alt+F1_0"
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr "Ctrl+Alt+F11"
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr "Ctrl+Alt+F12"
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr "Ekran Görüntüsü"
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr "Bağlantıyı Kes"
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr "USB aygıt seçimi"
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr "Tam ekrandan ayrıl"
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr "%s%s%s - %s"
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr " "
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -582,59 +607,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr "_Dosya"
@@ -647,35 +682,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
+msgid "_View"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:8
 msgid "Full screen"
 msgstr "Tam Ekran"
 
-#: ../src/virt-viewer.xml.h:8
+#: ../src/virt-viewer.xml.h:9
 msgid "_Zoom"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:9
+#: ../src/virt-viewer.xml.h:10
 msgid "Displays"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:10
+#: ../src/virt-viewer.xml.h:11
 msgid "Release cursor"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:11
+#: ../src/virt-viewer.xml.h:12
 msgid "_Send key"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:12
+#: ../src/virt-viewer.xml.h:13
 msgid "_Help"
 msgstr "_Yardım"
 
-#: ../src/virt-viewer.xml.h:13
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -702,3 +741,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/tw.po b/po/tw.po
index 89763ed..5718cbe 100644
--- a/po/tw.po
+++ b/po/tw.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Twi\n"
+"Language: tw\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: tw\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 2da600a..e03003a 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,25 +1,28 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Yuri Chornoivan <yurchor@ukr.net>, 2011-2014
+# Yuri Chornoivan <yurchor@ukr.net>, 2015. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
-"PO-Revision-Date: 2015-01-12 06:21-0500\n"
-"Last-Translator: Daniel Berrange <dan-transifex@berrange.com>\n"
-"Language-Team: Ukrainian (http://www.transifex.com/projects/p/virt-viewer/language/uk/)\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
+"PO-Revision-Date: 2015-03-13 06:20-0400\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/virt-viewer/"
+"language/uk/)\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Zanata 3.5.1\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Zanata 3.7.3\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr "Віддалений переглядач"
 
@@ -73,46 +76,47 @@ msgstr "Прапорці прив’язування"
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
-msgstr "remote-viewer версії %s\n"
+msgid "remote-viewer version %s"
+msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr "Показати інформацію щодо версії"
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr "Встановити вказаний заголовок вікна"
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr "Встановити з’єднання за допомогою обміну даними з контролером Spice"
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
-msgstr ""
+msgstr "Клієнтська програма для перегляду віддалених систем"
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 "%s\n"
-"Щоб переглянути повний список можливих параметрів командного рядка, віддайте команду «%s --help»\n"
+"Щоб переглянути повний список можливих параметрів командного рядка, віддайте "
+"команду «%s --help»\n"
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 "Помилка: під час використання контролера Spice передано зайві параметри\n"
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr "Помилка: обробка декількох адрес одночасно неможлива\n"
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr "Не вдалося започаткувати з’єднання"
 
@@ -125,83 +129,90 @@ msgstr "Екран вимкнено контролером"
 msgid "Controller connection failed: %s"
 msgstr "Помилка з’єднання з контролером: %s"
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
-msgstr ""
+msgstr "За_мінити CD"
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
+msgstr "не вдалося обробити адресу ovirt"
+
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
-msgstr ""
+msgstr "ВМ oVirt %s не запущено"
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
-msgstr ""
+msgstr "ВМ oVirt %s не має дисплея"
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
-msgstr ""
-
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
-msgstr "Параметри з’єднання"
-
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
-msgstr ""
+msgid "oVirt VM %s has unknown display type: %d"
+msgstr "Дисплей ВМ oVirt %s належить до невідомого типу: %d"
 
 #: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
-msgstr ""
-
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
-msgstr ""
-
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
-msgstr "Не вдалося створити сеанс Spice"
-
-#: ../src/remote-viewer.c:1221
 msgid "Setting up Spice session..."
 msgstr "Налаштування сеансу Spice…"
 
-#: ../src/remote-viewer.c:1243
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
+msgstr ""
+
+#: ../src/remote-viewer.c:1120
 #, c-format
-msgid "Invalid file %s"
-msgstr "Некоректний файл %s"
+msgid "Invalid file %s: "
+msgstr ""
 
-#: ../src/remote-viewer.c:1250
+#: ../src/remote-viewer.c:1128
 msgid "Cannot determine the connection type from URI"
 msgstr "Не вдалося визначити тип з’єднання за адресою"
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
-msgstr "Не вдалося створити сеанс цього типу: %s"
-
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
+msgstr "Параметри з’єднання"
+
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
+msgstr "Приклад: spice://foo.example.org:5900"
+
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
+msgstr ""
+
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr "Про Glade"
@@ -211,12 +222,14 @@ msgid ""
 "Copyright (C) 2007-2012 Daniel P. Berrange\n"
 "Copyright (C) 2007-2014 Red Hat, Inc."
 msgstr ""
+"© Daniel P. Berrange, 2007–2012\n"
+"© Red Hat, Inc., 2007–2014"
 
 #: ../src/virt-viewer-about.xml.h:4
 msgid "A remote desktop client built with GTK-VNC, SPICE-GTK and libvirt"
 msgstr ""
-"Клієнтську частину віддаленого керування стільницею побудовано на основі "
-"GTK-VNC, SPICE-GTK та libvirt"
+"Клієнтську частину віддаленого керування стільницею побудовано на основі GTK-"
+"VNC, SPICE-GTK та libvirt"
 
 #: ../src/virt-viewer-about.xml.h:5
 msgid "virt-manager.org"
@@ -238,133 +251,135 @@ msgid ""
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
 msgstr ""
-"Ця програма є вільним програмним забезпеченням; ви можете поширювати її і/або змінювати її за умов дотримання GNU General Public License у тому вигляді, у якому її оприлюднено Free Software Foundation; версії 2 цієї ліцензії, або (за потреби) будь-якої пізнішої версії\n"
+"Ця програма є вільним програмним забезпеченням; ви можете поширювати її і/"
+"або змінювати її за умов дотримання GNU General Public License у тому "
+"вигляді, у якому її оприлюднено Free Software Foundation; версії 2 цієї "
+"ліцензії, або (за потреби) будь-якої пізнішої версії\n"
 "\n"
-"Ця програма поширюється у сподіванні, що вона буде корисною, але БЕЗ БУДЬ-ЯКИХ ГАРАНТІЙ; навіть без очевидної гарантії КОМЕРЦІЙНОЇ ЦІННОСТІ або ПРИДАТНОСТІ ДЛЯ ЯКОЇСЬ МЕТИ  Докладніше про це ви можете дізнатися з \n"
+"Ця програма поширюється у сподіванні, що вона буде корисною, але БЕЗ БУДЬ-"
+"ЯКИХ ГАРАНТІЙ; навіть без очевидної гарантії КОМЕРЦІЙНОЇ ЦІННОСТІ або "
+"ПРИДАТНОСТІ ДЛЯ ЯКОЇСЬ МЕТИ  Докладніше про це ви можете дізнатися з \n"
 "GNU General Public License\n"
-"Разом з цією програмою ви маєте отримати копію GNU General Public License Якщо ви її не отримали, повідомте про це на адресу Free Software\n"
+"Разом з цією програмою ви маєте отримати копію GNU General Public License "
+"Якщо ви її не отримали, повідомте про це на адресу Free Software\n"
 "Foundation, Inc, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
 #: ../src/virt-viewer-about.xml.h:20
 msgid "The Fedora Translation Team"
 msgstr "Команда локалізації Fedora"
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr "Бажаєте завершити сеанс?"
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr "Більше не питати про це"
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr "Очікування на показ %d…"
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
-msgstr "Невідомий тип графічної підсистеми для гостьової системи %s"
+msgid "Unsupported graphic type '%s'"
+msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr "Спроба встановлення з’єднання ssh зазнала невдачі."
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr "Не вдалося встановити з’єднання з каналом, підтримується лише SSH."
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr "Встановлення з’єднання з каналом не підтримується."
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
-msgstr ""
+msgstr "Дисплей можна з’єднати лише за допомогою libvirt з параметром --attach"
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr "Встановлення з’єднання з графічним сервером"
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr "Гостьовий домен завершив роботу"
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr "Встановлено з’єднання з графічним сервером"
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr "Не вдалося встановити з’єднання з графічним сервером %s"
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
-"Не вдалося пройти розпізнавання на сервері віддаленої стільниці %s: %s\n"
-"Повторити спробу встановлення з’єднання?"
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr "Не вдалося пройти розпізнавання на сервері віддаленої стільниці: %s"
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr "Помилка переспрямування USB: %s"
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr "Масштаб слід вказувати у діапазоні від %d до %d\n"
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr "Дисплей %d"
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr "Некоректний параметр kiosk-quit: %s"
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr "Масштаб вікна, у відсотках"
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 "Відкрити у повноекранному режимі (узгоджує роздільність гостьової системи з "
 "роздільністю клієнта)"
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr "Налаштувати клавіатурні скорочення"
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr "Увімкнути режим кіоску"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr "Вийти за вказаної умови у режимі кіоску"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr "<never|on-disconnect>"
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr "Показати докладну інформацію"
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr "Показати діагностичну інформацію"
 
@@ -376,17 +391,23 @@ msgid ""
 "<b>%s</b>\n"
 "\n"
 msgstr ""
+"Для встановлення з’єднання %s слід пройти розпізнавання:\n"
+"\n"
+"<b>%s</b>\n"
+"\n"
 
 #: ../src/virt-viewer-auth.c:92
 #, c-format
 msgid "Authentication is required for the %s connection:\n"
-msgstr ""
+msgstr "Для встановлення з’єднання з %s слід пройти розпізнавання:\n"
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr "Потрібно пройти розпізнавання"
@@ -405,6 +426,10 @@ msgstr "Користувач:"
 
 #: ../src/virt-viewer-auth.xml.h:5
 msgid "Show password"
+msgstr "Показувати пароль"
+
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
 msgstr ""
 
 #: ../src/virt-viewer-main.c:38
@@ -445,214 +470,236 @@ msgstr ""
 
 #: ../src/virt-viewer-main.c:86
 msgid "Virtual machine graphical console"
-msgstr ""
+msgstr "Графічна консоль віртуальної машини"
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
+
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
 "\n"
-"Формат: %s [ПАРАМЕТРИ] НАЗВА_ДОМЕНУ|ID|UUID\n"
-"\n"
-"%s\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
 "\n"
+msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
-msgstr ""
+msgstr "Некоректний пароль"
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr "Виберіть пристрої USB для переспрямування"
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr "Непідтримуваний тип розпізнавання %d"
 
 #: ../src/virt-viewer-vm-connection.c:64
 msgid "No virtual machine found"
+msgstr "Не знайдено віртуальних машин"
+
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr "Ctrl+Alt+_Del"
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr "Ctrl+Alt+_Backspace"
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr "Ctrl+Alt+F_1"
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr "Ctrl+Alt+F_2"
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr "Ctrl+Alt+F_3"
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr "Ctrl+Alt+F_4"
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr "Ctrl+Alt+F_5"
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr "Ctrl+Alt+F_6"
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr "Ctrl+Alt+F_7"
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr "Ctrl+Alt+F_8"
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr "Ctrl+Alt+F_9"
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr "Ctrl+Alt+F1_0"
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr "Ctrl+Alt+F11"
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr "Ctrl+Alt+F12"
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr "Знімок вікна"
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
-msgstr ""
+msgstr "Невідомо"
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr "Від’єднатися"
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr "Вибір пристрою USB"
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr "Надіслати комбінацію ключів"
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr "Вийти з повноекранного режиму"
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr "Ctrl+Alt"
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr "(Натисніть %s, щоб вивільнити вказівник)"
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr "%s%s%s — %s"
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr " "
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr "Для налаштовування цього з’єднання потрібна принаймні версія %s %s"
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr "Очікування на перезапуск гостьового домену"
 
 #: ../src/virt-viewer.c:409
 #, c-format
 msgid "Cannot determine the graphic type for the guest %s"
-msgstr ""
-"Не вдалося визначити тип графічної підсистеми для гостьової системи %s"
+msgstr "Не вдалося визначити тип графічної підсистеми для гостьової системи %s"
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr "Не вдалося визначити вузол для гостьової системи %s"
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
-msgstr ""
+msgstr "Гостьова система «%s» недоступна"
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
-msgstr ""
+msgstr "Віртуальну машину %s не запущено"
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr "Очікуємо на запуск libvirt"
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr "Пошук гостьового домену"
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr "Очікування на створення гостьового домену"
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr "Перевірка стану гостьового домену"
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr "Очікування на запуск гостьового домену"
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
-msgstr ""
+msgstr "Не вдалося з’єднатися з libvirt з адресою %s."
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr "[немає]"
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
+msgstr "Спроба пройти розпізнавання зазнала невдачі."
+
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr "_Файл"
@@ -665,58 +712,78 @@ msgstr "Вставлення картки пам’яті"
 msgid "Smartcard removal"
 msgstr "Вилучення картки пам’яті"
 
-#: ../src/virt-viewer.xml.h:6
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:7
 msgid "_View"
 msgstr "П_ерегляд"
 
-#: ../src/virt-viewer.xml.h:7
+#: ../src/virt-viewer.xml.h:8
 msgid "Full screen"
 msgstr "Повноекранний"
 
-#: ../src/virt-viewer.xml.h:8
+#: ../src/virt-viewer.xml.h:9
 msgid "_Zoom"
 msgstr "_Масштаб"
 
-#: ../src/virt-viewer.xml.h:9
+#: ../src/virt-viewer.xml.h:10
 msgid "Displays"
 msgstr "Екрани"
 
-#: ../src/virt-viewer.xml.h:10
+#: ../src/virt-viewer.xml.h:11
 msgid "Release cursor"
 msgstr "Вивільнити вказівник"
 
-#: ../src/virt-viewer.xml.h:11
+#: ../src/virt-viewer.xml.h:12
 msgid "_Send key"
 msgstr "_Надіслати клавішу"
 
-#: ../src/virt-viewer.xml.h:12
+#: ../src/virt-viewer.xml.h:13
 msgid "_Help"
 msgstr "_Довідка"
 
-#: ../src/virt-viewer.xml.h:13
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
-msgstr ""
+msgstr "Параметри _гостьової системи"
 
 #: ../src/virt-viewer-guest-details.xml.h:1
 msgid "Guest Details"
-msgstr ""
+msgstr "Параметри гостьової системи"
 
 #: ../src/virt-viewer-guest-details.xml.h:2
 msgid "Name:"
-msgstr ""
+msgstr "Назва:"
 
 #: ../src/virt-viewer-guest-details.xml.h:3
 msgid "GUID:"
-msgstr ""
+msgstr "GUID:"
 
 #: ../src/virt-viewer-vm-connection.xml.h:1
 msgid "Choose a virtual machine"
-msgstr ""
+msgstr "Виберіть віртуальну машину"
 
 #: ../src/virt-viewer-vm-connection.xml.h:2
 msgid "Name"
-msgstr ""
+msgstr "Назва"
 
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
+msgstr "Доступні віртуальні машини"
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
 msgstr ""
diff --git a/po/ur.po b/po/ur.po
index 1c5a432..1645aaf 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Urdu\n"
+"Language: ur\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 630bfa8..9b7d61b 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Vietnamese\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/wba.po b/po/wba.po
index bd0f82f..2bc1bc8 100644
--- a/po/wba.po
+++ b/po/wba.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: wba\n"
+"Language: wba\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: wba\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/yo.po b/po/yo.po
index 43c8b80..e602739 100644
--- a/po/yo.po
+++ b/po/yo.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Yoruba\n"
+"Language: yo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: yo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1997915..cb7e99d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Aron Xu <aronxu@gnome.org>, 2010
 # Christopher Meng <cickumqt@gmail.com>, 2013
@@ -12,18 +12,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: 2015-01-12 06:21-0500\n"
 "Last-Translator: Daniel Berrange <dan-transifex@berrange.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/virt-viewer/language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/virt-"
+"viewer/language/zh_CN/)\n"
+"Language: zh-CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh-CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.7.3\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr "远程查看程序"
 
@@ -77,26 +78,26 @@ msgstr "捆绑标记"
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
-msgstr "remote-viewer 版本 %s\n"
+msgid "remote-viewer version %s"
+msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr "显示版本信息"
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr "设置窗口标题"
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr "使用 Spice 控制器沟通打开连接"
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
@@ -105,17 +106,17 @@ msgstr ""
 "%s\n"
 "运行 '%s --help' 来查看可用命令行选项的完整列表\n"
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr "错误：使用 Spice 控制器时给出额外参数\n"
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr "错误：无法控制多个 URI\n"
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr "初始化连接失败"
 
@@ -128,83 +129,90 @@ msgstr "显示控制器禁用的"
 msgid "Controller connection failed: %s"
 msgstr "控制器连接失败：%s"
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
-msgstr ""
-
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
-msgstr "连接详情"
-
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
 #: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
-msgstr ""
-
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
-msgstr ""
-
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
-msgstr "无法生成 Spice 会话"
-
-#: ../src/remote-viewer.c:1221
 msgid "Setting up Spice session..."
 msgstr "设置 Spice 会话......"
 
-#: ../src/remote-viewer.c:1243
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
+msgstr ""
+
+#: ../src/remote-viewer.c:1120
 #, c-format
-msgid "Invalid file %s"
-msgstr "无效文件 %s"
+msgid "Invalid file %s: "
+msgstr ""
 
-#: ../src/remote-viewer.c:1250
+#: ../src/remote-viewer.c:1128
 msgid "Cannot determine the connection type from URI"
 msgstr "无法确定 URI 的连接类型"
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
-msgstr "无法为此类型生成会话：%s"
-
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
+msgstr "连接详情"
+
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
+msgstr ""
+
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr "关于 Glade"
@@ -239,7 +247,8 @@ msgid ""
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
 msgstr ""
-"本程序是免费软件，您可以根据自由软件基金发布的 GNU 通用公共许可证版本 2 或(您认为合适的)之后的版本重新发布和（/或）修改这个软件。\n"
+"本程序是免费软件，您可以根据自由软件基金发布的 GNU 通用公共许可证版本 2 或(您"
+"认为合适的)之后的版本重新发布和（/或）修改这个软件。\n"
 "\n"
 "发布本程序是希望它\n"
 "对您有帮助，但不做任何保证，\n"
@@ -254,120 +263,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr "Fedora 翻译团队"
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr "您要关闭这个会话吗？"
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr "不要再问我"
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr "等待画面 %d......"
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
-msgstr "虚拟机 %s 的未知图形类型"
+msgid "Unsupported graphic type '%s'"
+msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr "连接到 ssh 失败"
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr "无法连接到通道，只支持 SSH。"
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr "无法连接到不支持的通道。"
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr "正在连接到图形服务器"
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr "已关闭虚拟机域"
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr "已连接到图形服务器"
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr "无法连接到图形服务器 %s"
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
-"无法使用 %s 中的远程桌面服务器验证：%s\n"
-"重新尝试连接？"
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr "无法使用远程桌面服务器验证：%s"
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr "USB 重新定向错误：%s"
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr "显示 %d"
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr "无效的 kiosk-quit 参数：%s"
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr "窗口缩放级别，以百分比计"
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr "自定义快捷键"
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr "启用 kiosk 模式"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr "<never|on-disconnect>"
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr "显示详细信息"
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr "显示调试信息"
 
@@ -385,11 +390,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr "所需验证"
@@ -410,6 +417,10 @@ msgstr "用户名："
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -448,31 +459,34 @@ msgstr "运行 '%s --help' 来查看可用命令行选项的完整列表"
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
+
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
 "\n"
-"用法：%s [选项] 域名|ID|UUID\n"
-"\n"
-"%s\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
 "\n"
+msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr "为重新定向选择 USB 设备"
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr "不支持的验证类型 %d"
@@ -481,117 +495,127 @@ msgstr "不支持的验证类型 %d"
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr "Ctrl+Alt+_Del"
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr "Ctrl+Alt+_Backspace"
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr "Ctrl+Alt+F_1"
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr "Ctrl+Alt+F_2"
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr "Ctrl+Alt+F_3"
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr "Ctrl+Alt+F_4"
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr "Ctrl+Alt+F_5"
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr "Ctrl+Alt+F_6"
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr "Ctrl+Alt+F_7"
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr "Ctrl+Alt+F_8"
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr "Ctrl+Alt+F_9"
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr "Ctrl+Alt+F1_0"
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr "Ctrl+Alt+F11"
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr "Ctrl+Alt+F12"
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr "截屏"
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr "断开连接"
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr "USB 设备选择"
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr "发送按键组合"
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr "离开全屏"
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr "Ctrl+Alt"
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr "(按 %s 释放光标)"
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr "%s%s%s - %s"
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr " "
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr "等待虚拟机域重启"
 
@@ -600,59 +624,69 @@ msgstr "等待虚拟机域重启"
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr "无法确定虚拟机 %s 的图形类型"
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr "无法确定虚拟机 %s 的主机"
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr "等待 libvirt 启动"
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr "正在查找虚拟机域"
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr "正在等待生成虚拟机域"
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr "正在检查虚拟机域状态"
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr "正在等待虚拟机域启动"
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr "[无]"
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr "文件（_F）"
@@ -665,35 +699,39 @@ msgstr "插入智能卡"
 msgid "Smartcard removal"
 msgstr "删除智能卡"
 
-#: ../src/virt-viewer.xml.h:6
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:7
 msgid "_View"
 msgstr "查看（_V）"
 
-#: ../src/virt-viewer.xml.h:7
+#: ../src/virt-viewer.xml.h:8
 msgid "Full screen"
 msgstr "全屏"
 
-#: ../src/virt-viewer.xml.h:8
+#: ../src/virt-viewer.xml.h:9
 msgid "_Zoom"
 msgstr "缩放（_Z）"
 
-#: ../src/virt-viewer.xml.h:9
+#: ../src/virt-viewer.xml.h:10
 msgid "Displays"
 msgstr "画面"
 
-#: ../src/virt-viewer.xml.h:10
+#: ../src/virt-viewer.xml.h:11
 msgid "Release cursor"
 msgstr "释放光标"
 
-#: ../src/virt-viewer.xml.h:11
+#: ../src/virt-viewer.xml.h:12
 msgid "_Send key"
 msgstr "发送按键（_S）"
 
-#: ../src/virt-viewer.xml.h:12
+#: ../src/virt-viewer.xml.h:13
 msgid "_Help"
 msgstr "帮助（_H）"
 
-#: ../src/virt-viewer.xml.h:13
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -720,3 +758,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/zh_HK.po b/po/zh_HK.po
index d8cbdec..03edd8d 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Chinese (Hong Kong SAR China)\n"
+"Language: zh-HK\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh-HK\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index cd3f1da..bb90035 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Cheng-Chia Tseng <pswo10680@gmail.com>, 2013
 # Chester Cheng <ccheng@redhat.com>, 2013
@@ -12,18 +12,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: 2015-01-12 06:21-0500\n"
 "Last-Translator: Daniel Berrange <dan-transifex@berrange.com>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/virt-viewer/language/zh_TW/)\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/virt-"
+"viewer/language/zh_TW/)\n"
+"Language: zh-TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh-TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Zanata 3.5.1\n"
+"X-Generator: Zanata 3.7.3\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr "遠端檢視器"
 
@@ -77,26 +78,26 @@ msgstr "綁定旗標"
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
-msgstr "remote-viewer 版本 %s\n"
+msgid "remote-viewer version %s"
+msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr "顯示版本資訊"
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr "設定視窗標題"
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr "透過 Spice 控制器通訊來開啟連線"
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr "遠端檢視器客戶端"
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
@@ -105,17 +106,17 @@ msgstr ""
 "%s\n"
 "請執行「%s --help」以檢視可用指令選項的完整清單\n"
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr "錯誤：額使用 Spice 控制器時給定額外引數\n"
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr "錯誤：無法處理 URI\n"
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr "初始化連線失敗"
 
@@ -128,83 +129,90 @@ msgstr "畫面已被控制器停用"
 msgid "Controller connection failed: %s"
 msgstr "控制器連線失敗：%s"
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
-msgstr "連線細節"
-
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
-msgstr "連線位址(_C)"
-
 #: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
-msgstr "例，spice://foo.example.org:5900"
-
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
-msgstr "最近連線(_R)"
-
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
-msgstr "無法建立 Spice 作業階段"
-
-#: ../src/remote-viewer.c:1221
 msgid "Setting up Spice session..."
 msgstr "正在設置 Spice 作業階段..."
 
-#: ../src/remote-viewer.c:1243
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
+msgstr ""
+
+#: ../src/remote-viewer.c:1120
 #, c-format
-msgid "Invalid file %s"
-msgstr "無效的檔案 %s"
+msgid "Invalid file %s: "
+msgstr ""
 
-#: ../src/remote-viewer.c:1250
+#: ../src/remote-viewer.c:1128
 msgid "Cannot determine the connection type from URI"
 msgstr "無法從 URI 判斷連線類型"
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
-msgstr "無法為此類型建立作業階段：%s"
-
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
+msgstr "連線細節"
+
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
+msgstr "例，spice://foo.example.org:5900"
+
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
+msgstr ""
+
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr "關於 Glade"
@@ -253,126 +261,123 @@ msgstr ""
 "\n"
 "當您取得此程式時，您應同時取得了\n"
 "一份 GNU 通用公共許可證。若沒有的話，請聯絡自由軟體\n"
-"基金會（Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n"
+"基金會（Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, "
+"MA 02111-1307 USA\n"
 
 #: ../src/virt-viewer-about.xml.h:20
 msgid "The Fedora Translation Team"
 msgstr "Fedora 翻譯團隊"
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr "您是否希望關閉本作業階段？"
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr "不再詢問我"
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr "正在等候顯示器 %d..."
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
-msgstr "客端 %s 的圖形類型不明"
+msgid "Unsupported graphic type '%s'"
+msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr "連至 ssh 的連線失敗。"
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr "無法連至頻道，僅支援 SSH。"
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr "不支援頻道的連接。"
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr "正在連接圖形化伺服器"
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr "客端網域已關閉"
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr "已連上圖形化伺服器"
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr "無法連接圖形化伺服器 %s"
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
-"無法在位於 %s 的遠端桌面伺服器上驗證：%s\n"
-"重新嘗試連線？"
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr "無法在遠端桌面伺服器驗證：%s"
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr "USB 重新導引錯誤：%s"
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr "遠近等級必須介於 %d-%d\n"
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr "顯示 %d"
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr "無效的 kiosk-quit 引數：%s"
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr "視窗放大等級，單位為百分比"
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr "以全螢幕模式開啟 (調整客端解析度以適應客戶端)"
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr "自訂快速鍵"
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr "啟用 kiosk 模式"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr "於 kiosk 模式中的指定情況下離開"
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr "<never|on-disconnect>"
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr "顯示詳細資訊"
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr "顯示除錯資訊"
 
@@ -390,11 +395,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr "須要通過驗證"
@@ -415,6 +422,10 @@ msgstr "使用者名稱："
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -453,31 +464,34 @@ msgstr "請執行「%s --help」以檢視可用指令選項的完整清單"
 msgid "Virtual machine graphical console"
 msgstr "虛擬機圖形化主控臺"
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
+
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
 "\n"
-"用法：%s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
-"\n"
-"%s\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
 "\n"
+msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr "選擇欲重新導引的 USB 裝置"
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr "不支援的認證類型 %d"
@@ -486,117 +500,127 @@ msgstr "不支援的認證類型 %d"
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr "Ctrl+Alt+_Del"
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr "Ctrl+Alt+_Backspace"
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr "Ctrl+Alt+F_1"
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr "Ctrl+Alt+F_2"
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr "Ctrl+Alt+F_3"
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr "Ctrl+Alt+F_4"
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr "Ctrl+Alt+F_5"
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr "Ctrl+Alt+F_6"
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr "Ctrl+Alt+F_7"
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr "Ctrl+Alt+F_8"
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr "Ctrl+Alt+F_9"
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr "Ctrl+Alt+F1_0"
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr "Ctrl+Alt+F11"
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr "Ctrl+Alt+F12"
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr "螢幕快照"
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr "中斷連接"
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr "USB 裝置選取"
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr "傳送按鍵組合"
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr "離開全螢幕"
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr "Ctrl+Alt"
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr "(按下 %s 以釋放游標)"
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr "%s%s%s - %s"
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr " "
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr "至少需要 %s 版本 %s 以上才能設置此連線"
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr "正在等候客端網域重新啓用"
 
@@ -605,59 +629,69 @@ msgstr "正在等候客端網域重新啓用"
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr "無法判斷客端 %s 的圖形化類型為何"
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr "無法判斷客端 %s 的主機為何"
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr "等候 libvirt 啟動"
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr "正在尋找客端網域"
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr "正在等候客端網域被建立"
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr "正在檢查客端網域狀態"
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr "正在等候客端網域啟動"
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr "[無]"
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr "檔案(_F)"
@@ -670,35 +704,39 @@ msgstr "智慧卡插入"
 msgid "Smartcard removal"
 msgstr "智慧卡移除"
 
-#: ../src/virt-viewer.xml.h:6
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:7
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: ../src/virt-viewer.xml.h:7
+#: ../src/virt-viewer.xml.h:8
 msgid "Full screen"
 msgstr "全螢幕"
 
-#: ../src/virt-viewer.xml.h:8
+#: ../src/virt-viewer.xml.h:9
 msgid "_Zoom"
 msgstr "遠近(_Z)"
 
-#: ../src/virt-viewer.xml.h:9
+#: ../src/virt-viewer.xml.h:10
 msgid "Displays"
 msgstr "顯示"
 
-#: ../src/virt-viewer.xml.h:10
+#: ../src/virt-viewer.xml.h:11
 msgid "Release cursor"
 msgstr "釋放游標"
 
-#: ../src/virt-viewer.xml.h:11
+#: ../src/virt-viewer.xml.h:12
 msgid "_Send key"
 msgstr "傳送按鍵(_S)"
 
-#: ../src/virt-viewer.xml.h:12
+#: ../src/virt-viewer.xml.h:13
 msgid "_Help"
 msgstr "求助(_H)"
 
-#: ../src/virt-viewer.xml.h:13
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -725,3 +763,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""
diff --git a/po/zu.po b/po/zu.po
index 51c534a..66ff574 100644
--- a/po/zu.po
+++ b/po/zu.po
@@ -2,23 +2,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 11:36+0000\n"
+"POT-Creation-Date: 2015-12-07 14:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Zulu\n"
+"Language: zu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zu\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:112
+#: ../data/remote-viewer.desktop.in.h:1 ../src/remote-viewer-main.c:116
 msgid "Remote Viewer"
 msgstr ""
 
@@ -72,43 +72,43 @@ msgstr ""
 
 #: ../src/remote-viewer-main.c:50
 #, c-format
-msgid "remote-viewer version %s\n"
+msgid "remote-viewer version %s"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:99 ../src/virt-viewer-main.c:60
+#: ../src/remote-viewer-main.c:103 ../src/virt-viewer-main.c:60
 msgid "Display version information"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:101
+#: ../src/remote-viewer-main.c:105
 msgid "Set window title"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:104
+#: ../src/remote-viewer-main.c:108
 msgid "Open connection using Spice controller communication"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:116
+#: ../src/remote-viewer-main.c:120
 msgid "Remote viewer client"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:134
+#: ../src/remote-viewer-main.c:138
 #, c-format
 msgid ""
 "%s\n"
 "Run '%s --help' to see a full list of available command line options\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:146
+#: ../src/remote-viewer-main.c:149
 #, c-format
 msgid "Error: extra arguments given while using Spice controller\n"
 msgstr ""
 
-#: ../src/remote-viewer-main.c:153
+#: ../src/remote-viewer-main.c:156
 #, c-format
 msgid "Error: can't handle multiple URIs\n"
 msgstr ""
 
-#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1286
+#: ../src/remote-viewer.c:298 ../src/remote-viewer.c:1159
 msgid "Failed to initiate connection"
 msgstr ""
 
@@ -121,83 +121,90 @@ msgstr ""
 msgid "Controller connection failed: %s"
 msgstr ""
 
-#: ../src/remote-viewer.c:751
+#: ../src/remote-viewer.c:755
 msgid "_Change CD"
 msgstr ""
 
-#: ../src/remote-viewer.c:845
+#: ../src/remote-viewer.c:855
 msgid "failed to parse ovirt uri"
 msgstr ""
 
-#: ../src/remote-viewer.c:882
+#: ../src/remote-viewer.c:875 ../src/virt-viewer.c:924
+msgid "Authentication was cancelled"
+msgstr ""
+
+#: ../src/remote-viewer.c:900
 #, c-format
 msgid "oVirt VM %s is not running"
 msgstr ""
 
-#: ../src/remote-viewer.c:896
+#: ../src/remote-viewer.c:914
 #, c-format
 msgid "oVirt VM %s has no display"
 msgstr ""
 
-#: ../src/remote-viewer.c:921
+#: ../src/remote-viewer.c:940
 #, c-format
-msgid "oVirt VM %s has unknown display type: %d"
+msgid "oVirt VM %s has no host information"
 msgstr ""
 
-#: ../src/remote-viewer.c:937
+#: ../src/remote-viewer.c:951
 #, c-format
-msgid "Failed to create a session type %s"
+msgid "oVirt VM %s has unknown display type: %d"
 msgstr ""
 
-#. Create the widgets
-#: ../src/remote-viewer.c:1067
-msgid "Connection details"
+#: ../src/remote-viewer.c:1094
+msgid "Setting up Spice session..."
 msgstr ""
 
-#: ../src/remote-viewer.c:1082
-msgid "_Connection Address"
+#: ../src/remote-viewer.c:1102
+msgid "No connection was chosen"
 msgstr ""
 
-#: ../src/remote-viewer.c:1094
-msgid "For example, spice://foo.example.org:5900"
+#: ../src/remote-viewer.c:1120
+#, c-format
+msgid "Invalid file %s: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1107
-msgid "_Recent Connections"
+#: ../src/remote-viewer.c:1128
+msgid "Cannot determine the connection type from URI"
 msgstr ""
 
-#: ../src/remote-viewer.c:1207
-msgid "Couldn't create a Spice session"
+#: ../src/remote-viewer.c:1134
+msgid "Couldn't open oVirt session: "
 msgstr ""
 
-#: ../src/remote-viewer.c:1221
-msgid "Setting up Spice session..."
+#.
+#. * Local variables:
+#. *  c-indent-level: 4
+#. *  c-basic-offset: 4
+#. *  indent-tabs-mode: nil
+#. * End:
+#.
+#: ../src/remote-viewer-connect.xml.h:1
+msgid "Connection details"
 msgstr ""
 
-#: ../src/remote-viewer.c:1243
-#, c-format
-msgid "Invalid file %s"
+#: ../src/remote-viewer-connect.xml.h:2
+msgid "Connection Address"
 msgstr ""
 
-#: ../src/remote-viewer.c:1250
-msgid "Cannot determine the connection type from URI"
+#: ../src/remote-viewer-connect.xml.h:3
+msgid "For example, spice://foo.example.org:5900"
 msgstr ""
 
-#: ../src/remote-viewer.c:1258
-#, c-format
-msgid "Couldn't open oVirt session: %s"
+#: ../src/remote-viewer-connect.xml.h:4
+msgid "Recent connections"
 msgstr ""
 
-#: ../src/remote-viewer.c:1268
-#, c-format
-msgid "Couldn't create a session for this type: %s"
+#: ../src/remote-viewer-connect.xml.h:5
+msgid "Cancel"
+msgstr ""
+
+#: ../src/remote-viewer-connect.xml.h:6
+msgid "Connect"
 msgstr ""
 
-#. * Local variables:
-#. *  c-indent-level: 4
-#. *  c-basic-offset: 4
-#. *  indent-tabs-mode: nil
-#. * End:
 #: ../src/virt-viewer-about.xml.h:1
 msgid "About Glade"
 msgstr ""
@@ -237,118 +244,116 @@ msgstr ""
 msgid "The Fedora Translation Team"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:484
+#: ../src/virt-viewer-app.c:526
 msgid "Do you want to close the session?"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:486
+#: ../src/virt-viewer-app.c:528
 msgid "Do not ask me again"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:948
+#: ../src/virt-viewer-app.c:1008
 #, c-format
 msgid "Waiting for display %d..."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1057
+#: ../src/virt-viewer-app.c:1117
 #, c-format
-msgid "Unknown graphic type for the guest %s"
+msgid "Unsupported graphic type '%s'"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1138
+#: ../src/virt-viewer-app.c:1200
 msgid "Connect to ssh failed."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1140
+#: ../src/virt-viewer-app.c:1202
 msgid "Can't connect to channel, SSH only supported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1152
+#: ../src/virt-viewer-app.c:1214
 msgid "Connect to channel unsupported."
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1214
+#: ../src/virt-viewer-app.c:1276
 msgid "Display can only be attached through libvirt with --attach"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1237
+#: ../src/virt-viewer-app.c:1299
 msgid "Connecting to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1336
+#: ../src/virt-viewer-app.c:1398
 msgid "Guest domain has shutdown"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1397
+#: ../src/virt-viewer-app.c:1459
 msgid "Connected to graphic server"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1424
+#: ../src/virt-viewer-app.c:1486
 #, c-format
 msgid "Unable to connect to the graphic server %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1456
+#: ../src/virt-viewer-app.c:1512
 #, c-format
-msgid ""
-"Unable to authenticate with remote desktop server at %s: %s\n"
-"Retry connection again?"
+msgid "Unable to authenticate with remote desktop server at %s: %s\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1476
+#: ../src/virt-viewer-app.c:1525
 #, c-format
 msgid "Unable to authenticate with remote desktop server: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1484
+#: ../src/virt-viewer-app.c:1533
 #, c-format
 msgid "USB redirection error: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:1735
+#: ../src/virt-viewer-app.c:1786
 #, c-format
 msgid "Zoom level must be within %d-%d\n"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2245
+#: ../src/virt-viewer-app.c:2296
 #, c-format
 msgid "Display %d"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2418
+#: ../src/virt-viewer-app.c:2552
 #, c-format
 msgid "Invalid kiosk-quit argument: %s"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2427
+#: ../src/virt-viewer-app.c:2561
 msgid "Zoom level of window, in percentage"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2429
+#: ../src/virt-viewer-app.c:2563
 msgid "Open in full screen mode (adjusts guest resolution to fit the client)"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2431
+#: ../src/virt-viewer-app.c:2565
 msgid "Customise hotkeys"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2433
+#: ../src/virt-viewer-app.c:2567
 msgid "Enable kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "Quit on given condition in kiosk mode"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2435
+#: ../src/virt-viewer-app.c:2569
 msgid "<never|on-disconnect>"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2437
+#: ../src/virt-viewer-app.c:2571
 msgid "Display verbose information"
 msgstr ""
 
-#: ../src/virt-viewer-app.c:2439
+#: ../src/virt-viewer-app.c:2573
 msgid "Display debugging information"
 msgstr ""
 
@@ -366,11 +371,13 @@ msgstr ""
 msgid "Authentication is required for the %s connection:\n"
 msgstr ""
 
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer-auth.xml.h:1
 msgid "Authentication required"
 msgstr ""
@@ -391,6 +398,10 @@ msgstr ""
 msgid "Show password"
 msgstr ""
 
+#: ../src/virt-viewer-display-vnc.c:133
+msgid "VNC does not provide GUID"
+msgstr ""
+
 #: ../src/virt-viewer-main.c:38
 #, c-format
 msgid "%s version %s\n"
@@ -429,26 +440,34 @@ msgstr ""
 msgid "Virtual machine graphical console"
 msgstr ""
 
-#: ../src/virt-viewer-main.c:108
+#: ../src/virt-viewer-main.c:107
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [OPTIONS] DOMAIN-NAME|ID|UUID\n"
+"Usage: %s [OPTIONS] [DOMAIN-NAME|ID|UUID]\n"
 "\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: ../src/virt-viewer-session-spice.c:535
+#: ../src/virt-viewer-main.c:112
+#, c-format
+msgid ""
+"\n"
+"No DOMAIN-NAME|ID|UUID was specified for '--wait'\n"
+"\n"
+msgstr ""
+
+#: ../src/virt-viewer-session-spice.c:694
 msgid "Invalid password"
 msgstr ""
 
 #. Create the widgets
-#: ../src/virt-viewer-session-spice.c:632
+#: ../src/virt-viewer-session-spice.c:786
 msgid "Select USB devices for redirection"
 msgstr ""
 
-#: ../src/virt-viewer-session-vnc.c:148
+#: ../src/virt-viewer-session-vnc.c:153
 #, c-format
 msgid "Unsupported authentication type %d"
 msgstr ""
@@ -457,117 +476,127 @@ msgstr ""
 msgid "No virtual machine found"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:589
+#: ../src/virt-viewer-vm-connection.c:93
+msgid "No virtual machine was chosen"
+msgstr ""
+
+#: ../src/virt-viewer-window.c:537
 msgid "Ctrl+Alt+_Del"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:590
+#: ../src/virt-viewer-window.c:538
 msgid "Ctrl+Alt+_Backspace"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:592
+#: ../src/virt-viewer-window.c:540
 msgid "Ctrl+Alt+F_1"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:593
+#: ../src/virt-viewer-window.c:541
 msgid "Ctrl+Alt+F_2"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:594
+#: ../src/virt-viewer-window.c:542
 msgid "Ctrl+Alt+F_3"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:595
+#: ../src/virt-viewer-window.c:543
 msgid "Ctrl+Alt+F_4"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:596
+#: ../src/virt-viewer-window.c:544
 msgid "Ctrl+Alt+F_5"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:597
+#: ../src/virt-viewer-window.c:545
 msgid "Ctrl+Alt+F_6"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:598
+#: ../src/virt-viewer-window.c:546
 msgid "Ctrl+Alt+F_7"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:599
+#: ../src/virt-viewer-window.c:547
 msgid "Ctrl+Alt+F_8"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:600
+#: ../src/virt-viewer-window.c:548
 msgid "Ctrl+Alt+F_9"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:601
+#: ../src/virt-viewer-window.c:549
 msgid "Ctrl+Alt+F1_0"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:602
+#: ../src/virt-viewer-window.c:550
 msgid "Ctrl+Alt+F11"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:603
+#: ../src/virt-viewer-window.c:551
 msgid "Ctrl+Alt+F12"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:985 ../src/virt-viewer.xml.h:2
+#: ../src/virt-viewer-window.c:933 ../src/virt-viewer.xml.h:2
 msgid "Screenshot"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1047 ../src/virt-viewer-window.c:1049
+#: ../src/virt-viewer-window.c:1002 ../src/virt-viewer-window.c:1004
 msgid "Unknown"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1107
+#: ../src/virt-viewer-window.c:1062
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1116 ../src/virt-viewer-window.c:1117
+#: ../src/virt-viewer-window.c:1071 ../src/virt-viewer-window.c:1072
 #: ../src/virt-viewer.xml.h:3
 msgid "USB device selection"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1126
+#: ../src/virt-viewer-window.c:1081
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1135 ../src/virt-viewer-window.c:1136
+#: ../src/virt-viewer-window.c:1090 ../src/virt-viewer-window.c:1091
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1218
+#: ../src/virt-viewer-window.c:1173
 msgid "Ctrl+Alt"
 msgstr ""
 
-#: ../src/virt-viewer-window.c:1221
+#: ../src/virt-viewer-window.c:1176
 #, c-format
 msgid "(Press %s to release pointer)"
 msgstr ""
 
 #. translators:
-#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> -
-#. <appname>"
-#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt
-#. Viewer"
-#: ../src/virt-viewer-window.c:1232
+#. * This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
+#. * Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
+#.
+#: ../src/virt-viewer-window.c:1187
 #, c-format
 msgid "%s%s%s - %s"
 msgstr ""
 
 #. translators: <space>
-#: ../src/virt-viewer-window.c:1236
+#: ../src/virt-viewer-window.c:1191
 msgid " "
 msgstr ""
 
-#: ../src/virt-viewer-file.c:707
+#: ../src/virt-viewer-file.c:825
+#, c-format
+msgid ""
+"At least %s version %s is required to setup this connection, see %s for "
+"details"
+msgstr ""
+
+#: ../src/virt-viewer-file.c:833
 #, c-format
 msgid "At least %s version %s is required to setup this connection"
 msgstr ""
 
-#: ../src/virt-viewer.c:170
+#: ../src/virt-viewer.c:163
 msgid "Waiting for guest domain to re-start"
 msgstr ""
 
@@ -576,59 +605,69 @@ msgstr ""
 msgid "Cannot determine the graphic type for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:446
+#: ../src/virt-viewer.c:448
 #, c-format
 msgid "Cannot determine the host for the guest %s"
 msgstr ""
 
-#: ../src/virt-viewer.c:475
+#: ../src/virt-viewer.c:476
 #, c-format
 msgid "Guest '%s' is not reachable"
 msgstr ""
 
-#: ../src/virt-viewer.c:690
+#: ../src/virt-viewer.c:697
 #, c-format
 msgid "Virtual machine %s is not running"
 msgstr ""
 
-#: ../src/virt-viewer.c:715
+#: ../src/virt-viewer.c:720
 msgid "Waiting for libvirt to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:719
+#: ../src/virt-viewer.c:724
 msgid "Finding guest domain"
 msgstr ""
 
-#: ../src/virt-viewer.c:723
+#: ../src/virt-viewer.c:728
 msgid "Waiting for guest domain to be created"
 msgstr ""
 
-#: ../src/virt-viewer.c:743
+#: ../src/virt-viewer.c:750
 msgid "Checking guest domain status"
 msgstr ""
 
-#: ../src/virt-viewer.c:750
+#: ../src/virt-viewer.c:753
+msgid "Cannot get guest state"
+msgstr ""
+
+#: ../src/virt-viewer.c:759
 msgid "Waiting for guest domain to start"
 msgstr ""
 
-#: ../src/virt-viewer.c:854
+#: ../src/virt-viewer.c:863
 #, c-format
 msgid "Unable to connect to libvirt with URI: %s."
 msgstr ""
 
-#: ../src/virt-viewer.c:855
+#: ../src/virt-viewer.c:864
 msgid "[none]"
 msgstr ""
 
-#: ../src/virt-viewer.c:862
+#: ../src/virt-viewer.c:871
 msgid "Authentication failed."
 msgstr ""
 
+#: ../src/virt-viewer.c:931
+msgid "Failed to connect: "
+msgstr ""
+
+#.
 #. * Local variables:
 #. *  c-indent-level: 4
 #. *  c-basic-offset: 4
 #. *  indent-tabs-mode: nil
 #. * End:
+#.
 #: ../src/virt-viewer.xml.h:1
 msgid "_File"
 msgstr ""
@@ -641,35 +680,39 @@ msgstr ""
 msgid "Smartcard removal"
 msgstr ""
 
-#: ../src/virt-viewer.xml.h:6
-msgid "_View"
+#: ../src/virt-viewer.xml.h:6 ../src/virt-viewer-preferences.xml.h:1
+msgid "Preferences"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:7
-msgid "Full screen"
+msgid "_View"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:8
-msgid "_Zoom"
+msgid "Full screen"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:9
-msgid "Displays"
+msgid "_Zoom"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:10
-msgid "Release cursor"
+msgid "Displays"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:11
-msgid "_Send key"
+msgid "Release cursor"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:12
-msgid "_Help"
+msgid "_Send key"
 msgstr ""
 
 #: ../src/virt-viewer.xml.h:13
+msgid "_Help"
+msgstr ""
+
+#: ../src/virt-viewer.xml.h:14
 msgid "_Guest Details"
 msgstr ""
 
@@ -696,3 +739,19 @@ msgstr ""
 #: ../src/virt-viewer-vm-connection.xml.h:3
 msgid "Available virtual machines"
 msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:2
+msgid "Folder sharing"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:3
+msgid "Share folder"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:4
+msgid "Read-only"
+msgstr ""
+
+#: ../src/virt-viewer-preferences.xml.h:5
+msgid "Spice"
+msgstr ""