[vinagre] Updated Norwegian bokmål translation.

[Kjartan Maraas <kmaraas src gnome org>]

commit 39f96838212dba2b4234c5af84d14b8f2f72b15c
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Thu Aug 6 22:22:49 2009 +0200

    Updated Norwegian bokmål translation.

 po/nb.po |  819 ++++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 502 insertions(+), 317 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index c64999b..3010de1 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vinagre 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-10 14:53+0200\n"
-"PO-Revision-Date: 2009-06-10 14:54+0200\n"
+"POT-Creation-Date: 2009-08-06 22:13+0200\n"
+"PO-Revision-Date: 2009-08-06 22:22+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb lister ping uio no>\n"
 "MIME-Version: 1.0\n"
@@ -16,11 +16,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/GNOME_VinagreApplet.xml.h:1
+#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495
 msgid "_About"
 msgstr "_Om"
 
-#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37
+#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37
 msgid "_Help"
 msgstr "_Hjelp"
 
@@ -29,124 +29,118 @@ msgid "Access remote desktops"
 msgstr "Bruk eksternt skrivebord"
 
 #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2
-#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418
-#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151
+#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2
+#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486
+#: ../vinagre/vinagre-main.c:185
 msgid "Remote Desktop Viewer"
 msgstr "Visning av eksternt skrivebord"
 
-#: ../data/vinagre.glade.h:1
-msgid "<b>Authentication is required</b>"
-msgstr "<b>Autentisering kreves</b>"
+#: ../data/vinagre.ui.h:1
+msgid "All fields above are mandatory"
+msgstr "Alle felt over må fylles ut"
 
-#: ../data/vinagre.glade.h:2
-msgid "<b>Connection options</b>"
-msgstr "<b>Alternativer for tilkobling</b>"
+#: ../data/vinagre.ui.h:2
+msgid "Authentication is required"
+msgstr "Autentisering kreves"
 
-#: ../data/vinagre.glade.h:3
-msgid "<b>Connection</b>"
-msgstr "<b>Tilkobling</b>"
+#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856
+msgid "Bookmarks"
+msgstr "Bokmerker"
 
-#: ../data/vinagre.glade.h:4
-msgid "<b>Folder</b>"
-msgstr "<b>Mappe</b>"
+#: ../data/vinagre.ui.h:4
+msgid "Connection"
+msgstr "Tilkobling..."
 
-#: ../data/vinagre.glade.h:5
-msgid "<b>Interface</b>"
-msgstr "<b>Grensesnitt</b>"
+#: ../data/vinagre.ui.h:5
+msgid "Connection options"
+msgstr "Alternativer for tilkobling"
 
-#: ../data/vinagre.glade.h:6
-msgid "<b>Options</b>"
-msgstr "<b>Alternativer</b>"
+#: ../data/vinagre.ui.h:6
+msgid "Folder"
+msgstr "Mappe"
 
-#: ../data/vinagre.glade.h:7
-msgid "<b>Parent Folder</b>"
-msgstr "<b>Opphavsmappe</b>"
+#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49
+#: ../plugins/vnc/vinagre-vnc-tab.c:133 ../vinagre/vinagre-fav.c:425
+msgid "Host:"
+msgstr "Vert:"
 
-#: ../data/vinagre.glade.h:8
-msgid "<b>Which machine do you want to connect to?</b>"
-msgstr "<b>Hvilken maskin vil du koble til?</b>"
+#: ../data/vinagre.ui.h:8
+msgid "Interface"
+msgstr "Grensesnitt"
 
-#: ../data/vinagre.glade.h:9
-msgid "<i><small>All fields above are mandatory</small></i>"
-msgstr "<i><small>Alle felt over må fylles ut</small></i>"
+#: ../data/vinagre.ui.h:9
+msgid "Options"
+msgstr "Alternativer"
 
-#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846
-msgid "Bookmarks"
-msgstr "Bokmerker"
-
-#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422
-#: ../src/vinagre-vnc-tab.c:132
-msgid "Host:"
-msgstr "Vert:"
+#: ../data/vinagre.ui.h:10
+msgid "Parent Folder"
+msgstr "Opphavsmappe"
 
-#: ../data/vinagre.glade.h:12
+#: ../data/vinagre.ui.h:11
 msgid "Preferences"
 msgstr "Brukervalg"
 
-#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8
-msgid ""
-"Whether we should show tabs even when there is only one active connection"
-msgstr "Om faner skal vises selv om det bare er en aktiv tilkobling"
-
-#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9
-msgid "Whether we should show the menu accelerators (shortcut keys)"
-msgstr "Om hurtigtaster for menyene skal vises (snarveitaster)"
+#: ../data/vinagre.ui.h:12
+msgid "Which machine do you want to connect to?"
+msgstr "Hvilken maskin vil du koble til?"
 
-#: ../data/vinagre.glade.h:15
+#: ../data/vinagre.ui.h:13
 msgid "_Always show tabs"
 msgstr "_Alltid vis faner"
 
 #. This is a button label, in the authentication dialog
-#: ../data/vinagre.glade.h:17
+#: ../data/vinagre.ui.h:15
 msgid "_Authenticate"
 msgstr "_Autentiser"
 
-#: ../data/vinagre.glade.h:18
+#: ../data/vinagre.ui.h:16
 msgid "_Full screen"
 msgstr "_Fullskjerm"
 
-#: ../data/vinagre.glade.h:19
+#: ../data/vinagre.ui.h:17
 msgid "_Host:"
 msgstr "_Vert:"
 
-#: ../data/vinagre.glade.h:20
+#: ../data/vinagre.ui.h:18
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: ../data/vinagre.glade.h:21
+#: ../data/vinagre.ui.h:19
 msgid "_Password:"
 msgstr "_Passord:"
 
-#: ../data/vinagre.glade.h:22
+#: ../data/vinagre.ui.h:20
+msgid "_Protocol:"
+msgstr "_Protokoll:"
+
+#: ../data/vinagre.ui.h:21
 msgid "_Remember this credential"
 msgstr "_Husk dette passordet"
 
-#: ../data/vinagre.glade.h:23
-msgid "_Scaling"
-msgstr "_Skalering"
-
-#: ../data/vinagre.glade.h:24
+#: ../data/vinagre.ui.h:22
 msgid "_Show menu shortcuts"
 msgstr "Vi_s menysnarveier"
 
-#: ../data/vinagre.glade.h:25
+#: ../data/vinagre.ui.h:23
 msgid "_Username:"
 msgstr "Br_ukernavn:"
 
