Updated Norwegian bokmål translation

diff --git a/po/nb.po b/po/nb.po
index f2d5212f312b92a6d5c0fd8d495684ab409b3362..b0ae7e2fe78364b808ee71b729d4eb05dbce2985 100644 (file)
--- a/po/nb.po
+++ b/po/nb.po
@@ -5,9 +5,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy 2.29.4\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy 2.29.4\n"

-"Report-Msgid-Bugs-To:\n"
-"POT-Creation-Date: 2010-01-19 14:08+0100\n"
-"PO-Revision-Date: 2010-01-19 14:14+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-02-10 21:47+0100\n"
+"PO-Revision-Date: 2010-02-10 21:50+0100\n"

 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"


@@ -283,7 +283,8 @@ msgstr "Om Empathy skal redusere nøyaktighet for lokasjon av personvernhensyn."
 #: ../data/empathy.schemas.in.h:61
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 #: ../data/empathy.schemas.in.h:61
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."

-msgstr "Om Empathy skal bruke personbilde for kontakten som ikon for pratevinduet."
+msgstr ""
+"Om Empathy skal bruke personbilde for kontakten som ikon for pratevinduet."

 
 #: ../data/empathy.schemas.in.h:62
 msgid ""
 
 #: ../data/empathy.schemas.in.h:62
 msgid ""


@@ -311,12 +312,15 @@ msgstr "Om smilefjes skal konverteres til grafiske bilder i samtaler."
 
 #: ../data/empathy.schemas.in.h:67
 msgid "Whether to play a sound to notify of contacts logging into the network."
 
 #: ../data/empathy.schemas.in.h:67
 msgid "Whether to play a sound to notify of contacts logging into the network."

-msgstr "Om en lyd skal spilles av for å varsle om at kontakter logger inn på nettverket."
+msgstr ""
+"Om en lyd skal spilles av for å varsle om at kontakter logger inn på "
+"nettverket."

 
 #: ../data/empathy.schemas.in.h:68
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 
 #: ../data/empathy.schemas.in.h:68
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."

-msgstr "Om en lyd skal spilles av for å varsle at kontakter logger ut av nettverket."
+msgstr ""
+"Om en lyd skal spilles av for å varsle at kontakter logger ut av nettverket."

 
 #: ../data/empathy.schemas.in.h:69
 msgid "Whether to play a sound to notify of events."
 
 #: ../data/empathy.schemas.in.h:69
 msgid "Whether to play a sound to notify of events."


@@ -438,7 +442,8 @@ msgstr "Valgt fil er ikke en vanlig fil"
 msgid "The selected file is empty"
 msgstr "Valgt fil er tom"
 
 msgid "The selected file is empty"
 msgstr "Valgt fil er tom"
 

-#: ../libempathy/empathy-tp-contact-list.c:834 ../src/empathy.c:293
+#: ../libempathy/empathy-tp-contact-list.c:834
+#: ../src/empathy-auto-salut-account-helper.c:96

 msgid "People nearby"
 msgstr "Personer i nærheten"
 
 msgid "People nearby"
 msgstr "Personer i nærheten"
 


@@ -550,15 +555,15 @@ msgstr "Selvsignert sertifikat"
 msgid "Certificate error"
 msgstr "Sertifikatsfeil"
 
 msgid "Certificate error"
 msgstr "Sertifikatsfeil"
 

-#: ../libempathy/empathy-utils.c:424 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:429 ../src/empathy-import-mc4-accounts.c:104

 msgid "People Nearby"
 msgstr "Personer i nærheten"
 
 msgid "People Nearby"
 msgstr "Personer i nærheten"
 

-#: ../libempathy/empathy-utils.c:429
+#: ../libempathy/empathy-utils.c:434

 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 

-#: ../libempathy/empathy-utils.c:430
+#: ../libempathy/empathy-utils.c:435

 msgid "Facebook Chat"
 msgstr "Facebook-prat"
 
 msgid "Facebook Chat"
 msgstr "Facebook-prat"
 


@@ -618,11 +623,11 @@ msgstr "Alle"
 msgid "%s:"
 msgstr "%s:"
 
 msgid "%s:"
 msgstr "%s:"
 

-#: ../libempathy-gtk/empathy-account-widget.c:1320
+#: ../libempathy-gtk/empathy-account-widget.c:1329

 msgid "L_og in"
 msgstr "L_ogg inn"
 
 msgid "L_og in"
 msgstr "L_ogg inn"
 

-#: ../libempathy-gtk/empathy-account-widget.c:1387
+#: ../libempathy-gtk/empathy-account-widget.c:1396

 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1


@@ -630,15 +635,15 @@ msgstr "L_ogg inn"
 msgid "Account:"
 msgstr "Konto:"
 
 msgid "Account:"
 msgstr "Konto:"
 

-#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget.c:1407

 msgid "Enabled"
 msgstr "Aktivert"
 
 msgid "Enabled"
 msgstr "Aktivert"
 

-#: ../libempathy-gtk/empathy-account-widget.c:1460
+#: ../libempathy-gtk/empathy-account-widget.c:1472

 msgid "This account already exists on the server"
 msgstr "Denne kontoen eksisterer allerede på tjeneren"
 
 msgid "This account already exists on the server"
 msgstr "Denne kontoen eksisterer allerede på tjeneren"
 

-#: ../libempathy-gtk/empathy-account-widget.c:1463
+#: ../libempathy-gtk/empathy-account-widget.c:1475

 msgid "Create a new account on the server"
 msgstr "Lag en ny konto på tjeneren"
 
 msgid "Create a new account on the server"
 msgstr "Lag en ny konto på tjeneren"
 


@@ -647,19 +652,19 @@ msgstr "Lag en ny konto på tjeneren"
 #. * like: "MyUserName on chat.freenode.net".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
 #. * like: "MyUserName on chat.freenode.net".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.

-#: ../libempathy-gtk/empathy-account-widget.c:1846
+#: ../libempathy-gtk/empathy-account-widget.c:1858

 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s av %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s av %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"