-#: ../data/vinagre.glade.h:26 ../src/vinagre-vnc-tab.c:643
-msgid "_View only"
-msgstr "Ba_re se"
+#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795
+msgid "Active plugins"
+msgstr "Aktive tillegg"
 
-#. Tooltip for host entry in connect dialog
-#: ../data/vinagre.glade.h:28
-msgid "host or host:display or host::port"
-msgstr "vert, vert:skjerm eller vert::port"
+#: ../data/vinagre.schemas.in.in.h:2
+msgid ""
+"List of active plugins. It contains the \"Location\" of the active plugins. "
+"See the .vinagre-plugin file for obtaining the \"Location\" of a given "
+"plugin."
+msgstr ""
 
-#: ../data/vinagre.schemas.in.h:1
+#: ../data/vinagre.schemas.in.in.h:3
 msgid "Maximum number of history items in connect dialog"
 msgstr "Maksimalt antall historikkoppføringer i tilkoblingsdialogen"
 
-#: ../data/vinagre.schemas.in.h:2
+#: ../data/vinagre.schemas.in.in.h:4
 msgid ""
 "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. "
 "Note that if they are enabled, those keys will be intercepted by the menu "
@@ -156,7 +150,7 @@ msgstr ""
 "på. Merk at hvis de er slått på vil disse tastene fanges av menyen og ikke "
 "bli sendt til ekstern vert."
 
-#: ../data/vinagre.schemas.in.h:3
+#: ../data/vinagre.schemas.in.in.h:5
 msgid ""
 "Set to \"true\" to always show the tabs. Set to \"false\" to only show the "
 "tabs when there is more than one active connection."
@@ -164,15 +158,15 @@ msgstr ""
 "Sett til «true» for å alltid vise faner. Settes denne til «false» vil faner "
 "kun vises når det er mer enn en aktiv tilkobling."
 
-#: ../data/vinagre.schemas.in.h:4
+#: ../data/vinagre.schemas.in.in.h:6
 msgid "Specifies the maximum number of items in the host dropdown entry."
 msgstr "Oppgir maksimalt antall oppføringer i vertsmenyen."
 
-#: ../data/vinagre.schemas.in.h:5
+#: ../data/vinagre.schemas.in.in.h:7
 msgid "The handler for \"vnc://\" URLs"
 msgstr "Håndterer for «vnc://»-URLer"
 
-#: ../data/vinagre.schemas.in.h:6
+#: ../data/vinagre.schemas.in.in.h:8
 msgid ""
 "When connecting to a host, the client can say to the server to leave other "
 "clients connected or to drop the existent connections. Set the value to true "
@@ -182,10 +176,19 @@ msgstr ""
 "forbli tilkoblet eller om disse skal kobles fra. Sett verdien til «true» for "
 "Ã¥ dele skrivebordet med andre klienter."
 
-#: ../data/vinagre.schemas.in.h:7
+#: ../data/vinagre.schemas.in.in.h:9
 msgid "Whether we should leave other clients connected"
 msgstr "Om andre klienter skal kunne forbli tilkoblet"
 
+#: ../data/vinagre.schemas.in.in.h:10
+msgid ""
+"Whether we should show tabs even when there is only one active connection"
+msgstr "Om faner skal vises selv om det bare er en aktiv tilkobling"
+
+#: ../data/vinagre.schemas.in.in.h:11
+msgid "Whether we should show the menu accelerators (shortcut keys)"
+msgstr "Om hurtigtaster for menyene skal vises (snarveitaster)"
+
 #: ../data/vinagre-mime.xml.in.h:1
 msgid "Remote Desktop (VNC) file"
 msgstr "Fil for eksternt skrivebord (VNC)"
@@ -194,94 +197,259 @@ msgstr "Fil for eksternt skrivebord (VNC)"
 msgid "Remote Desktop Connection"
 msgstr "Ekstern skrivebordstilkobling"
 
-#: ../src/GNOME_VinagreApplet.server.in.in.h:1
+#. vim: set ts=8:
+#: ../plugins/ssh/vinagre-ssh-plugin.c:70
+#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1
+msgid "SSH"
+msgstr "SSH"
+
+#. Translators: This is a description of the SSH protocol. It appears at Connect dialog.
+#: ../plugins/ssh/vinagre-ssh-plugin.c:72
+msgid "Access Unix/Linux terminals"
+msgstr ""
+
+#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:134
+msgid "Port:"
+msgstr "Port:"
+
+#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2
+msgid "SSH support"
+msgstr "SSH-støtte"
+
+#: ../plugins/vnc/vinagre-vnc-connection.c:204
+#: ../plugins/vnc/vinagre-vnc-plugin.c:183
+#, c-format
+msgid ""
+"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it."
+msgstr ""
+"Ugyldig verdi for flagget «shared»: %d. Verdien skal være 0 eller 1. Overser "
+"den."
+
+#. vim: set ts=8:
+#: ../plugins/vnc/vinagre-vnc-plugin.c:81
+#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1
+msgid "VNC"
+msgstr "VNC"
+
+#: ../plugins/vnc/vinagre-vnc-plugin.c:82
+msgid "Access Unix/Linux, Windows and other machines."
+msgstr ""
+
+#: ../plugins/vnc/vinagre-vnc-plugin.c:132
+msgid "Could not parse the file."
+msgstr "Kunne ikke lese filen."
+
+#: ../plugins/vnc/vinagre-vnc-plugin.c:139
+msgid "The file is not a VNC one: Missing the group \"connection\"."
+msgstr ""
+
+#: ../plugins/vnc/vinagre-vnc-plugin.c:145
+msgid "The file is not a VNC one: Missing the key \"host\"."
+msgstr ""
+
+#: ../plugins/vnc/vinagre-vnc-plugin.c:212
+msgid "VNC Options"
+msgstr "Alternativer for VNC"
+
+#: ../plugins/vnc/vinagre-vnc-plugin.c:223
+#: ../plugins/vnc/vinagre-vnc-tab.c:651
+msgid "_View only"
+msgstr "Ba_re se"
+
+#: ../plugins/vnc/vinagre-vnc-plugin.c:230
+msgid "_Scaling"
+msgstr "_Skalering"
+
+#. Translators: this is a pattern to open *.vnc files in a open dialog.
+#: ../plugins/vnc/vinagre-vnc-plugin.c:254
+msgid "VNC Files"
+msgstr "VNC-filer"
+
+#: ../plugins/vnc/vinagre-vnc-tab.c:132
+msgid "Desktop Name:"
+msgstr "Skrivebordsnavn:"
+
+#: ../plugins/vnc/vinagre-vnc-tab.c:135
+msgid "Dimensions:"
+msgstr "Dimensjoner:"
+
+#: ../plugins/vnc/vinagre-vnc-tab.c:261
+msgid "Error connecting to host."
+msgstr "Feil ved tilkobling til verten."
+
+#. Translators: %s is a host name or IP address; %u is a code error (number).
+#: ../plugins/vnc/vinagre-vnc-tab.c:299
+#, c-format
+msgid "Authentication method to host %s is unsupported. (%u)"
+msgstr "Autentiseringsmetoden mot verten %s er ikke støttet. (%u)"
+
+#: ../plugins/vnc/vinagre-vnc-tab.c:303
+msgid "Authentication unsupported"
+msgstr "Autentisering er ikke støttet"
+
+#: ../plugins/vnc/vinagre-vnc-tab.c:567 ../plugins/vnc/vinagre-vnc-tab.c:584
+msgid "Authentication error"
+msgstr "Feil ved autentisering"
+
+#: ../plugins/vnc/vinagre-vnc-tab.c:568
+msgid "A username is required in order to access this machine."
+msgstr "Et brukernavn kreves for å få tilgang til denne maskinen."
+
+#: ../plugins/vnc/vinagre-vnc-tab.c:585
+msgid "A password is required in order to access this machine."
+msgstr "Et passord kreves for å få tilgang til denne maskinen."
+
+#: ../plugins/vnc/vinagre-vnc-tab.c:636
+msgid "S_caling"
+msgstr "S_kalering"
+
+#: ../plugins/vnc/vinagre-vnc-tab.c:637
+msgid "Fits the remote screen into the current window size"
+msgstr "Tilpass ekstern skjerm til størrelsen på aktivt vindu"
+
+#: ../plugins/vnc/vinagre-vnc-tab.c:652
+msgid "Does not send mouse and keyboard events"
+msgstr "Ikke send hendelser for mus og tastatur"
+
+#: ../plugins/vnc/vinagre-vnc-tab.c:665
+msgid "_Original size"
+msgstr "_Opprinnelig størrelse"
+
+#: ../plugins/vnc/vinagre-vnc-tab.c:666
+msgid "Adjusts the window to the remote desktop's size"
+msgstr "Justerer vinduet til samme størrelse som eksternt skrivebord"
+
+#: ../plugins/vnc/vinagre-vnc-tab.c:689 ../plugins/vnc/vinagre-vnc-tab.c:757
+#: ../plugins/vnc/vinagre-vnc-tab.c:758
+msgid "Send Ctrl-Alt-Del"
+msgstr "Sende Ctrl+alt+del"
+
+#: ../plugins/vnc/vinagre-vnc-tab.c:690
+msgid "Sends Ctrl+Alt+Del to the remote machine"
+msgstr "Sender Ctrl+alt+del til ekstern maskin"
+
+#: ../plugins/vnc/vinagre-vnc-tab.c:736 ../plugins/vnc/vinagre-vnc-tab.c:737
+msgid "Scaling"
+msgstr "Skalering"
+
+#: ../plugins/vnc/vinagre-vnc-tab.c:746 ../plugins/vnc/vinagre-vnc-tab.c:747
+msgid "Read only"
+msgstr "Bare se"
+
+#: ../plugins/vnc/vinagre-vnc-tab.c:912
+msgid ""
+"Scaling is not supported on this installation.\n"
+"\n"
+"Read the README file (shipped with Vinagre) in order to know how to enable "
+"this feature."
+msgstr ""
+"Skalering er ikke støttet på denne installasjonen.\n"
+"\n"
+"Les filen README, som distribueres med Vinagre, for å finne ut hvordan du "
+"aktiverer denne funksjonen."
+
+#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2
+msgid "VNC support"
+msgstr "VNC-støtte"
+
+#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1
 msgid "A menu to quickly access remote machines"
 msgstr "En meny for å koble til en ekstern maskin raskt"
 
-#: ../src/GNOME_VinagreApplet.server.in.in.h:3
+#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3
 msgid "Vinagre Applet Factory"
 msgstr "Fabrikk for vinagre panelprogram"
 
-#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349
+#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360
 msgid "Could not run vinagre:"
 msgstr "Kunne ikke kjøre vinagre:"
 
-#: ../src/vinagre-applet.c:369
+#: ../vinagre/vinagre-applet.c:380
 msgid "Open Remote Desktop Viewer"
 msgstr "Ã?pne visning av eksternt skrivebord"
 
-#: ../src/vinagre-applet.c:419
+#: ../vinagre/vinagre-applet.c:435
 msgid "Access your bookmarks"
 msgstr "Ã?pne dine bokmerker"
 
-#: ../src/vinagre-bookmarks.c:327
+#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519
+#: ../vinagre/vinagre-tab.c:469
+#, c-format
+msgid "The protocol %s is not supported."
+msgstr "Protokoll %s er ikke støttet."
+
+#: ../vinagre/vinagre-bookmarks.c:343
 #, c-format
 msgid "Error while initializing bookmarks: %s"
 msgstr "Feil under oppstart av bokmerkene: %s"
 
-#: ../src/vinagre-bookmarks.c:327 ../src/vinagre-bookmarks.c:442
-#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:148
-#: ../src/vinagre-connect.c:277 ../src/vinagre-fav.c:678
-#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104
-#: ../src/vinagre-window.c:263
+#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458
+#: ../vinagre/vinagre-bookmarks-migration.c:135
+#: ../vinagre/vinagre-commands.c:172 ../vinagre/vinagre-connect.c:447
+#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:89
+#: ../vinagre/vinagre-main.c:108 ../vinagre/vinagre-window.c:266
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
-#: ../src/vinagre-bookmarks.c:334
+#: ../vinagre/vinagre-bookmarks.c:350
 msgid "Error while initializing bookmarks: The file seems to be empty"
 msgstr "Feil under initiering av bokmerker: Filen ser ut til å være tom"
 
-#: ../src/vinagre-bookmarks.c:341
+#: ../vinagre/vinagre-bookmarks.c:357
 msgid ""
 "Error while initializing bookmarks: The file is not a vinagre bookmarks file"
 msgstr ""
 "Feil under initiering av bokmerkene: Filen er ikke en bokmerkefil fra vinagre"
 
-#: ../src/vinagre-bookmarks.c:403 ../src/vinagre-bookmarks.c:410
+#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426
 msgid "Error while saving bookmarks: Failed to create the XML structure"
 msgstr "Feil under lagring av bokmerker: Klarte ikke å lage XML-strukturen"
 