-#: ../libempathy-gtk/empathy-account-widget.c:1864
+#: ../libempathy-gtk/empathy-account-widget.c:1876

 #, c-format
 msgid "%s Account"
 msgstr "%s-konto"
 
 #, c-format
 msgid "%s Account"
 msgstr "%s-konto"
 

-#: ../libempathy-gtk/empathy-account-widget.c:1868
+#: ../libempathy-gtk/empathy-account-widget.c:1880

 msgid "New account"
 msgstr "Ny konto"
 
 msgid "New account"
 msgstr "Ny konto"
 


@@ -1105,13 +1110,12 @@ msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: tøm alle meldinger fra aktiv samtale"
 
 #: ../libempathy-gtk/empathy-chat.c:818
 msgstr "/clear: tøm alle meldinger fra aktiv samtale"
 
 #: ../libempathy-gtk/empathy-chat.c:818

-#, fuzzy

 msgid "/topic <topic>: set the topic of the current conversation"
 msgid "/topic <topic>: set the topic of the current conversation"

-msgstr "/clear, tøm alle meldinger fra aktiv samtale"
+msgstr "/topic <emne>: sett emne for aktiv samtale"

 
 #: ../libempathy-gtk/empathy-chat.c:821
 msgid "/join <chat room ID>: join a new chat room"
 
 #: ../libempathy-gtk/empathy-chat.c:821
 msgid "/join <chat room ID>: join a new chat room"

-msgstr ""
+msgstr "/join <ID for praterom>: bli med i et nytt praterom"

 
 #: ../libempathy-gtk/empathy-chat.c:824
 msgid "/j <chat room ID>: join a new chat room"
 
 #: ../libempathy-gtk/empathy-chat.c:824
 msgid "/j <chat room ID>: join a new chat room"


@@ -1160,63 +1164,63 @@ msgstr "Ukjent kommando"
 msgid "Unknown command; see /help for the available commands"
 msgstr "Ukjent kommando; se /help for tilgjengelige kommandoer"
 
 msgid "Unknown command; see /help for the available commands"
 msgstr "Ukjent kommando; se /help for tilgjengelige kommandoer"
 

-#: ../libempathy-gtk/empathy-chat.c:1143
+#: ../libempathy-gtk/empathy-chat.c:1144

 msgid "offline"
 msgstr "frakoblet"
 
 msgid "offline"
 msgstr "frakoblet"
 

-#: ../libempathy-gtk/empathy-chat.c:1146
+#: ../libempathy-gtk/empathy-chat.c:1147

 msgid "invalid contact"
 msgstr "ugyldig kontakt"
 
 msgid "invalid contact"
 msgstr "ugyldig kontakt"
 

-#: ../libempathy-gtk/empathy-chat.c:1149
+#: ../libempathy-gtk/empathy-chat.c:1150

 msgid "permission denied"
 msgstr "tilgang nektet"
 
 msgid "permission denied"
 msgstr "tilgang nektet"
 

-#: ../libempathy-gtk/empathy-chat.c:1152
+#: ../libempathy-gtk/empathy-chat.c:1153

 msgid "too long message"
 msgstr "meldingen er for lang"
 
 msgid "too long message"
 msgstr "meldingen er for lang"
 

-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1156

 msgid "not implemented"
 msgstr "ikke implementert"
 
 msgid "not implemented"
 msgstr "ikke implementert"
 

-#: ../libempathy-gtk/empathy-chat.c:1158
+#: ../libempathy-gtk/empathy-chat.c:1159

 msgid "unknown"
 msgstr "ukjent"
 
 msgid "unknown"
 msgstr "ukjent"
 

-#: ../libempathy-gtk/empathy-chat.c:1162
+#: ../libempathy-gtk/empathy-chat.c:1163

 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Feil ved sending av melding «%s»: %s"
 
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Feil ved sending av melding «%s»: %s"
 

-#: ../libempathy-gtk/empathy-chat.c:1192
+#: ../libempathy-gtk/empathy-chat.c:1193

 #, c-format
 msgid "Topic set to: %s"
 msgstr "Emnet er satt til: %s"
 
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Emnet er satt til: %s"
 

-#: ../libempathy-gtk/empathy-chat.c:1194
+#: ../libempathy-gtk/empathy-chat.c:1195

 msgid "No topic defined"
 msgstr "Emne ikke definert"
 
 msgid "No topic defined"
 msgstr "Emne ikke definert"
 

-#: ../libempathy-gtk/empathy-chat.c:1595
+#: ../libempathy-gtk/empathy-chat.c:1594

 msgid "(No Suggestions)"
 msgstr "(Ingen forslag)"
 
 msgid "(No Suggestions)"
 msgstr "(Ingen forslag)"
 

-#: ../libempathy-gtk/empathy-chat.c:1649
+#: ../libempathy-gtk/empathy-chat.c:1648

 msgid "Insert Smiley"
 msgstr "Sett inn smilefjes"
 
 #. send button
 msgid "Insert Smiley"
 msgstr "Sett inn smilefjes"
 
 #. send button

-#: ../libempathy-gtk/empathy-chat.c:1667
+#: ../libempathy-gtk/empathy-chat.c:1666

 #: ../libempathy-gtk/empathy-ui-utils.c:1658
 msgid "_Send"
 msgstr "_Send"
 
 #: ../libempathy-gtk/empathy-ui-utils.c:1658
 msgid "_Send"
 msgstr "_Send"
 

-#: ../libempathy-gtk/empathy-chat.c:1701
+#: ../libempathy-gtk/empathy-chat.c:1700

 msgid "_Spelling Suggestions"
 msgstr "_Staveforslag"
 
 msgid "_Spelling Suggestions"
 msgstr "_Staveforslag"
 

-#: ../libempathy-gtk/empathy-chat.c:1816
+#: ../libempathy-gtk/empathy-chat.c:1815

 #, c-format
 msgid "%s has disconnected"
 msgstr "%s har koblet fra"
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s har koblet fra"