-#: ../src/vinagre-bookmarks.c:417 ../src/vinagre-bookmarks.c:424
+#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440
 msgid "Error while saving bookmarks: Failed to initialize the XML structure"
 msgstr "Feil under lagring av bokmerker: Klarte ikke å initiere XML-strukturen"
 
-#: ../src/vinagre-bookmarks.c:433
+#: ../vinagre/vinagre-bookmarks.c:449
 msgid "Error while saving bookmarks: Failed to finalize the XML structure"
 msgstr ""
 "Feil under lagring av bokmerker: Klarte ikke å sluttføre XML-strukturen"
 
-#: ../src/vinagre-bookmarks.c:442
+#: ../vinagre/vinagre-bookmarks.c:458
 #, c-format
 msgid "Error while saving bookmarks: %s"
 msgstr "Feil under lagring av bokmerker: %s"
 
-#: ../src/vinagre-bookmarks-migration.c:93
-#: ../src/vinagre-bookmarks-migration.c:100
+#: ../vinagre/vinagre-bookmarks-migration.c:95
+#: ../vinagre/vinagre-bookmarks-migration.c:102
 msgid "Error while migrating bookmarks: Failed to create the XML structure"
 msgstr "Feil under migrering av bokmerker: Klarte ikke å lage XML-strukturen"
 
-#: ../src/vinagre-bookmarks-migration.c:107
-#: ../src/vinagre-bookmarks-migration.c:114
+#: ../vinagre/vinagre-bookmarks-migration.c:109
+#: ../vinagre/vinagre-bookmarks-migration.c:116
 msgid "Error while migrating bookmarks: Failed to initialize the XML structure"
 msgstr ""
 "Feil udner migrering av bokmerker: Klarte ikke å initiere XML-strukturen"
 
-#: ../src/vinagre-bookmarks-migration.c:123
+#: ../vinagre/vinagre-bookmarks-migration.c:125
 msgid "Error while migrating bookmarks: Failed to finalize the XML structure"
 msgstr ""
 "Feil under migrering av bokmerker: Klarte ikke å sluttføre XML-strukturen"
 
-#: ../src/vinagre-bookmarks-migration.c:133
-#: ../src/vinagre-bookmarks-migration.c:231
+#: ../vinagre/vinagre-bookmarks-migration.c:135
+#: ../vinagre/vinagre-bookmarks-migration.c:238
 #, c-format
 msgid "Error while migrating bookmarks: %s"
 msgstr "Feil under migrering av bokmerker: %s"
 
-#: ../src/vinagre-bookmarks-migration.c:231
+#: ../vinagre/vinagre-bookmarks-migration.c:164
+msgid "Error while migrating bookmarks: VNC plugin is not activated"
+msgstr "Feil under migrering av bokmerker: VNC-tillegg er ikke aktivert"
+
+#: ../vinagre/vinagre-bookmarks-migration.c:238
 msgid "Failed to create the directory"
 msgstr "Klarte ikke å lage katalogen"
 
-#: ../src/vinagre-bookmarks-migration.c:255
+#: ../vinagre/vinagre-bookmarks-migration.c:262
 msgid ""
 "Migrating the bookmarks file to the new format. This operation is only "
 "supposed to run once."
@@ -289,360 +457,471 @@ msgstr ""
 "Migrerer bokmerkefilen til det nye formatet. Denne operasjonen skal bare "
 "kjøres en gang."
 
-#: ../src/vinagre-bookmarks-migration.c:263
+#: ../vinagre/vinagre-bookmarks-migration.c:270
 #, c-format
 msgid "Error opening old bookmarks file: %s"
 msgstr "Feil under åpning av gammel bokmerkefil: %s"
 
-#: ../src/vinagre-bookmarks-migration.c:264
-#: ../src/vinagre-bookmarks-migration.c:276
+#: ../vinagre/vinagre-bookmarks-migration.c:271
+#: ../vinagre/vinagre-bookmarks-migration.c:283
 msgid "Migration cancelled"
 msgstr "Migrering avbrutt"
 
-#: ../src/vinagre-bookmarks-migration.c:273
+#: ../vinagre/vinagre-bookmarks-migration.c:280
 msgid "Could not remove the old bookmarks file"
 msgstr "Kunne ikke fjerne den gamle bokmerkefilen"
 
-#: ../src/vinagre-bookmarks-tree.c:120
+#: ../vinagre/vinagre-bookmarks-tree.c:120
 msgid "Root Folder"
 msgstr "Rotmappe"
 
-#: ../src/vinagre-bookmarks-ui.c:79
+#: ../vinagre/vinagre-bookmarks-ui.c:78
 msgid "Invalid name for this folder"
 msgstr "Ugyldig navn på denne mappen"
 
-#: ../src/vinagre-bookmarks-ui.c:89 ../src/vinagre-bookmarks-ui.c:194
+#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "Navnet «%s» er allerede brukt i denne mappen. Velg et annet navn."
 
-#: ../src/vinagre-bookmarks-ui.c:90 ../src/vinagre-bookmarks-ui.c:184
-#: ../src/vinagre-bookmarks-ui.c:195
+#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190
+#: ../vinagre/vinagre-bookmarks-ui.c:201
 msgid "Invalid name for this item"
 msgstr "Ugyldig navn for denne oppføringen"
 
-#: ../src/vinagre-bookmarks-ui.c:298
+#. Translators: %s is a protocol name, like VNC or SSH
+#: ../vinagre/vinagre-bookmarks-ui.c:168
+#, c-format
+msgid "(Protocol: %s)"
+msgstr "(Protokoll: %s)"
+
+#. Translators: %s is a bookmark entry name
+#: ../vinagre/vinagre-bookmarks-ui.c:308
 #, c-format
-msgid "Are you sure you want to remove <i>%s</i> from bookmarks?"
-msgstr "Er du sikker på at du ønsker å fjerne <i>%s</i> fra bokmerkene?"
+msgid "Are you sure you want to remove %s from bookmarks?"
+msgstr "Er du sikker på at du ønsker å fjerne %s fra bokmerkene?"
 
-#: ../src/vinagre-bookmarks-ui.c:303
+#: ../vinagre/vinagre-bookmarks-ui.c:314
 msgid "Remove Folder?"
 msgstr "Fjern mappen?"
 
-#: ../src/vinagre-bookmarks-ui.c:304
+#: ../vinagre/vinagre-bookmarks-ui.c:315
 msgid "Notice that all its subfolders and items will be removed as well."
 msgstr "Merk at alle undermapper og oppføringer vil bli fjernet også."
 