@@ -1224,12 +1228,12 @@ msgstr "%s har koblet fra"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.

-#: ../libempathy-gtk/empathy-chat.c:1823
+#: ../libempathy-gtk/empathy-chat.c:1822

 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s ble sparket av %2$s"
 
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s ble sparket av %2$s"
 

-#: ../libempathy-gtk/empathy-chat.c:1826
+#: ../libempathy-gtk/empathy-chat.c:1825

 #, c-format
 msgid "%s was kicked"
 msgstr "%s ble sparket"
 #, c-format
 msgid "%s was kicked"
 msgstr "%s ble sparket"


@@ -1237,17 +1241,17 @@ msgstr "%s ble sparket"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.

-#: ../libempathy-gtk/empathy-chat.c:1834
+#: ../libempathy-gtk/empathy-chat.c:1833

 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s ble bannlyst av %2$s"
 
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s ble bannlyst av %2$s"
 

-#: ../libempathy-gtk/empathy-chat.c:1837
+#: ../libempathy-gtk/empathy-chat.c:1836

 #, c-format
 msgid "%s was banned"
 msgstr "%s ble bannlyst"
 
 #, c-format
 msgid "%s was banned"
 msgstr "%s ble bannlyst"
 

-#: ../libempathy-gtk/empathy-chat.c:1841
+#: ../libempathy-gtk/empathy-chat.c:1840

 #, c-format
 msgid "%s has left the room"
 msgstr "%s har forlatt rommet"
 #, c-format
 msgid "%s has left the room"
 msgstr "%s har forlatt rommet"


@@ -1257,63 +1261,63 @@ msgstr "%s har forlatt rommet"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.

-#: ../libempathy-gtk/empathy-chat.c:1850
+#: ../libempathy-gtk/empathy-chat.c:1849

 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 

-#: ../libempathy-gtk/empathy-chat.c:1875
+#: ../libempathy-gtk/empathy-chat.c:1874

 #, c-format
 msgid "%s has joined the room"
 msgstr "%s har blitt med i rommet"
 
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s har blitt med i rommet"
 

-#: ../libempathy-gtk/empathy-chat.c:1900
+#: ../libempathy-gtk/empathy-chat.c:1899

 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s er nå kjent som %s"
 
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s er nå kjent som %s"
 

-#: ../libempathy-gtk/empathy-chat.c:2035 ../src/empathy-call-window.c:1531
+#: ../libempathy-gtk/empathy-chat.c:2034 ../src/empathy-call-window.c:1531

 msgid "Disconnected"
 msgstr "Koblet fra"
 
 msgid "Disconnected"
 msgstr "Koblet fra"
 

-#: ../libempathy-gtk/empathy-chat.c:2570
+#: ../libempathy-gtk/empathy-chat.c:2568

 msgid "Wrong password; please try again:"
 msgstr "Feil passord; vennligst prøv igjen:"
 
 msgid "Wrong password; please try again:"
 msgstr "Feil passord; vennligst prøv igjen:"
 

-#: ../libempathy-gtk/empathy-chat.c:2571
+#: ../libempathy-gtk/empathy-chat.c:2569

 msgid "Retry"
 msgstr "Prøv igjen"
 
 msgid "Retry"
 msgstr "Prøv igjen"
 

-#: ../libempathy-gtk/empathy-chat.c:2576
+#: ../libempathy-gtk/empathy-chat.c:2574

 msgid "This room is protected by a password:"
 msgstr "Dette rommet er beskyttet med et passord:"
 
 msgid "This room is protected by a password:"
 msgstr "Dette rommet er beskyttet med et passord:"
 

-#: ../libempathy-gtk/empathy-chat.c:2577
+#: ../libempathy-gtk/empathy-chat.c:2575

 msgid "Join"
 msgstr "Bli med"
 
 msgid "Join"
 msgstr "Bli med"
 

-#: ../libempathy-gtk/empathy-chat.c:2717
+#: ../libempathy-gtk/empathy-chat.c:2715

 msgid "Connected"
 msgstr "Koblet til"
 
 msgid "Connected"
 msgstr "Koblet til"
 

-#: ../libempathy-gtk/empathy-chat.c:2770
-#: ../libempathy-gtk/empathy-log-window.c:546
+#: ../libempathy-gtk/empathy-chat.c:2768
+#: ../libempathy-gtk/empathy-log-window.c:548

 msgid "Conversation"
 msgstr "Samtale"
 
 msgid "Conversation"
 msgstr "Samtale"
 

-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:680
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:681

 msgid "Topic:"
 msgstr "Emne:"
 
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:317
 msgid "Topic:"
 msgstr "Emne:"
 
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:317

-#: ../libempathy-gtk/empathy-theme-adium.c:817
+#: ../libempathy-gtk/empathy-theme-adium.c:823

 msgid "_Copy Link Address"
 msgstr "_Kopier lenkens adresse"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:324
 msgid "_Copy Link Address"
 msgstr "_Kopier lenkens adresse"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:324

-#: ../libempathy-gtk/empathy-theme-adium.c:824
+#: ../libempathy-gtk/empathy-theme-adium.c:830

 msgid "_Open Link"
 msgstr "_Åpne lenke"
 
 msgid "_Open Link"
 msgstr "_Åpne lenke"
 


@@ -1323,15 +1327,15 @@ msgstr "_Åpne lenke"
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 

-#: ../libempathy-gtk/empathy-contact-dialogs.c:238
+#: ../libempathy-gtk/empathy-contact-dialogs.c:249

 msgid "Edit Contact Information"
 msgstr "Endre kontaktinformasjon"
 
 msgid "Edit Contact Information"
 msgstr "Endre kontaktinformasjon"
 

-#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+#: ../libempathy-gtk/empathy-contact-dialogs.c:300

 msgid "Personal Information"
 msgstr "Personlig informasjon"
 
 msgid "Personal Information"
 msgstr "Personlig informasjon"
 

-#: ../libempathy-gtk/empathy-contact-dialogs.c:394
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405

 msgid "New Contact"
 msgstr "Ny kontakt"
 
 msgid "New Contact"
 msgstr "Ny kontakt"
 


@@ -1343,28 +1347,28 @@ msgstr "A_vgjør senere"
 msgid "Subscription Request"
 msgstr "Abonnementsforespørsel"
 
 msgid "Subscription Request"
 msgstr "Abonnementsforespørsel"
 

-#: ../libempathy-gtk/empathy-contact-list-view.c:1512
+#: ../libempathy-gtk/empathy-contact-list-view.c:1516

 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Vil du virkelig fjerne gruppen «%s»?"
 
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Vil du virkelig fjerne gruppen «%s»?"
 

-#: ../libempathy-gtk/empathy-contact-list-view.c:1514
+#: ../libempathy-gtk/empathy-contact-list-view.c:1518

 msgid "Removing group"
 msgstr "Fjerner gruppe"
 
 #. Remove
 msgid "Removing group"
 msgstr "Fjerner gruppe"
 
 #. Remove

-#: ../libempathy-gtk/empathy-contact-list-view.c:1561
-#: ../libempathy-gtk/empathy-contact-list-view.c:1638
+#: ../libempathy-gtk/empathy-contact-list-view.c:1565
+#: ../libempathy-gtk/empathy-contact-list-view.c:1642

 #: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Remove"
 msgstr "Fje_rn"
 
 #: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Remove"
 msgstr "Fje_rn"
 

-#: ../libempathy-gtk/empathy-contact-list-view.c:1591
+#: ../libempathy-gtk/empathy-contact-list-view.c:1595

 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Vil du virkelig fjerne kontakten «%s»?"
 
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Vil du virkelig fjerne kontakten «%s»?"
 

-#: ../libempathy-gtk/empathy-contact-list-view.c:1593
+#: ../libempathy-gtk/empathy-contact-list-view.c:1597

 msgid "Removing contact"
 msgstr "Fjerner kontakt"
 
 msgid "Removing contact"
 msgstr "Fjerner kontakt"
 


@@ -1405,17 +1409,17 @@ msgstr "Del mitt skrivebord"
 msgid "Infor_mation"
 msgstr "Infor_masjon"
 
 msgid "Infor_mation"
 msgstr "Infor_masjon"
 

-#: ../libempathy-gtk/empathy-contact-menu.c:441
-#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19
+#: ../libempathy-gtk/empathy-contact-menu.c:443
+msgctxt "Edit contact (contextual menu)"

 msgid "_Edit"
 msgid "_Edit"

-msgstr "_Rediger"
+msgstr "R_ediger"

 
 

-#: ../libempathy-gtk/empathy-contact-menu.c:496
-#: ../src/empathy-chat-window.c:865
+#: ../libempathy-gtk/empathy-contact-menu.c:497
+#: ../src/empathy-chat-window.c:866

 msgid "Inviting you to this room"
 msgstr "Inviterer deg til dette rommet"
 
 msgid "Inviting you to this room"
 msgstr "Inviterer deg til dette rommet"
 

-#: ../libempathy-gtk/empathy-contact-menu.c:527
+#: ../libempathy-gtk/empathy-contact-menu.c:528

 msgid "_Invite to chat room"
 msgstr "_Inviter til praterom"
 
 msgid "_Invite to chat room"
 msgstr "_Inviter til praterom"
 


@@ -1428,7 +1432,7 @@ msgid "Select"
 msgstr "Velg"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:244
 msgstr "Velg"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:244

-#: ../src/empathy-main-window.c:1053
+#: ../src/empathy-main-window.c:1042

 msgid "Group"
 msgstr "Gruppe"
 
 msgid "Group"
 msgstr "Gruppe"
 


@@ -1634,12 +1638,12 @@ msgstr "Port"
 msgid "SSL"
 msgstr "SSL"
 
 msgid "SSL"
 msgstr "SSL"
 

-#: ../libempathy-gtk/empathy-log-window.c:539
+#: ../libempathy-gtk/empathy-log-window.c:541

 #: ../src/empathy-import-widget.c:310
 msgid "Account"
 msgstr "Konto"
 
 #: ../src/empathy-import-widget.c:310
 msgid "Account"
 msgstr "Konto"
 

-#: ../libempathy-gtk/empathy-log-window.c:556
+#: ../libempathy-gtk/empathy-log-window.c:558

 msgid "Date"
 msgstr "Dato"
 
 msgid "Date"
 msgstr "Dato"
 


@@ -1731,6 +1735,10 @@ msgid "Find:"
 msgstr "Finn:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
 msgstr "Finn:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2

+msgid "Match case"
+msgstr "Skill mellom små/store bokstaver"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3

 msgid "Phrase not found"
 msgstr "Teksten ble ikke funnet"
 
 msgid "Phrase not found"
 msgstr "Teksten ble ikke funnet"
 


@@ -2001,23 +2009,23 @@ msgstr "Ingen feilmelding"
 msgid "Instant Message (Empathy)"
 msgstr "Lynmelding (Empathy)"
 
 msgid "Instant Message (Empathy)"
 msgstr "Lynmelding (Empathy)"
 

-#: ../src/empathy.c:887
+#: ../src/empathy.c:766

 msgid "Don't connect on startup"
 msgstr "Ikke koble til ved oppstart"
 
 msgid "Don't connect on startup"
 msgstr "Ikke koble til ved oppstart"
 

-#: ../src/empathy.c:891
+#: ../src/empathy.c:770

 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Ikke vis kontaktlisten eller andre dialoger ved oppstart"
 
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Ikke vis kontaktlisten eller andre dialoger ved oppstart"
 

-#: ../src/empathy.c:895
+#: ../src/empathy.c:774

 msgid "Show the accounts dialog"
 msgstr "Vis kontovinduet"
 
 msgid "Show the accounts dialog"
 msgstr "Vis kontovinduet"
 