-#: ../src/vinagre-bookmarks-ui.c:309
+#: ../vinagre/vinagre-bookmarks-ui.c:320
 msgid "Remove Item?"
 msgstr "Fjern oppføring?"
 
-#: ../src/vinagre-bookmarks-ui.c:326
+#: ../vinagre/vinagre-bookmarks-ui.c:337
 msgid "Error removing bookmark: Entry not found"
 msgstr "Feil under fjerning av bokmerke: Oppføring ikke funnet"
 
-#: ../src/vinagre-bookmarks-ui.c:343
+#: ../vinagre/vinagre-bookmarks-ui.c:354
 msgid "New Folder"
 msgstr "Ny mappe"
 
-#: ../src/vinagre-commands.c:115
+#: ../vinagre/vinagre-commands.c:122
 msgid "Choose the file"
 msgstr "Velg fil"
 
-#: ../src/vinagre-commands.c:126 ../src/vinagre-tab.c:703
-msgid "Supported formats"
-msgstr "Støttede formater"
+#: ../vinagre/vinagre-commands.c:150
+msgid "There are none supported files"
+msgstr ""
 
-#: ../src/vinagre-commands.c:159
+#: ../vinagre/vinagre-commands.c:150
+msgid ""
+"None of the active plugins offer a supported file to be open. Activate some "
+"plugins and try again."
+msgstr ""
+
+#: ../vinagre/vinagre-commands.c:183
 msgid "The following file could not be opened:"
 msgid_plural "The following files could not be opened:"
 msgstr[0] "Følgende fil kunne ikke bli åpnet:"
 msgstr[1] "Følgende filer kunne ikke bli åpnet:"
 
-#: ../src/vinagre-connect.c:181
+#: ../vinagre/vinagre-connect.c:85 ../vinagre/vinagre-connect.c:319
+#: ../vinagre/vinagre-connect.c:412
+msgid "Could not get the active protocol in the protocol list."
+msgstr ""
+
+#: ../vinagre/vinagre-connect.c:302
 #, c-format
 msgid "Error while saving history file: %s"
 msgstr "Feil under lagring av historikkfil: %s"
 
-#: ../src/vinagre-connect.c:193
-msgid "Choose a VNC Server"
-msgstr "Velg en VNC-tjener"
+#: ../vinagre/vinagre-connect.c:329
+msgid "Choose a Remote Desktop"
+msgstr "Velg et eksternt skrivebord"
 
-#: ../src/vinagre-connection.c:556
-#, c-format
-msgid "The protocol %s is not supported."
-msgstr "Protokoll %s er ikke støttet."
-
-#: ../src/vinagre-connection.c:669
+#: ../vinagre/vinagre-connection.c:627
 msgid "Could not open the file."
 msgstr "Kunne ikke åpne filen."
 
-#: ../src/vinagre-connection.c:688
-msgid "Could not parse the file."
-msgstr "Kunne ikke lese filen."
-
-#: ../src/vinagre-connection.c:733
-msgid "Could not find the host address in the file."
-msgstr "Kunne ikke finne vertsadressen i filen."
+#: ../vinagre/vinagre-connection.c:651
+msgid "The file was not recognized by any of the plugins."
+msgstr "Filen ble ikke gjenkjent av noen av tilleggene."
 
-#: ../src/vinagre-fav.c:667
+#: ../vinagre/vinagre-fav.c:670
 msgid "Invalid operation"
 msgstr "Ugyldig operasjon"
 
-#: ../src/vinagre-fav.c:668
+#: ../vinagre/vinagre-fav.c:671
 msgid "Data received from drag&drop operation is invalid."
 msgstr "Data mottatt fra dra-og-slipp operasjon er ugyldig."
 
-#: ../src/vinagre-fav.c:861
+#: ../vinagre/vinagre-fav.c:871
 msgid "Hosts nearby"
 msgstr "Verter i nærheten"
 
-#: ../src/vinagre-main.c:53
-msgid "Opens a .vnc file"
-msgstr "Ã?pner en .vnc-fil"
-
-#: ../src/vinagre-main.c:53
-msgid "filename"
-msgstr "filnavn"
-
-#: ../src/vinagre-main.c:56
+#: ../vinagre/vinagre-main.c:60
 msgid "Create a new toplevel window in an existing instance of vinagre"
 msgstr "Lag et nytt toppvindu i en eksisterende instans av vinagre"
 
-#: ../src/vinagre-main.c:60
+#: ../vinagre/vinagre-main.c:64
 msgid "[server:port]"
 msgstr "[tjener:port]"
 
-#: ../src/vinagre-main.c:115
+#: ../vinagre/vinagre-main.c:119
 msgid "The following error has occurred:"
 msgid_plural "The following errors have occurred:"
 msgstr[0] "Følgende feil oppsto:"
 msgstr[1] "Følgende feil oppsto:"
 
 #. Setup command line options
-#: ../src/vinagre-main.c:137
-msgid "- VNC Client for GNOME"
-msgstr "- VNC-klient for GNOME"
+#: ../vinagre/vinagre-main.c:158
+msgid "- Remote Desktop Viewer"
+msgstr "- Visning av eksternt skrivebord"
 
-#: ../src/vinagre-main.c:146
+#: ../vinagre/vinagre-main.c:180
 msgid ""
 "Run 'vinagre --help' to see a full list of available command line options"
 msgstr ""
 "Kjør 'vinagre --help' for å se en liste med tilgjengelige kommandolinjevalg"
 
-#: ../src/vinagre-mdns.c:123
+#: ../vinagre/vinagre-mdns.c:142
 #, c-format
 msgid "Failed to resolve avahi hostname: %s\n"
 msgstr "Klarte ikke å finne avahi-vertsnavn: %s\n"
 
-#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184
+#: ../vinagre/vinagre-mdns.c:200
+#, c-format
+msgid "Plugin %s has already registered a browser for service %s."
+msgstr ""
+
+#: ../vinagre/vinagre-mdns.c:209
+#, c-format
+msgid "Failed to add mDNS browser for service %s."
+msgstr "Klarte ikke å legge til mDNS-visning for tjeneste: %s\n"
+
+#: ../vinagre/vinagre-mdns.c:225
 #, c-format
 msgid "Failed to browse for hosts: %s\n"
 msgstr "Klarte ikke å se etter verter: %s\n"
 