-#: ../src/empathy.c:907
+#: ../src/empathy.c:786

 msgid "- Empathy IM Client"
 msgstr "- Empathy lynmeldingsprogram"
 
 msgid "- Empathy IM Client"
 msgstr "- Empathy lynmeldingsprogram"
 

-#: ../src/empathy-about-dialog.c:84
+#: ../src/empathy-about-dialog.c:85

 msgid ""
 "Empathy 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 "
 msgid ""
 "Empathy 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 "


@@ -2029,7 +2037,7 @@ msgstr ""
 "Software Foundation; enten versjon 2 av lisensen, eller (hvis du ønsker det) "
 "enhver senere versjon."
 
 "Software Foundation; enten versjon 2 av lisensen, eller (hvis du ønsker det) "
 "enhver senere versjon."
 

-#: ../src/empathy-about-dialog.c:88
+#: ../src/empathy-about-dialog.c:89

 msgid ""
 "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
 msgid ""
 "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "


@@ -2040,7 +2048,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."
 
 "GARANTI, ikke engang implisitt garanti om at det er SALGBART eller PASSER ET "
 "BESTEMT FORMÅL. Se GNU General Public License for detaljer."
 

-#: ../src/empathy-about-dialog.c:92
+#: ../src/empathy-about-dialog.c:93

 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "


@@ -2050,39 +2058,39 @@ msgstr ""
 "Hvis ikke så skriv til Free Software Foundation, Inc., 51 Franklin Street, "
 "Fifth Floor, Boston, MA 02110-1301159, USA."
 
 "Hvis ikke så skriv til Free Software Foundation, Inc., 51 Franklin Street, "
 "Fifth Floor, Boston, MA 02110-1301159, USA."
 

-#: ../src/empathy-about-dialog.c:120
+#: ../src/empathy-about-dialog.c:121

 msgid "An Instant Messaging client for GNOME"
 msgstr "En meldingsklient for GNOME"
 
 msgid "An Instant Messaging client for GNOME"
 msgstr "En meldingsklient for GNOME"
 

-#: ../src/empathy-about-dialog.c:126
+#: ../src/empathy-about-dialog.c:127

 msgid "translator-credits"
 msgstr ""
 "Kjartan Maraas\n"
 "Sigurd Gartmann\n"
 "Espen Stefansen"
 
 msgid "translator-credits"
 msgstr ""
 "Kjartan Maraas\n"
 "Sigurd Gartmann\n"
 "Espen Stefansen"
 

-#: ../src/empathy-account-assistant.c:118
+#: ../src/empathy-account-assistant.c:166

 msgid "There was an error while importing the accounts."
 msgstr "Det oppsto en feil under import av kontoene."
 
 msgid "There was an error while importing the accounts."
 msgstr "Det oppsto en feil under import av kontoene."
 

-#: ../src/empathy-account-assistant.c:121
+#: ../src/empathy-account-assistant.c:169

 msgid "There was an error while parsing the account details."
 msgstr "Det oppsto en feil under innlesing av detaljer for kontoen."
 
 msgid "There was an error while parsing the account details."
 msgstr "Det oppsto en feil under innlesing av detaljer for kontoen."
 

-#: ../src/empathy-account-assistant.c:124
+#: ../src/empathy-account-assistant.c:172

 msgid "There was an error while creating the account."
 msgstr "Det oppsto en feil under oppretting av kontoen."
 
 msgid "There was an error while creating the account."
 msgstr "Det oppsto en feil under oppretting av kontoen."
 

-#: ../src/empathy-account-assistant.c:126
+#: ../src/empathy-account-assistant.c:174

 msgid "There was an error."
 msgstr "Det oppsto en feil."
 
 msgid "There was an error."
 msgstr "Det oppsto en feil."
 

-#: ../src/empathy-account-assistant.c:141
+#: ../src/empathy-account-assistant.c:178

 #, c-format
 #, c-format

-msgid "The error message was: <span style=\"italic\">%s</span>"
-msgstr "Feilmeldingen var: <span style=\"italic\">%s</span>"
+msgid "The error message was: %s"
+msgstr "Feilmeldingen var: %s"

 
 

-#: ../src/empathy-account-assistant.c:149
+#: ../src/empathy-account-assistant.c:182

 msgid ""
 "You can either go back and try to enter your accounts' details again or quit "
 "this assistant and add accounts later from the Edit menu."
 msgid ""
 "You can either go back and try to enter your accounts' details again or quit "
 "this assistant and add accounts later from the Edit menu."


@@ -2090,7 +2098,8 @@ msgstr ""
 "Du kan enten gå tilbake og prøve å oppgi detaljer for kontoen igjen eller "
 "avslutte assistenten og legge til kontoer senere fra Rediger-menyen."
 
 "Du kan enten gå tilbake og prøve å oppgi detaljer for kontoen igjen eller "
 "avslutte assistenten og legge til kontoer senere fra Rediger-menyen."
 

-#: ../src/empathy-account-assistant.c:184
+#: ../src/empathy-account-assistant.c:219
+#: ../src/empathy-account-assistant.c:1263

 msgid "An error occurred"
 msgstr "En feil oppsto"
 
 msgid "An error occurred"
 msgstr "En feil oppsto"
 


@@ -2100,36 +2109,36 @@ msgstr "En feil oppsto"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.

-#: ../src/empathy-account-assistant.c:331 ../src/empathy-accounts-dialog.c:552
+#: ../src/empathy-account-assistant.c:406 ../src/empathy-accounts-dialog.c:553

 #, c-format
 msgid "New %s account"
 msgstr "Ny %s-konto"
 
 #, c-format
 msgid "New %s account"
 msgstr "Ny %s-konto"
 

-#: ../src/empathy-account-assistant.c:403
+#: ../src/empathy-account-assistant.c:483

 msgid "What kind of chat account do you have?"
 msgstr "Hvilken type konto har du?"
 
 msgid "What kind of chat account do you have?"
 msgstr "Hvilken type konto har du?"
 