-#: ../src/vinagre-notebook.c:399
+#: ../vinagre/vinagre-mdns.c:298
+#, c-format
+msgid "Failed to initialize mDNS browser: %s\n"
+msgstr "Klarte ikke å initiere mDNS-visning: %s\n"
+
+#. Translators: %s is a host name or IP address.
+#: ../vinagre/vinagre-notebook.c:444
 #, c-format
-msgid "Connection to host <i>%s</i> was closed."
-msgstr "Tilkoblingen til verten <i>%s</i> ble lukket."
+msgid "Connection to host %s was closed."
+msgstr "Tilkobling til vert %s ble lukket."
 
-#: ../src/vinagre-notebook.c:401
+#: ../vinagre/vinagre-notebook.c:446
 msgid "Connection closed"
 msgstr "Tilkobling lukket"
 
-#: ../src/vinagre-notebook.c:417
+#. Translators: %s is a host name or IP address.
+#: ../vinagre/vinagre-notebook.c:465
 #, c-format
-msgid "Authentication to host <i>%s</i> has failed"
-msgstr "Autentisering mot verten <i>%s</i> feilet"
+msgid "Authentication to host %s has failed"
+msgstr "Autentisering mot vert %s feilet"
 
-#: ../src/vinagre-notebook.c:423
+#: ../vinagre/vinagre-notebook.c:471
 msgid "Authentication failed"
 msgstr "Autentisering feilet"
 
-#: ../src/vinagre-notebook.c:460
+#: ../vinagre/vinagre-notebook.c:503
 msgid "Connecting..."
 msgstr "Kobler til ..."
 
-#: ../src/vinagre-notebook.c:487 ../src/vinagre-tab.c:379
+#: ../vinagre/vinagre-notebook.c:530 ../vinagre/vinagre-tab.c:394
 msgid "Close connection"
 msgstr "Lukk tilkobling"
 
-#: ../src/vinagre-prefs.c:169
+#: ../vinagre/vinagre-plugin-dialog.c:83
+msgid "Plugin Manager"
+msgstr "Tilleggshåndterer"
+
+#: ../vinagre/vinagre-plugin-manager.c:45
+msgid "Plugin"
+msgstr "Tillegg"
+
+#: ../vinagre/vinagre-plugin-manager.c:46
+msgid "Enabled"
+msgstr "Aktivert"
+
+#: ../vinagre/vinagre-plugin-manager.c:503
+msgid "C_onfigure"
+msgstr "K_onfigurer"
+
+#: ../vinagre/vinagre-plugin-manager.c:512
+msgid "A_ctivate"
+msgstr "A_ktiver"
+
+#: ../vinagre/vinagre-plugin-manager.c:523
+msgid "Ac_tivate All"
+msgstr "Ak_tiver alle"
+
+#: ../vinagre/vinagre-plugin-manager.c:528
+msgid "_Deactivate All"
+msgstr "_Deaktiver alle"
+
+#: ../vinagre/vinagre-plugin-manager.c:824
+msgid "_About Plugin"
+msgstr "_Om tillegg"
+
+#: ../vinagre/vinagre-plugin-manager.c:828
+msgid "C_onfigure Plugin"
+msgstr "K_onfigurer tillegg"
+
+#: ../vinagre/vinagre-prefs.c:217
 msgid "Cannot initialize preferences manager."
 msgstr "Kan ikke starte opp innstillingshåndtereren."
 
-#: ../src/vinagre-tab.c:329
+#: ../vinagre/vinagre-tab.c:344
 msgid "Error saving recent connection."
 msgstr "Feil under lagring av siste tilkobling."
 
-#: ../src/vinagre-tab.c:393
+#: ../vinagre/vinagre-tab.c:408
 msgid "Minimize window"
 msgstr "Minimer vindu"
 
 #. Machine menu
-#: ../src/vinagre-tab.c:409 ../src/vinagre-tab.c:410 ../src/vinagre-ui.h:100
+#: ../vinagre/vinagre-tab.c:424 ../vinagre/vinagre-tab.c:425
+#: ../vinagre/vinagre-ui.h:102
 msgid "Take screenshot"
 msgstr "Ta skjermbilde"
 
-#: ../src/vinagre-tab.c:641
+#: ../vinagre/vinagre-tab.c:664
 msgid "Error saving the credentials on the keyring."
 msgstr "Feil under lagring av autentiseringsinformasjon på nøkkelringen."
 
-#: ../src/vinagre-tab.c:681
+#: ../vinagre/vinagre-tab.c:704
 msgid "Could not get a screenshot of the connection."
 msgstr "Kunne ikke ta et skjermbilde av tilkoblingen."
 
-#: ../src/vinagre-tab.c:689
+#: ../vinagre/vinagre-tab.c:712
 #, c-format
 msgid "Screenshot of %s"
 msgstr "Skjermbilde av %s"
 
-#: ../src/vinagre-tab.c:692
+#: ../vinagre/vinagre-tab.c:715
 msgid "Save Screenshot"
 msgstr "Lagre skjermbilde"
 
+#: ../vinagre/vinagre-tab.c:726
+msgid "Supported formats"
+msgstr "Støttede formater"
+
+#: ../vinagre/vinagre-tube-handler.c:228
+#, c-format
+msgid "Impossible to accept the stream tube: %s"
+msgstr ""
+
+#: ../vinagre/vinagre-tube-handler.c:257
+#, c-format
+msgid "Impossible to create the connection: %s"
+msgstr "Klarte ikke å lage tilkoblingen: %s"
+
+#: ../vinagre/vinagre-tube-handler.c:341
+#, c-format
+msgid "Failed to request name: %s"
+msgstr "Klarte ikke å finne navn: %s"
+
+#: ../vinagre/vinagre-tube-handler.c:342
+msgid "No error given"
+msgstr "Ingen feil gitt"
+
+#: ../vinagre/vinagre-tube-handler.c:419
+#, c-format
+msgid "Impossible to get the contact name: %s"
+msgstr ""
+
+#: ../vinagre/vinagre-tube-handler.c:454
+#, c-format
+msgid "Impossible to get the avatar: %s"
+msgstr ""
+
+#: ../vinagre/vinagre-tube-handler.c:475
+#, c-format
+msgid "%s wants to share his desktop with you."
+msgstr ""
+
+#: ../vinagre/vinagre-tube-handler.c:480
+msgid "Desktop sharing invitation"
+msgstr ""
+
 #. Toplevel
-#: ../src/vinagre-ui.h:33
+#: ../vinagre/vinagre-ui.h:33
 msgid "_Machine"
 msgstr "_Maskin"
 
-#: ../src/vinagre-ui.h:34
+#: ../vinagre/vinagre-ui.h:34
 msgid "_Edit"
 msgstr "_Rediger"
 
-#: ../src/vinagre-ui.h:35
+#: ../vinagre/vinagre-ui.h:35
 msgid "_View"
 msgstr "_Vis"
 
-#: ../src/vinagre-ui.h:36
+#: ../vinagre/vinagre-ui.h:36
 msgid "_Bookmarks"
 msgstr "_Bokmerker"
 
-#: ../src/vinagre-ui.h:41
+#: ../vinagre/vinagre-ui.h:41
 msgid "Connect to a remote machine"
 msgstr "Koble til en ekstern maskin"
 
-#: ../src/vinagre-ui.h:43
+#: ../vinagre/vinagre-ui.h:43
 msgid "Open a .VNC file"
 msgstr "Ã?pne en .VNC-fil"
 
-#: ../src/vinagre-ui.h:45
+#: ../vinagre/vinagre-ui.h:45
 msgid "Quit the program"
 msgstr "Avslutt programmet"
 
-#: ../src/vinagre-ui.h:49
+#: ../vinagre/vinagre-ui.h:49
 msgid "Edit the application preferences"
 msgstr "Rediger brukervalg for programmet"
 
+#: ../vinagre/vinagre-ui.h:50
+msgid "_Plugins"
+msgstr "_Tillegg"
+
+#: ../vinagre/vinagre-ui.h:51
+msgid "Select plugins"
+msgstr "Velg tillegg"
+
 #. Bookmarks menu
-#: ../src/vinagre-ui.h:52
+#: ../vinagre/vinagre-ui.h:54
 msgid "_Open bookmark"
 msgstr "_Ã?pne bokmerke"
 
-#: ../src/vinagre-ui.h:53
+#: ../vinagre/vinagre-ui.h:55
 msgid "Connect to this machine"
 msgstr "Koble til denne maskinen"
 
-#: ../src/vinagre-ui.h:54
+#: ../vinagre/vinagre-ui.h:56
 msgid "_Edit bookmark"
 msgstr "_Rediger bokmerke"
 
-#: ../src/vinagre-ui.h:55
+#: ../vinagre/vinagre-ui.h:57
 msgid "Edit the details of selected bookmark"
 msgstr "Rediger detaljene for valgt bokmerke"
 
-#: ../src/vinagre-ui.h:56
+#: ../vinagre/vinagre-ui.h:58
 msgid "_Remove from bookmarks"
 msgstr "_Fjern fra bokmerkene"
 
-#: ../src/vinagre-ui.h:57
+#: ../vinagre/vinagre-ui.h:59
 msgid "Remove current selected connection from bookmarks"
 msgstr "Fjern gjeldende valgte tilkobling fra bokmerkene"
 
-#: ../src/vinagre-ui.h:58
+#: ../vinagre/vinagre-ui.h:60
 msgid "_New Folder"
 msgstr "_Ny mappe"
 
-#: ../src/vinagre-ui.h:59
+#: ../vinagre/vinagre-ui.h:61
 msgid "Create a new folder"
 msgstr "Lag en ny mappe"
 
 #. Help menu
-#: ../src/vinagre-ui.h:62
+#: ../vinagre/vinagre-ui.h:64
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../src/vinagre-ui.h:63
+#: ../vinagre/vinagre-ui.h:65
 msgid "Open the vinagre manual"
 msgstr "Ã?pne manualen for Vinagre"
 
-#: ../src/vinagre-ui.h:65
+#: ../vinagre/vinagre-ui.h:67
 msgid "About this application"
 msgstr "Om dette programmet"
 
-#: ../src/vinagre-ui.h:70
+#: ../vinagre/vinagre-ui.h:72
 msgid "_Toolbar"
 msgstr "_Verktøylinje"
 
-#: ../src/vinagre-ui.h:71
+#: ../vinagre/vinagre-ui.h:73
 msgid "Show or hide the toolbar"
 msgstr "Vis eller skjul verktøylinjen"
 
-#: ../src/vinagre-ui.h:74
+#: ../vinagre/vinagre-ui.h:76
 msgid "_Statusbar"
 msgstr "_Statuslinje"
 
-#: ../src/vinagre-ui.h:75
+#: ../vinagre/vinagre-ui.h:77
 msgid "Show or hide the statusbar"
 msgstr "Vis eller skjul statuslinjen"
 
-#: ../src/vinagre-ui.h:78
+#: ../vinagre/vinagre-ui.h:80
 msgid "Side _Panel"
 msgstr "Side_panel"
 
-#: ../src/vinagre-ui.h:79
+#: ../vinagre/vinagre-ui.h:81
 msgid "Show or hide the side panel"
 msgstr "Vis eller skjul sidepanelet"
 
-#: ../src/vinagre-ui.h:87
+#: ../vinagre/vinagre-ui.h:89
 msgid "Close the current connection"
 msgstr "Lukk gjeldende tilkobling"
 
-#: ../src/vinagre-ui.h:88
+#: ../vinagre/vinagre-ui.h:90
 msgid "C_lose All"
 msgstr "_Lukk alle"
 
-#: ../src/vinagre-ui.h:89
+#: ../vinagre/vinagre-ui.h:91
 msgid "Close all active connections"
 msgstr "Lukk alle aktive tilkoblinger"
 
 #. Bookmarks menu
-#: ../src/vinagre-ui.h:92
+#: ../vinagre/vinagre-ui.h:94
 msgid "_Add to bookmarks"
 msgstr "_Legg til i bokmerker"
 
-#: ../src/vinagre-ui.h:93
+#: ../vinagre/vinagre-ui.h:95
 msgid "Add current connection to your bookmarks"
 msgstr "Legg til gjeldende tilkobling til dine bokmerker"
 
-#: ../src/vinagre-ui.h:101
+#: ../vinagre/vinagre-ui.h:103
 msgid "Take a screenshot of active connection"
 msgstr "Ta et skjermbilde av den aktive tilkoblingen"
 
-#: ../src/vinagre-ui.h:105
+#: ../vinagre/vinagre-ui.h:107
 msgid "View the current machine in full screen"
 msgstr "Vis gjeldende tilkobling i fullskjerm"
 
-#: ../src/vinagre-utils.c:75
+#: ../vinagre/vinagre-utils.c:75
 msgid "An error has occurred:"
 msgstr "En feil har oppstått:"
 