-#: ../src/empathy-account-assistant.c:409
+#: ../src/empathy-account-assistant.c:489

 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "Har du noen andre lynmeldingskontoer du vil sette opp?"
 
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "Har du noen andre lynmeldingskontoer du vil sette opp?"
 

-#: ../src/empathy-account-assistant.c:415
+#: ../src/empathy-account-assistant.c:495

 msgid "Enter your account details"
 msgstr "Oppgi detaljer for konto"
 
 msgid "Enter your account details"
 msgstr "Oppgi detaljer for konto"
 

-#: ../src/empathy-account-assistant.c:420
+#: ../src/empathy-account-assistant.c:500

 msgid "What kind of chat account do you want to create?"
 msgstr "Hvilken type lynmeldingskonto vil du lage?"
 
 msgid "What kind of chat account do you want to create?"
 msgstr "Hvilken type lynmeldingskonto vil du lage?"
 

-#: ../src/empathy-account-assistant.c:426
+#: ../src/empathy-account-assistant.c:506

 msgid "Do you want to create other chat accounts?"
 msgstr "Vil du lage flere lynmeldingskontoer?"
 
 msgid "Do you want to create other chat accounts?"
 msgstr "Vil du lage flere lynmeldingskontoer?"
 

-#: ../src/empathy-account-assistant.c:433
+#: ../src/empathy-account-assistant.c:513

 msgid "Enter the details for the new account"
 msgstr "Oppgi detaljer for den nye kontoen"
 
 msgid "Enter the details for the new account"
 msgstr "Oppgi detaljer for den nye kontoen"
 

-#: ../src/empathy-account-assistant.c:519
+#: ../src/empathy-account-assistant.c:628

 msgid ""
 "With Empathy you can chat with people online nearby and with friends and "
 "colleagues who use Google Talk, AIM, Windows Live and many other chat "
 msgid ""
 "With Empathy you can chat with people online nearby and with friends and "
 "colleagues who use Google Talk, AIM, Windows Live and many other chat "


@@ -2141,48 +2150,82 @@ msgstr ""
 "prateprogrammer. Hvis du har en mikrofon eller et nettkamera kan du også ha "
 "lyd- og bildesamtaler."
 
 "prateprogrammer. Hvis du har en mikrofon eller et nettkamera kan du også ha "
 "lyd- og bildesamtaler."
 

-#: ../src/empathy-account-assistant.c:536
+#: ../src/empathy-account-assistant.c:645

 msgid "Do you have an account you've been using with another chat program?"
 msgstr "Har du en konto som du har brukt med et annet lynmeldingsprogram?"
 
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "Har du en konto som du har brukt med et annet lynmeldingsprogram?"
 

-#: ../src/empathy-account-assistant.c:559
+#: ../src/empathy-account-assistant.c:668

 msgid "Yes, import my account details from "
 msgstr "Ja, importer mine kontodetaljer fra "
 
 msgid "Yes, import my account details from "
 msgstr "Ja, importer mine kontodetaljer fra "
 

-#: ../src/empathy-account-assistant.c:580
+#: ../src/empathy-account-assistant.c:689

 msgid "Yes, I'll enter my account details now"
 msgstr "Ja, jeg vil skrive inn mine kontodetaljer nå"
 
 msgid "Yes, I'll enter my account details now"
 msgstr "Ja, jeg vil skrive inn mine kontodetaljer nå"
 

-#: ../src/empathy-account-assistant.c:602
+#: ../src/empathy-account-assistant.c:711

 msgid "No, I want a new account"
 msgstr "Nei, jeg vil ha en ny konto"
 
 msgid "No, I want a new account"
 msgstr "Nei, jeg vil ha en ny konto"
 

-#: ../src/empathy-account-assistant.c:612
+#: ../src/empathy-account-assistant.c:721

 msgid "No, I just want to see people online nearby for now"
 msgstr "Nei, jeg vil bare se personer i nærheten foreløpig"
 
 msgid "No, I just want to see people online nearby for now"
 msgstr "Nei, jeg vil bare se personer i nærheten foreløpig"
 

-#: ../src/empathy-account-assistant.c:633
+#: ../src/empathy-account-assistant.c:742

 msgid "Select the accounts you want to import:"
 msgstr "Velg kontoer du vil importere:"
 
 msgid "Select the accounts you want to import:"
 msgstr "Velg kontoer du vil importere:"
 

-#: ../src/empathy-account-assistant.c:720
+#: ../src/empathy-account-assistant.c:826

 #: ../src/empathy-new-chatroom-dialog.c:541
 #: ../src/empathy-new-chatroom-dialog.c:542
 msgid "Yes"
 msgstr "Ja"
 
 #: ../src/empathy-new-chatroom-dialog.c:541
 #: ../src/empathy-new-chatroom-dialog.c:542
 msgid "Yes"
 msgstr "Ja"
 

-#: ../src/empathy-account-assistant.c:727
+#: ../src/empathy-account-assistant.c:833

 msgid "No, that's all for now"
 msgstr "Nei, det var alt for nå"
 
 msgid "No, that's all for now"
 msgstr "Nei, det var alt for nå"
 

-#: ../src/empathy-account-assistant.c:920
+#: ../src/empathy-account-assistant.c:1086
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct. You can easily change these details later or "
+"disable this feature by using the 'Accounts' dialog"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:1092
+#: ../src/empathy-account-assistant.c:1148
+msgid "Edit->Accounts"
+msgstr "Rediger->Kontoer"
+
+#: ../src/empathy-account-assistant.c:1108
+msgid "I don't want to enable this feature for now"
+msgstr "Jeg vil ikke slå på denne funksjonen ennå"
+
+#: ../src/empathy-account-assistant.c:1144
+msgid ""
+"You won't be able to chat with people connected to your local network, as "
+"telepathy-salut is not installed.\n"
+"If you want to enable this feature, please install the telepathy-salut "
+"package\n"
+"and create a People Nearby account from the Accounts dialog "
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:1150
+msgid "telepathy-salut not installed"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:1227

 msgid "Welcome to Empathy"
 msgstr "Velkommen til Empathy"
 
 msgid "Welcome to Empathy"
 msgstr "Velkommen til Empathy"
 

-#: ../src/empathy-account-assistant.c:929
+#: ../src/empathy-account-assistant.c:1236

 msgid "Import your existing accounts"
 msgstr "Importer dine eksisterende kontoer"
 
 msgid "Import your existing accounts"
 msgstr "Importer dine eksisterende kontoer"
 

+#: ../src/empathy-account-assistant.c:1254
+msgid "Please enter personal details"
+msgstr "Vennligst oppgi personlige detaljer"
+

 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
 #: ../src/empathy-accounts-dialog.c:65
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
 #: ../src/empathy-accounts-dialog.c:65


@@ -2196,33 +2239,33 @@ msgstr "Det finnes ikke-lagrede endringer for din %s-konto."
 msgid "Your new account has not been saved yet."
 msgstr "Din nye konto er ikke lagret ennå."
 
 msgid "Your new account has not been saved yet."
 msgstr "Din nye konto er ikke lagret ennå."
 

-#: ../src/empathy-accounts-dialog.c:259 ../src/empathy-call-window.c:729
+#: ../src/empathy-accounts-dialog.c:260 ../src/empathy-call-window.c:729

 msgid "Connecting…"
 msgstr "Kobler til..."
 
 msgid "Connecting…"
 msgstr "Kobler til..."
 

-#: ../src/empathy-accounts-dialog.c:286
+#: ../src/empathy-accounts-dialog.c:287

 #, c-format
 msgid "Disconnected — %s"
 msgstr "Koblet fra - %s"
 
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Koblet fra - %s"
 

-#: ../src/empathy-accounts-dialog.c:291
+#: ../src/empathy-accounts-dialog.c:292

 #, c-format
 msgid "Offline — %s"
 msgstr "Frakoblet - %s"
 
 #, c-format
 msgid "Offline — %s"
 msgstr "Frakoblet - %s"
 

-#: ../src/empathy-accounts-dialog.c:304
+#: ../src/empathy-accounts-dialog.c:305

 msgid "Offline — No Network Connection"
 msgstr "Frakoblet - Ingen nettverkstilkobling"
 
 msgid "Offline — No Network Connection"
 msgstr "Frakoblet - Ingen nettverkstilkobling"
 

-#: ../src/empathy-accounts-dialog.c:312
+#: ../src/empathy-accounts-dialog.c:313

 msgid "Unknown Status"
 msgstr "Ukjent status"
 
 msgid "Unknown Status"
 msgstr "Ukjent status"
 

-#: ../src/empathy-accounts-dialog.c:323
+#: ../src/empathy-accounts-dialog.c:324

 msgid "Offline — Account Disabled"
 msgstr "Frakoblet - Konto deaktivert"
 
 msgid "Offline — Account Disabled"
 msgstr "Frakoblet - Konto deaktivert"
 

-#: ../src/empathy-accounts-dialog.c:720
+#: ../src/empathy-accounts-dialog.c:721

 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"


@@ -2230,16 +2273,16 @@ msgstr ""
 "Du er i ferd med å lage en ny konto hvilket vil forkaste\n"
 "dine endringer. Er du sikker på at du vil fortsette?"
 
 "Du er i ferd med å lage en ny konto hvilket vil forkaste\n"
 "dine endringer. Er du sikker på at du vil fortsette?"
 

-#: ../src/empathy-accounts-dialog.c:1054
+#: ../src/empathy-accounts-dialog.c:1058

 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Vil du fjerne %s fra din datamaskin?"
 
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Vil du fjerne %s fra din datamaskin?"
 

-#: ../src/empathy-accounts-dialog.c:1058
+#: ../src/empathy-accounts-dialog.c:1062

 msgid "This will not remove your account on the server."
 msgstr "Dette vil ikke fjerne din konto på tjeneren."
 
 msgid "This will not remove your account on the server."
 msgstr "Dette vil ikke fjerne din konto på tjeneren."
 

-#: ../src/empathy-accounts-dialog.c:1286
+#: ../src/empathy-accounts-dialog.c:1292

 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"


@@ -2247,7 +2290,7 @@ msgstr ""
 "Du er i ferd med å velge en annen konto hvilket vil forkaste\n"
 "dine endringer. Er du sikker på at du vil fortsette?"
 
 "Du er i ferd med å velge en annen konto hvilket vil forkaste\n"
 "dine endringer. Er du sikker på at du vil fortsette?"
 

-#: ../src/empathy-accounts-dialog.c:1828
+#: ../src/empathy-accounts-dialog.c:1839

 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"


@@ -2256,7 +2299,7 @@ msgstr ""
 "dine endringer. Er du sikker på at du vil fortsette?"
 
 #. Tweak the dialog
 "dine endringer. Er du sikker på at du vil fortsette?"
 
 #. Tweak the dialog

-#: ../src/empathy-accounts-dialog.c:1955
+#: ../src/empathy-accounts-dialog.c:1970

 msgid "Accounts"
 msgstr "Kontoer"
 
 msgid "Accounts"
 msgstr "Kontoer"
 


@@ -2472,35 +2515,35 @@ msgstr "Forhåndsvis video"
 msgid "_View"
 msgstr "_Vis"
 
 msgid "_View"
 msgstr "_Vis"
 

-#: ../src/empathy-chat-window.c:436 ../src/empathy-chat-window.c:456
+#: ../src/empathy-chat-window.c:437 ../src/empathy-chat-window.c:457

 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../src/empathy-chat-window.c:448
+#: ../src/empathy-chat-window.c:449

 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../src/empathy-chat-window.c:464