-#: ../src/vinagre-utils.c:433
-msgid "Vinagre is a VNC client for the GNOME Desktop"
+#: ../vinagre/vinagre-utils.c:150
+#, fuzzy, c-format
+msgid "Could not load builder file: %s"
+msgstr "Kunne ikke åpne filen."
+
+#: ../vinagre/vinagre-utils.c:453
+#, fuzzy
+msgid "Vinagre is a remote desktop viewer for the GNOME Desktop"
 msgstr "Vinagre er en VNC-klient for GNOME-skrivebordet"
 
-#: ../src/vinagre-utils.c:436
+#: ../vinagre/vinagre-utils.c:456
 msgid ""
 "Vinagre is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
@@ -654,7 +933,7 @@ msgstr ""
 "Software Foundation; enten versjon 2 av lisensen, eller (hvis du ønsker det) "
 "enhver senere versjon."
 
-#: ../src/vinagre-utils.c:440
+#: ../vinagre/vinagre-utils.c:460
 msgid ""
 "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -665,7 +944,7 @@ msgstr ""
 "GARANTI, ikke engang implisitt garanti om at det er SALGBART eller PASSER ET "
 "BESTEMT FORMÃ?L. Se GNU General Public License for detaljer."
 
-#: ../src/vinagre-utils.c:444
+#: ../vinagre/vinagre-utils.c:464
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see <http://www.gnu.org/licenses/>."
@@ -673,121 +952,27 @@ msgstr ""
 "Du skal ha mottatt en kopi av GNU General Public License sammen med dette "
 "programmet. Hvis ikke, se på <http://www.gnu.org/licenses/>."
 
-#: ../src/vinagre-utils.c:466
+#: ../vinagre/vinagre-utils.c:486
 msgid "translator-credits"
 msgstr ""
 "Kjartan Maraas <kmaraas gnome org>\n"
 "Espen Stefansen <libbe AT stefansen DOT net>"
 
-#: ../src/vinagre-utils.c:469
+#: ../vinagre/vinagre-utils.c:489
 msgid "Vinagre Website"
 msgstr "Hjemmeside for Vinagre"
 
-#: ../src/vinagre-vnc-connection.c:198
-#, c-format
-msgid ""
-"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it."
-msgstr ""
-"Ugyldig verdi for flagget «shared»: %d. Verdien skal være 0 eller 1. Overser "
-"den."
-
-#: ../src/vinagre-vnc-tab.c:131
-msgid "Desktop Name:"
-msgstr "Skrivebordsnavn:"
-
-#: ../src/vinagre-vnc-tab.c:133
-msgid "Port:"
-msgstr "Port:"
-
-#: ../src/vinagre-vnc-tab.c:134
-msgid "Dimensions:"
-msgstr "Dimensjoner:"
-
-#: ../src/vinagre-vnc-tab.c:253
-msgid "Error connecting to host."
-msgstr "Feil ved tilkobling til verten."
-
-#: ../src/vinagre-vnc-tab.c:289
-#, c-format
-msgid "Authentication method to host <i>%s</i> is unsupported. (%u)"
-msgstr "Autentiseringsmetoden mot verten <i>%s</i> er ikke støttet. (%u)"
-
-#: ../src/vinagre-vnc-tab.c:293
-msgid "Authentication unsupported"
-msgstr "Autentisering er ikke støttet"
-
-#: ../src/vinagre-vnc-tab.c:560 ../src/vinagre-vnc-tab.c:577
-msgid "Authentication error"
-msgstr "Feil ved autentisering"
-
-#: ../src/vinagre-vnc-tab.c:561
-msgid "A username is required in order to access this machine."
-msgstr "Et brukernavn kreves for å få tilgang til denne maskinen."
-
-#: ../src/vinagre-vnc-tab.c:578
-msgid "A password is required in order to access this machine."
-msgstr "Et passord kreves for å få tilgang til denne maskinen."
-
-#: ../src/vinagre-vnc-tab.c:628
-msgid "S_caling"
-msgstr "S_kalering"
-
-#: ../src/vinagre-vnc-tab.c:629
-msgid "Fits the remote screen into the current window size"
-msgstr "Tilpass ekstern skjerm til størrelsen på aktivt vindu"
-
-#: ../src/vinagre-vnc-tab.c:644
-msgid "Does not send mouse and keyboard events"
-msgstr "Ikke send hendelser for mus og tastatur"
-
-#: ../src/vinagre-vnc-tab.c:657
-msgid "_Original size"
-msgstr "_Opprinnelig størrelse"
-
-#: ../src/vinagre-vnc-tab.c:658
-msgid "Adjusts the window to the remote desktop's size"
-msgstr "Justerer vinduet til samme størrelse som eksternt skrivebord"
-
-#: ../src/vinagre-vnc-tab.c:681 ../src/vinagre-vnc-tab.c:749
-#: ../src/vinagre-vnc-tab.c:750
-msgid "Send Ctrl-Alt-Del"
-msgstr "Sende Ctrl+alt+del"
-
-#: ../src/vinagre-vnc-tab.c:682
-msgid "Sends Ctrl+Alt+Del to the remote machine"
-msgstr "Sender Ctrl+alt+del til ekstern maskin"
-
-#: ../src/vinagre-vnc-tab.c:728 ../src/vinagre-vnc-tab.c:729
-msgid "Scaling"
-msgstr "Skalering"
-
-#: ../src/vinagre-vnc-tab.c:738 ../src/vinagre-vnc-tab.c:739
-msgid "Read only"
-msgstr "Bare se"
-
-#: ../src/vinagre-vnc-tab.c:907
-msgid ""
-"Scaling is not supported on this installation.\n"
-"\n"
-"Read the README file (shipped with Vinagre) in order to know how to enable "
-"this feature."
-msgstr ""
-"Skalering er ikke støttet på denne installasjonen.\n"
-"\n"
-"Les filen README, som distribueres med Vinagre, for å finne ut hvordan du "
-"aktiverer denne funksjonen."
-
-#: ../src/vinagre-window.c:393
+#: ../vinagre/vinagre-window.c:397
 #, c-format
 msgid "Could not merge vinagre-ui.xml: %s"
 msgstr "Klarte ikke å slå sammen vinagre-ui.xml: %s"
 
-#: ../src/vinagre-window.c:421
+#: ../vinagre/vinagre-window.c:425
 msgid "_Recent connections"
 msgstr "_Siste tilkoblinger"
 
 #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu
-#: ../src/vinagre-window.c:579
+#: ../vinagre/vinagre-window.c:585
 #, c-format
 msgid "Open %s:%d"
 msgstr "Ã?pne %s:%d"