+#: ../src/empathy-chat-window.c:465

 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../src/empathy-chat-window.c:473
+#: ../src/empathy-chat-window.c:474

 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../src/empathy-chat-window.c:684
+#: ../src/empathy-chat-window.c:685

 msgid "Typing a message."
 msgstr "Skriver en melding"
 
 msgid "Typing a message."
 msgstr "Skriver en melding"
 


@@ -2544,6 +2587,10 @@ msgstr "_Samtale"
 msgid "_Detach Tab"
 msgstr "Riv _løs fane"
 
 msgid "_Detach Tab"
 msgstr "Riv _løs fane"
 

+#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19
+msgid "_Edit"
+msgstr "_Rediger"
+

 #: ../src/empathy-chat-window.ui.h:12
 msgid "_Favorite Chat Room"
 msgstr "_Favoritt-praterom"
 #: ../src/empathy-chat-window.ui.h:12
 msgid "_Favorite Chat Room"
 msgstr "_Favoritt-praterom"


@@ -2813,23 +2860,23 @@ msgstr "Kilde"
 msgid "%s account"
 msgstr "%s-konto"
 
 msgid "%s account"
 msgstr "%s-konto"
 

-#: ../src/empathy-main-window.c:435
+#: ../src/empathy-main-window.c:430

 msgid "Reconnect"
 msgstr "Koble til på nytt"
 
 msgid "Reconnect"
 msgstr "Koble til på nytt"
 

-#: ../src/empathy-main-window.c:442
+#: ../src/empathy-main-window.c:436

 msgid "Edit Account"
 msgstr "Rediger konto"
 
 msgid "Edit Account"
 msgstr "Rediger konto"
 

-#: ../src/empathy-main-window.c:449
+#: ../src/empathy-main-window.c:442

 msgid "Close"
 msgstr "Lukk"
 
 msgid "Close"
 msgstr "Lukk"
 

-#: ../src/empathy-main-window.c:1036
+#: ../src/empathy-main-window.c:1025

 msgid "Contact"
 msgstr "Kontakt"
 
 msgid "Contact"
 msgstr "Kontakt"
 

-#: ../src/empathy-main-window.c:1374
+#: ../src/empathy-main-window.c:1363

 msgid "Show and edit accounts"
 msgstr "Vis og rediger kontoer"
 
 msgid "Show and edit accounts"
 msgstr "Vis og rediger kontoer"
 


@@ -3162,63 +3209,63 @@ msgstr "_Avslutt"
 msgid "Contact Map View"
 msgstr "Kartvisning for kontakter"
 
 msgid "Contact Map View"
 msgstr "Kartvisning for kontakter"
 

-#: ../src/empathy-debug-window.c:1063
+#: ../src/empathy-debug-window.c:1065

 msgid "Save"
 msgstr "Lagre"
 
 msgid "Save"
 msgstr "Lagre"
 

-#: ../src/empathy-debug-window.c:1185
+#: ../src/empathy-debug-window.c:1187

 msgid "Debug Window"
 msgstr "Feilsøkingsvindu"
 
 msgid "Debug Window"
 msgstr "Feilsøkingsvindu"
 

-#: ../src/empathy-debug-window.c:1265
+#: ../src/empathy-debug-window.c:1267

 msgid "Pause"
 msgstr "Pause"
 
 msgid "Pause"
 msgstr "Pause"
 

-#: ../src/empathy-debug-window.c:1277
+#: ../src/empathy-debug-window.c:1279

 msgid "Level "
 msgstr "Nivå "
 
 msgid "Level "
 msgstr "Nivå "
 

-#: ../src/empathy-debug-window.c:1297
+#: ../src/empathy-debug-window.c:1299

 msgid "Debug"
 msgstr "Feilsøk"
 
 msgid "Debug"
 msgstr "Feilsøk"
 

-#: ../src/empathy-debug-window.c:1303
+#: ../src/empathy-debug-window.c:1305

 msgid "Info"
 msgstr "Info"
 
 msgid "Info"
 msgstr "Info"
 

-#: ../src/empathy-debug-window.c:1309 ../src/empathy-debug-window.c:1358
+#: ../src/empathy-debug-window.c:1311 ../src/empathy-debug-window.c:1360

 msgid "Message"
 msgstr "Melding"
 
 msgid "Message"
 msgstr "Melding"
 

-#: ../src/empathy-debug-window.c:1315
+#: ../src/empathy-debug-window.c:1317

 msgid "Warning"
 msgstr "Advarsel"
 
 msgid "Warning"
 msgstr "Advarsel"
 

-#: ../src/empathy-debug-window.c:1321
+#: ../src/empathy-debug-window.c:1323

 msgid "Critical"
 msgstr "Kritisk"
 
 msgid "Critical"
 msgstr "Kritisk"
 

-#: ../src/empathy-debug-window.c:1327
+#: ../src/empathy-debug-window.c:1329

 msgid "Error"
 msgstr "Feil"
 
 msgid "Error"
 msgstr "Feil"
 

-#: ../src/empathy-debug-window.c:1346
+#: ../src/empathy-debug-window.c:1348

 msgid "Time"
 msgstr "Tid"
 
 msgid "Time"
 msgstr "Tid"
 

-#: ../src/empathy-debug-window.c:1349
+#: ../src/empathy-debug-window.c:1351

 msgid "Domain"
 msgstr "Domene"
 
 msgid "Domain"
 msgstr "Domene"
 

-#: ../src/empathy-debug-window.c:1351
+#: ../src/empathy-debug-window.c:1353

 msgid "Category"
 msgstr "Kategori"
 
 msgid "Category"
 msgstr "Kategori"
 

-#: ../src/empathy-debug-window.c:1353
+#: ../src/empathy-debug-window.c:1355

 msgid "Level"
 msgstr "Nivå"
 
 msgid "Level"
 msgstr "Nivå"
 

-#: ../src/empathy-debug-window.c:1385
+#: ../src/empathy-debug-window.c:1387

 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."