aboutsummaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
Diffstat (limited to 'po')
-rw-r--r--po/nb.po567
1 files changed, 300 insertions, 267 deletions
diff --git a/po/nb.po b/po/nb.po
index 96f31bbb0..83ff85c71 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -5,32 +5,33 @@
msgid ""
msgstr ""
"Project-Id-Version: empathy 2.31.x\n"
-"Report-Msgid-Bugs-To:\n"
-"POT-Creation-Date: 2010-06-19 12:04+0200\n"
-"PO-Revision-Date: 2010-06-19 12:20+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-07-11 16:22+0200\n"
+"PO-Revision-Date: 2010-07-11 16:24+0200\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
+"Language: no\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../data/empathy.desktop.in.in.h:1
+msgid "Chat on Google Talk, Facebook, MSN, and many other chat services"
+msgstr ""
+
+#: ../data/empathy.desktop.in.in.h:2
msgid "Empathy"
msgstr "Empathy"
-#: ../data/empathy.desktop.in.in.h:2
+#: ../data/empathy.desktop.in.in.h:3
msgid "Empathy Internet Messaging"
msgstr "Empathy internettmeldinger"
-#: ../data/empathy.desktop.in.in.h:3
+#: ../data/empathy.desktop.in.in.h:4
msgid "IM Client"
msgstr "Lynmeldingsklient"
-#: ../data/empathy.desktop.in.in.h:4
-msgid "Send and receive messages"
-msgstr "Send og motta meldinger"
-
#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
msgid "Always open a separate chat window for new chats."
msgstr "Alltid åpne et eget vindu til nye samtaler."
@@ -79,78 +80,80 @@ msgid "Disable sounds when away"
msgstr "Slå av lyder når du er borte"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+msgid "Display incoming events in the status area"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+msgid ""
+"Display incoming events in the status area. If false present them right away "
+"to the user."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Empathy can publish the user's location"
msgstr "Empathy kan publisere brukers lokasjon"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Empathy can use the GPS to guess the location"
msgstr "Empathy kan bruke GPS til å gjette lokasjonen"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid "Empathy can use the cellular network to guess the location"
msgstr ""
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Empathy can use the network to guess the location"
msgstr ""
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
msgid "Empathy default download folder"
msgstr "Forvalgt nedlastingsmappe for Empathy"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
msgid "Empathy has asked about importing accounts"
msgstr "Empathy har spurt om import av kontoer"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy has migrated butterfly logs"
msgstr ""
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
msgid "Empathy should auto-away when idle"
msgstr "Empathy skal sette bortestatus automatisk ved inaktivitet"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy should auto-connect on startup"
msgstr "Empathy skal koble til automatisk ved oppstart"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy should reduce the location's accuracy"
msgstr "Empathy skal redusere nøyaktighet for lokasjonen"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr ""
"Empathy skal bruke personbildet for kontakten som ikon for pratevinduet"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Enable WebKit Developer Tools"
msgstr "Slå på utviklerverktøy for WebKit"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Enable popup notifications for new messages"
msgstr "Aktiver varsling oppsprettmeldinger for nye meldinger"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Enable spell checker"
msgstr "Bruk stavekontroll"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Hide main window"
msgstr "Skjul hovedvinduet"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Hide the main window."
msgstr "Skjul hovedvinduet."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "MC 4 accounts have been imported"
-msgstr "MC 4-kontoer ble importert"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "MC 4 accounts have been imported."
-msgstr "MC 4-kontoer ble importert."
-
#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Nick completed character"
msgstr "Tegn for fullføring av kallenavn"
@@ -293,7 +296,8 @@ msgstr "Om Empathy skal logge inn til dine kontoer automatisk ved oppstart."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
msgid "Whether Empathy should go into away mode automatically if user is idle."
-msgstr "Om Empathy skal bytte til bortemodus automatisk hvis bruker ikke er aktiv."
+msgstr ""
+"Om Empathy skal bytte til bortemodus automatisk hvis bruker ikke er aktiv."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid ""
@@ -578,7 +582,7 @@ msgstr "Selvsignert sertifikat"
msgid "Certificate error"
msgstr "Sertifikatsfeil"
-#: ../libempathy/empathy-utils.c:430 ../src/empathy-import-mc4-accounts.c:106
+#: ../libempathy/empathy-utils.c:430
msgid "People Nearby"
msgstr "Personer i nærheten"
@@ -891,7 +895,8 @@ msgid ""
msgstr ""
"Dette er brukernavnet ditt, ikke din vanlige pålogging for Facebook.\n"
"Hvis du er facebook.com/<b>badger</b>, oppgi <b>badger</b>.\n"
-"Bruk <a href=\"http://www.facebook.com/username/\">denne siden</a> for å velge et brukernavn på Facebook hvis du ikke har et."
+"Bruk <a href=\"http://www.facebook.com/username/\">denne siden</a> for å "
+"velge et brukernavn på Facebook hvis du ikke har et."
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
msgid "Use old SS_L"
@@ -1098,149 +1103,141 @@ msgstr "Alle filer"
msgid "Click to enlarge"
msgstr "Klikk for å forstørre"
-#: ../libempathy-gtk/empathy-chat.c:239
-msgid "Failed to reconnect this chat"
-msgstr "Klarte ikke å koble til denne praten på nytt"
-
-#: ../libempathy-gtk/empathy-chat.c:661
-msgid "Failed to join chat room"
-msgstr "Klarte ikke å bli med i praterom"
-
-#: ../libempathy-gtk/empathy-chat.c:679
+#: ../libempathy-gtk/empathy-chat.c:644
msgid "Failed to open private chat"
msgstr "Klarte ikke å åpne privat prat"
-#: ../libempathy-gtk/empathy-chat.c:718
+#: ../libempathy-gtk/empathy-chat.c:683
msgid "Topic not supported on this conversation"
msgstr "Emne er ikke støttet for denne samtalen"
-#: ../libempathy-gtk/empathy-chat.c:724
+#: ../libempathy-gtk/empathy-chat.c:689
msgid "You are not allowed to change the topic"
msgstr "Du har ikke lov til å bytte emne"
-#: ../libempathy-gtk/empathy-chat.c:855
+#: ../libempathy-gtk/empathy-chat.c:821
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: tøm alle meldinger fra aktiv samtale"
-#: ../libempathy-gtk/empathy-chat.c:858
+#: ../libempathy-gtk/empathy-chat.c:824
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <emne>: sett emne for aktiv samtale"
-#: ../libempathy-gtk/empathy-chat.c:861
+#: ../libempathy-gtk/empathy-chat.c:827
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <ID for praterom>: bli med i et nytt praterom"
-#: ../libempathy-gtk/empathy-chat.c:864
+#: ../libempathy-gtk/empathy-chat.c:830
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <prateroms-ID>: bli med i et nytt praterom"
-#: ../libempathy-gtk/empathy-chat.c:867
+#: ../libempathy-gtk/empathy-chat.c:833
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <kontakt-ID> [<melding>]: åpne en privat samtale"
-#: ../libempathy-gtk/empathy-chat.c:870
+#: ../libempathy-gtk/empathy-chat.c:836
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <kontakt-ID> <melding>: åpne en privat samtale"
-#: ../libempathy-gtk/empathy-chat.c:873
+#: ../libempathy-gtk/empathy-chat.c:839
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <kallenavn>: bytt kallenavn på denne tjeneren"
-#: ../libempathy-gtk/empathy-chat.c:876
+#: ../libempathy-gtk/empathy-chat.c:842
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <melding>: send en HANDLINGS-melding til aktiv samtale"
-#: ../libempathy-gtk/empathy-chat.c:879
+#: ../libempathy-gtk/empathy-chat.c:845
msgid ""
"/say <message>: send <message> to the current conversation. This is used to "
"send a message starting with a '/'. For example: \"/say /join is used to "
"join a new chat room\""
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:884
+#: ../libempathy-gtk/empathy-chat.c:850
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:894
+#: ../libempathy-gtk/empathy-chat.c:860
#, c-format
msgid "Usage: %s"
msgstr "Bruk: %s"
-#: ../libempathy-gtk/empathy-chat.c:923
+#: ../libempathy-gtk/empathy-chat.c:889
msgid "Unknown command"
msgstr "Ukjent kommando"
-#: ../libempathy-gtk/empathy-chat.c:1044
+#: ../libempathy-gtk/empathy-chat.c:1010
msgid "Unknown command; see /help for the available commands"
msgstr "Ukjent kommando; se /help for tilgjengelige kommandoer"
-#: ../libempathy-gtk/empathy-chat.c:1182
+#: ../libempathy-gtk/empathy-chat.c:1148
msgid "offline"
msgstr "frakoblet"
-#: ../libempathy-gtk/empathy-chat.c:1185
+#: ../libempathy-gtk/empathy-chat.c:1151
msgid "invalid contact"
msgstr "ugyldig kontakt"
-#: ../libempathy-gtk/empathy-chat.c:1188
+#: ../libempathy-gtk/empathy-chat.c:1154
msgid "permission denied"
msgstr "tilgang nektet"
-#: ../libempathy-gtk/empathy-chat.c:1191
+#: ../libempathy-gtk/empathy-chat.c:1157
msgid "too long message"
msgstr "meldingen er for lang"
-#: ../libempathy-gtk/empathy-chat.c:1194
+#: ../libempathy-gtk/empathy-chat.c:1160
msgid "not implemented"
msgstr "ikke implementert"
-#: ../libempathy-gtk/empathy-chat.c:1197
+#: ../libempathy-gtk/empathy-chat.c:1163
msgid "unknown"
msgstr "ukjent"
-#: ../libempathy-gtk/empathy-chat.c:1201
+#: ../libempathy-gtk/empathy-chat.c:1167
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Feil ved sending av melding «%s»: %s"
-#: ../libempathy-gtk/empathy-chat.c:1311 ../src/empathy-chat-window.c:691
+#: ../libempathy-gtk/empathy-chat.c:1277 ../src/empathy-chat-window.c:691
msgid "Topic:"
msgstr "Emne:"
-#: ../libempathy-gtk/empathy-chat.c:1323
+#: ../libempathy-gtk/empathy-chat.c:1289
#, c-format
msgid "Topic set to: %s"
msgstr "Emnet er satt til: %s"
-#: ../libempathy-gtk/empathy-chat.c:1325
+#: ../libempathy-gtk/empathy-chat.c:1291
msgid "No topic defined"
msgstr "Emne ikke definert"
-#: ../libempathy-gtk/empathy-chat.c:1804
+#: ../libempathy-gtk/empathy-chat.c:1770
msgid "(No Suggestions)"
msgstr "(Ingen forslag)"
-#: ../libempathy-gtk/empathy-chat.c:1858
+#: ../libempathy-gtk/empathy-chat.c:1824
msgid "Insert Smiley"
msgstr "Sett inn smilefjes"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1876
-#: ../libempathy-gtk/empathy-ui-utils.c:1618
+#: ../libempathy-gtk/empathy-chat.c:1842
+#: ../libempathy-gtk/empathy-ui-utils.c:1619
msgid "_Send"
msgstr "_Send"
-#: ../libempathy-gtk/empathy-chat.c:1910
+#: ../libempathy-gtk/empathy-chat.c:1876
msgid "_Spelling Suggestions"
msgstr "_Staveforslag"
-#: ../libempathy-gtk/empathy-chat.c:1987
+#: ../libempathy-gtk/empathy-chat.c:1953
msgid "Failed to retrieve recent logs"
msgstr "Klarte ikke å hente siste logger"
-#: ../libempathy-gtk/empathy-chat.c:2093
+#: ../libempathy-gtk/empathy-chat.c:2059
#, c-format
msgid "%s has disconnected"
msgstr "%s har koblet fra"
@@ -1248,12 +1245,12 @@ msgstr "%s har koblet fra"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2100
+#: ../libempathy-gtk/empathy-chat.c:2066
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s ble sparket av %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2103
+#: ../libempathy-gtk/empathy-chat.c:2069
#, c-format
msgid "%s was kicked"
msgstr "%s ble sparket"
@@ -1261,17 +1258,17 @@ msgstr "%s ble sparket"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2111
+#: ../libempathy-gtk/empathy-chat.c:2077
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s ble bannlyst av %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2114
+#: ../libempathy-gtk/empathy-chat.c:2080
#, c-format
msgid "%s was banned"
msgstr "%s ble bannlyst"
-#: ../libempathy-gtk/empathy-chat.c:2118
+#: ../libempathy-gtk/empathy-chat.c:2084
#, c-format
msgid "%s has left the room"
msgstr "%s har forlatt rommet"
@@ -1281,47 +1278,47 @@ msgstr "%s har forlatt rommet"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2127
+#: ../libempathy-gtk/empathy-chat.c:2093
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2152
+#: ../libempathy-gtk/empathy-chat.c:2118
#, c-format
msgid "%s has joined the room"
msgstr "%s har blitt med i rommet"
-#: ../libempathy-gtk/empathy-chat.c:2177
+#: ../libempathy-gtk/empathy-chat.c:2143
#, c-format
msgid "%s is now known as %s"
msgstr "%s er nå kjent som %s"
-#: ../libempathy-gtk/empathy-chat.c:2316 ../src/empathy-call-window.c:1653
+#: ../libempathy-gtk/empathy-chat.c:2282 ../src/empathy-call-window.c:1655
msgid "Disconnected"
msgstr "Koblet fra"
-#: ../libempathy-gtk/empathy-chat.c:2947
+#: ../libempathy-gtk/empathy-chat.c:2920
msgid "Wrong password; please try again:"
msgstr "Feil passord; vennligst prøv igjen:"
-#: ../libempathy-gtk/empathy-chat.c:2948
+#: ../libempathy-gtk/empathy-chat.c:2921
msgid "Retry"
msgstr "Prøv igjen"
-#: ../libempathy-gtk/empathy-chat.c:2953
+#: ../libempathy-gtk/empathy-chat.c:2926
msgid "This room is protected by a password:"
msgstr "Dette rommet er beskyttet med et passord:"
-#: ../libempathy-gtk/empathy-chat.c:2954
+#: ../libempathy-gtk/empathy-chat.c:2927
msgid "Join"
msgstr "Bli med"
-#: ../libempathy-gtk/empathy-chat.c:3094
+#: ../libempathy-gtk/empathy-chat.c:3067
msgid "Connected"
msgstr "Koblet til"
-#: ../libempathy-gtk/empathy-chat.c:3147
-#: ../libempathy-gtk/empathy-log-window.c:626
+#: ../libempathy-gtk/empathy-chat.c:3120
+#: ../libempathy-gtk/empathy-log-window.c:639
msgid "Conversation"
msgstr "Samtale"
@@ -1363,84 +1360,84 @@ msgstr "A_vgjør senere"
msgid "Subscription Request"
msgstr "Abonnementsforespørsel"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1925
+#: ../libempathy-gtk/empathy-contact-list-view.c:1984
#, 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:1927
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
msgid "Removing group"
msgstr "Fjerner gruppe"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1976
-#: ../libempathy-gtk/empathy-contact-list-view.c:2053
+#: ../libempathy-gtk/empathy-contact-list-view.c:2035
+#: ../libempathy-gtk/empathy-contact-list-view.c:2112
#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Remove"
msgstr "Fje_rn"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2006
+#: ../libempathy-gtk/empathy-contact-list-view.c:2065
#, 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:2008
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
msgid "Removing contact"
msgstr "Fjerner kontakt"
-#: ../libempathy-gtk/empathy-contact-menu.c:205
-#: ../src/empathy-main-window.ui.h:14
+#: ../libempathy-gtk/empathy-contact-menu.c:203
+#: ../src/empathy-main-window.ui.h:13
msgid "_Add Contact…"
msgstr "_Legg til kontakt..."
-#: ../libempathy-gtk/empathy-contact-menu.c:233
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:231
+#: ../src/empathy-main-window.ui.h:14
msgid "_Chat"
msgstr "_Prat"
-#: ../libempathy-gtk/empathy-contact-menu.c:264
+#: ../libempathy-gtk/empathy-contact-menu.c:261
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Lydsamtale"
-#: ../libempathy-gtk/empathy-contact-menu.c:296
+#: ../libempathy-gtk/empathy-contact-menu.c:291
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Videosamtale"
-#: ../libempathy-gtk/empathy-contact-menu.c:336
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:331
+#: ../src/empathy-main-window.ui.h:25
msgid "_Previous Conversations"
msgstr "_Tidligere samtaler"
-#: ../libempathy-gtk/empathy-contact-menu.c:358
+#: ../libempathy-gtk/empathy-contact-menu.c:353
msgid "Send File"
msgstr "Send fil"
-#: ../libempathy-gtk/empathy-contact-menu.c:381
+#: ../libempathy-gtk/empathy-contact-menu.c:376
msgid "Share My Desktop"
msgstr "Del mitt skrivebord"
-#: ../libempathy-gtk/empathy-contact-menu.c:421
-#: ../libempathy-gtk/empathy-contact-widget.c:1825
+#: ../libempathy-gtk/empathy-contact-menu.c:416
+#: ../libempathy-gtk/empathy-contact-widget.c:1819
msgid "Favorite"
msgstr "Favoritt"
-#: ../libempathy-gtk/empathy-contact-menu.c:451
+#: ../libempathy-gtk/empathy-contact-menu.c:445
msgid "Infor_mation"
msgstr "Infor_masjon"
-#: ../libempathy-gtk/empathy-contact-menu.c:497
+#: ../libempathy-gtk/empathy-contact-menu.c:491
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "R_ediger"
-#: ../libempathy-gtk/empathy-contact-menu.c:551
+#: ../libempathy-gtk/empathy-contact-menu.c:545
#: ../src/empathy-chat-window.c:903
msgid "Inviting you to this room"
msgstr "Inviterer deg til dette rommet"
-#: ../libempathy-gtk/empathy-contact-menu.c:582
+#: ../libempathy-gtk/empathy-contact-menu.c:576
msgid "_Invite to Chat Room"
msgstr "_Inviter til praterom"
@@ -1473,7 +1470,7 @@ msgid "Select"
msgstr "Velg"
#: ../libempathy-gtk/empathy-contact-widget.c:623
-#: ../src/empathy-main-window.c:1130
+#: ../src/empathy-main-window.c:1171
msgid "Group"
msgstr "Gruppe"
@@ -1574,7 +1571,7 @@ msgid "Altitude:"
msgstr "Høyde:"
#: ../libempathy-gtk/empathy-contact-widget.c:963
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "Sted"
@@ -1582,15 +1579,15 @@ msgstr "Sted"
msgid "<b>Location</b>, "
msgstr "<b>Lokasjon</b>, "
-#: ../libempathy-gtk/empathy-contact-widget.c:1029
+#: ../libempathy-gtk/empathy-contact-widget.c:1030
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y, %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:1112
+#: ../libempathy-gtk/empathy-contact-widget.c:1113
msgid "Save Avatar"
msgstr "Lagre personbilder"
-#: ../libempathy-gtk/empathy-contact-widget.c:1168
+#: ../libempathy-gtk/empathy-contact-widget.c:1169
msgid "Unable to save avatar"
msgstr "Kan ikke lagre personbilde"
@@ -1663,12 +1660,12 @@ msgstr "Port"
msgid "SSL"
msgstr "SSL"
-#: ../libempathy-gtk/empathy-log-window.c:619
+#: ../libempathy-gtk/empathy-log-window.c:632
#: ../src/empathy-import-widget.c:312
msgid "Account"
msgstr "Konto"
-#: ../libempathy-gtk/empathy-log-window.c:636
+#: ../libempathy-gtk/empathy-log-window.c:649
msgid "Date"
msgstr "Dato"
@@ -1703,18 +1700,18 @@ msgid "New Conversation"
msgstr "Ny samtale"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:184
+#: ../libempathy-gtk/empathy-new-call-dialog.c:190
msgid "Send _Video"
msgstr "Send _video"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:192
+#: ../libempathy-gtk/empathy-new-call-dialog.c:198
#: ../src/empathy-call-window.ui.h:17
msgid "_Call"
msgstr "_Ring"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+#: ../libempathy-gtk/empathy-new-call-dialog.c:208
msgid "New Call"
msgstr "Ny samtale"
@@ -1751,7 +1748,7 @@ msgid "Set your presence and current status"
msgstr "Sett din tilstedeværelse og aktiv status"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1128
+#: ../libempathy-gtk/empathy-presence-chooser.c:1124
msgid "Custom messages…"
msgstr "Egendefinerte meldinger..."
@@ -1839,17 +1836,18 @@ msgstr "Tøm"
msgid "Blue"
msgstr "Blå"
-#: ../libempathy-gtk/empathy-ui-utils.c:1515
+#: ../libempathy-gtk/empathy-ui-utils.c:1516
msgid "Unable to open URI"
msgstr "Kan ikke åpne URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1610
+#: ../libempathy-gtk/empathy-ui-utils.c:1611
msgid "Select a file"
msgstr "Velg en fil"
-#: ../libempathy-gtk/empathy-ui-utils.c:1674
-msgid "Select a destination"
-msgstr "Velg en destinasjon"
+#: ../libempathy-gtk/empathy-ui-utils.c:1680
+#, c-format
+msgid "Incoming file from %s"
+msgstr "Innkommende fil fra %s"
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
@@ -2030,19 +2028,20 @@ msgstr "Valgt kontakt er koblet fra."
msgid "No error message"
msgstr "Ingen feilmelding"
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:244
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:259
msgid "Instant Message (Empathy)"
msgstr "Lynmelding (Empathy)"
-#: ../src/empathy.c:596
+#: ../src/empathy.c:474
msgid "Don't connect on startup"
msgstr "Ikke koble til ved oppstart"
-#: ../src/empathy.c:600
+#: ../src/empathy.c:478
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:612
+#: ../src/empathy.c:490
msgid "- Empathy IM Client"
msgstr "- Empathy lynmeldingsprogram"
@@ -2210,7 +2209,11 @@ msgid ""
"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 "Empathy kan oppdage og prate med andre som er koblet på samme nettverk som deg automatisk. Hvis du vil bruke denne funksjonen må du sjekke om detaljene under er riktige. Du kan lett endre disse detaljene senere eller slå av funksjonen i «Konto»-dialogen"
+msgstr ""
+"Empathy kan oppdage og prate med andre som er koblet på samme nettverk som "
+"deg automatisk. Hvis du vil bruke denne funksjonen må du sjekke om detaljene "
+"under er riktige. Du kan lett endre disse detaljene senere eller slå av "
+"funksjonen i «Konto»-dialogen"
#: ../src/empathy-account-assistant.c:1135
#: ../src/empathy-account-assistant.c:1191
@@ -2227,7 +2230,11 @@ msgid ""
"telepathy-salut is not installed. If you want to enable this feature, please "
"install the telepathy-salut package and create a People Nearby account from "
"the Accounts dialog"
-msgstr "Du vil ikke kunne prate med personer som er koblet på ditt lokale nettverk siden telepathy-salut ikke er installert. Hvis du vil slå på denne funksjonen må du installere pakken telepathy-salut og opprette en «Folk i nærheten»-konto i Konto-dialogen"
+msgstr ""
+"Du vil ikke kunne prate med personer som er koblet på ditt lokale nettverk "
+"siden telepathy-salut ikke er installert. Hvis du vil slå på denne "
+"funksjonen må du installere pakken telepathy-salut og opprette en «Folk i "
+"nærheten»-konto i Konto-dialogen"
#: ../src/empathy-account-assistant.c:1193
msgid "telepathy-salut not installed"
@@ -2390,21 +2397,21 @@ msgstr "Samtale med %s"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1309
+#: ../src/empathy-call-window.c:1311
msgid "Call"
msgstr "Ring"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1966
+#: ../src/empathy-call-window.c:1968
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Koblet til - %d:%02dm"
-#: ../src/empathy-call-window.c:2027
+#: ../src/empathy-call-window.c:2029
msgid "Technical Details"
msgstr "Tekniske detaljer"
-#: ../src/empathy-call-window.c:2065
+#: ../src/empathy-call-window.c:2067
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -2413,7 +2420,7 @@ msgstr ""
"Programvaren til %s forstår ikke noen av lydformatene som støttes av din "
"datamaskin"
-#: ../src/empathy-call-window.c:2070
+#: ../src/empathy-call-window.c:2072
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -2422,7 +2429,7 @@ msgstr ""
"Programvaren til %s forstår ikke noen av videoformatene som støttes av din "
"datamaskin"
-#: ../src/empathy-call-window.c:2076
+#: ../src/empathy-call-window.c:2078
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -2431,41 +2438,44 @@ msgstr ""
"Kan ikke etablere tilkobling til %s. En av dere kan være på et nettverk som "
"ikke tillater direkte tilkoblinger."
-#: ../src/empathy-call-window.c:2082
+#: ../src/empathy-call-window.c:2084
msgid "There was a failure on the network"
msgstr "Det oppsto en feil på nettverket"
-#: ../src/empathy-call-window.c:2086
+#: ../src/empathy-call-window.c:2088
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
"Lydformatene som kreves for denne samtalen er ikke installert på din "
"datamaskin"
-#: ../src/empathy-call-window.c:2089
+#: ../src/empathy-call-window.c:2091
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"Videoformatene som kreves for denne samtalen er ikke installert på din "
"datamaskin"
-#: ../src/empathy-call-window.c:2099
+#: ../src/empathy-call-window.c:2101
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
"the Help menu."
-msgstr "Noe uventet skjedde i en Telepathy-komponent. Vennligst <a href=\"%s\">rapporter denne feilen</a> og legg ved loggene som samles inn i «Feilsøking»-vinduet i Hjelp-menyen."
+msgstr ""
+"Noe uventet skjedde i en Telepathy-komponent. Vennligst <a href=\"%s"
+"\">rapporter denne feilen</a> og legg ved loggene som samles inn i "
+"«Feilsøking»-vinduet i Hjelp-menyen."
-#: ../src/empathy-call-window.c:2107
+#: ../src/empathy-call-window.c:2109
msgid "There was a failure in the call engine"
msgstr "Det oppsto en feil i samtalemotoren"
-#: ../src/empathy-call-window.c:2146
+#: ../src/empathy-call-window.c:2148
msgid "Can't establish audio stream"
msgstr "Kan ikke etablere lydstrøm"
-#: ../src/empathy-call-window.c:2156
+#: ../src/empathy-call-window.c:2158
msgid "Can't establish video stream"
msgstr "Kan ikke etablere videostrøm"
@@ -2533,7 +2543,7 @@ msgstr "Video på"
msgid "Video Preview"
msgstr "Forhåndsvis video"
-#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:27
msgid "_View"
msgstr "_Vis"
@@ -2541,29 +2551,29 @@ msgstr "_Vis"
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s (%d ulest)"
+msgstr[1] "%s (%d uleste)"
#: ../src/empathy-chat-window.c:464
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s (og %u annen)"
+msgstr[1] "%s (og %u andre)"
#: ../src/empathy-chat-window.c:480
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s (%d ulest fra andre)"
+msgstr[1] "%s (%d uleste fra andre)"
#: ../src/empathy-chat-window.c:489
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s (%d ulest fra alle)"
+msgstr[1] "%s (%d uleste fra alle)"
#: ../src/empathy-chat-window.c:695
msgid "Typing a message."
@@ -2582,26 +2592,26 @@ msgid "Chat"
msgstr "Prat"
#: ../src/empathy-chat-window.ui.h:4
-msgid "Important Room"
-msgstr "Viktig rom"
-
-#: ../src/empathy-chat-window.ui.h:5
msgid "Insert _Smiley"
msgstr "Sett inn _smilefjes"
-#: ../src/empathy-chat-window.ui.h:6
+#: ../src/empathy-chat-window.ui.h:5
msgid "Invite _Participant…"
msgstr "Inviter _deltaker..."
-#: ../src/empathy-chat-window.ui.h:7
+#: ../src/empathy-chat-window.ui.h:6
msgid "Move Tab _Left"
msgstr "Flytt fane til _venstre"
-#: ../src/empathy-chat-window.ui.h:8
+#: ../src/empathy-chat-window.ui.h:7
msgid "Move Tab _Right"
msgstr "Flytt fane til høy_re"
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-chat-window.ui.h:8
+msgid "Notify for All Messages"
+msgstr "Varsle for alle meldinger"
+
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
msgid "_Contents"
msgstr "_Innhold"
@@ -2613,7 +2623,7 @@ msgstr "_Samtale"
msgid "_Detach Tab"
msgstr "Riv _løs fane"
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
msgid "_Edit"
msgstr "_Rediger"
@@ -2621,7 +2631,7 @@ msgstr "_Rediger"
msgid "_Favorite Chat Room"
msgstr "_Favoritt-praterom"
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
msgid "_Help"
msgstr "_Hjelp"
@@ -2661,76 +2671,81 @@ msgstr "Koble til automatisk"
msgid "Manage Favorite Rooms"
msgstr "Håndter favorittrom"
-#: ../src/empathy-event-manager.c:431
+#: ../src/empathy-event-manager.c:471
msgid "Incoming video call"
msgstr "Innkommende videosamtale"
-#: ../src/empathy-event-manager.c:431
+#: ../src/empathy-event-manager.c:471
msgid "Incoming call"
msgstr "Innkommende samtale"
-#: ../src/empathy-event-manager.c:435
+#: ../src/empathy-event-manager.c:475
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s ringer deg med video. Vil du svare?"
-#: ../src/empathy-event-manager.c:436
+#: ../src/empathy-event-manager.c:476
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s ringer deg. Vil du svare?"
-#: ../src/empathy-event-manager.c:458
+#: ../src/empathy-event-manager.c:479 ../src/empathy-event-manager.c:621
+#, c-format
+msgid "Incoming call from %s"
+msgstr "Innkommende samtale fra %s"
+
+#: ../src/empathy-event-manager.c:504
msgid "_Reject"
msgstr "Av_vis"
-#: ../src/empathy-event-manager.c:464
+#: ../src/empathy-event-manager.c:510
msgid "_Answer"
msgstr "Sv_ar"
-#: ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:621
#, c-format
msgid "Incoming video call from %s"
msgstr "Innkommende videosamtale fra %s"
-#: ../src/empathy-event-manager.c:572
-#, c-format
-msgid "Incoming call from %s"
-msgstr "Innkommende samtale fra %s"
-
-#: ../src/empathy-event-manager.c:646
+#: ../src/empathy-event-manager.c:698
msgid "Room invitation"
msgstr "Invitasjon til rom"
-#: ../src/empathy-event-manager.c:649
+#: ../src/empathy-event-manager.c:700
+#, c-format
+msgid "Invitation to join %s"
+msgstr "Invitasjon til å bli med i %s"
+
+#: ../src/empathy-event-manager.c:707
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s inviterer deg til å bli med i %s"
-#: ../src/empathy-event-manager.c:657
+#: ../src/empathy-event-manager.c:715
msgid "_Decline"
msgstr "_Avslå"
-#: ../src/empathy-event-manager.c:662
+#: ../src/empathy-event-manager.c:720
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Bli med"
-#: ../src/empathy-event-manager.c:699
+#: ../src/empathy-event-manager.c:758
#, c-format
msgid "%s invited you to join %s"
msgstr "%s inviterte deg til å bli med i %s"
-#: ../src/empathy-event-manager.c:725
+#: ../src/empathy-event-manager.c:785
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Innkommende filoverføring fra %s"
-#: ../src/empathy-event-manager.c:918
+#: ../src/empathy-event-manager.c:986
#, c-format
msgid "Subscription requested by %s"
msgstr "Abonnement forespurt av %s"
-#: ../src/empathy-event-manager.c:922
+#: ../src/empathy-event-manager.c:990
#, c-format
msgid ""
"\n"
@@ -2739,12 +2754,12 @@ msgstr ""
"\n"
"Melding: %s"
-#: ../src/empathy-event-manager.c:965
+#: ../src/empathy-event-manager.c:1033
#, c-format
msgid "%s is now offline."
msgstr "%s er nå frakoblet."
-#: ../src/empathy-event-manager.c:986
+#: ../src/empathy-event-manager.c:1053
#, c-format
msgid "%s is now online."
msgstr "%s er nå tilkoblet."
@@ -2883,112 +2898,107 @@ msgstr "Protokoll"
msgid "Source"
msgstr "Kilde"
-#: ../src/empathy-import-mc4-accounts.c:108
-#, c-format
-msgid "%s account"
-msgstr "%s-konto"
-
-#: ../src/empathy-main-window.c:445
+#: ../src/empathy-main-window.c:457
msgid "Reconnect"
msgstr "Koble til på nytt"
-#: ../src/empathy-main-window.c:451
+#: ../src/empathy-main-window.c:463
msgid "Edit Account"
msgstr "Rediger konto"
-#: ../src/empathy-main-window.c:457
+#: ../src/empathy-main-window.c:469
msgid "Close"
msgstr "Lukk"
-#: ../src/empathy-main-window.c:1113
+#: ../src/empathy-main-window.c:1154
msgid "Contact"
msgstr "Kontakt"
-#: ../src/empathy-main-window.c:1499
+#: ../src/empathy-main-window.c:1476
+msgid "Contact List"
+msgstr "Kontaktliste"
+
+#: ../src/empathy-main-window.c:1583
msgid "Show and edit accounts"
msgstr "Vis og rediger kontoer"
#: ../src/empathy-main-window.ui.h:1
-msgid "Contact List"
-msgstr "Kontaktliste"
-
-#: ../src/empathy-main-window.ui.h:2
msgid "Contacts on a _Map"
msgstr "Kontakter på et _kart"
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window.ui.h:2
msgid "Context"
msgstr "Sammenheng"
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:3
msgid "Join _Favorites"
msgstr "Bli med i _favoritter"
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:4
msgid "Manage Favorites"
msgstr "Håndter favoritter"
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window.ui.h:5
msgid "N_ormal Size"
msgstr "N_ormal størrelse"
-#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
msgid "New _Call…"
msgstr "Ny _samtale..."
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:7
msgid "Normal Size With _Avatars"
msgstr "Normal størrelse med _avatarer"
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:8
msgid "P_references"
msgstr "B_rukervalg"
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:9
msgid "Show P_rotocols"
msgstr "Vis p_rotokoller"
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:10
msgid "Sort by _Name"
msgstr "Sorter på _navn"
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Status"
msgstr "Sorter på _status"
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:12
msgid "_Accounts"
msgstr "_Kontoer"
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window.ui.h:15
msgid "_Compact Size"
msgstr "_Kompakt størrelse"
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window.ui.h:17
msgid "_Debug"
msgstr "_Feilsøk"
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window.ui.h:19
msgid "_File Transfers"
msgstr "_Filoverføringer"
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:21
msgid "_Join…"
msgstr "_Bli med..."
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation…"
msgstr "_Ny samtale..."
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:23
msgid "_Offline Contacts"
msgstr "Frak_oblede kontakter"
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:24
msgid "_Personal Information"
msgstr "Personlig _informasjon"
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window.ui.h:26
msgid "_Room"
msgstr "_Rom"
@@ -3059,38 +3069,42 @@ msgstr "Romliste"
msgid "_Room:"
msgstr "_Rom:"
-#: ../src/empathy-preferences.c:137
+#: ../src/empathy-preferences.c:136
msgid "Message received"
msgstr "Melding mottatt"
-#: ../src/empathy-preferences.c:138
+#: ../src/empathy-preferences.c:137
msgid "Message sent"
msgstr "Melding sendt"
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:138
msgid "New conversation"
msgstr "Ny samtale"
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:139
msgid "Contact goes online"
msgstr "Kontakt kobler til"
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:140
msgid "Contact goes offline"
msgstr "Kontakt kobler fra"
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:141
msgid "Account connected"
msgstr "Konto koblet til"
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:142
msgid "Account disconnected"
msgstr "Konto koblet fra"
-#: ../src/empathy-preferences.c:426
+#: ../src/empathy-preferences.c:437
msgid "Language"
msgstr "Språk"
+#: ../src/empathy-preferences.c:873
+msgid "Preferences"
+msgstr "Brukervalg"
+
#: ../src/empathy-preferences.ui.h:1
msgid "Appearance"
msgstr "Utseende"
@@ -3112,41 +3126,41 @@ msgid "Disable sounds when _away or busy"
msgstr "Slå av lyder når du er b_orte eller opptatt"
#: ../src/empathy-preferences.ui.h:6
+msgid "Display incoming events in the notification area"
+msgstr "Vis innkommende hendelser i varslingsområdet"
+
+#: ../src/empathy-preferences.ui.h:7
msgid "Enable notifications when a contact comes online"
msgstr "Slå på varsling når en kontakt kobler seg til"
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:8
msgid "Enable notifications when a contact goes offline"
msgstr "Slå på varsling når en kontakt kobler seg fra"
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:9
msgid "Enable notifications when the _chat is not focused"
msgstr "Aktiver varsling når _prat ikke er fokusert"
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:10
msgid "Enable spell checking for languages:"
msgstr "Slå på stavekontroll for språk:"
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:11
msgid "General"
msgstr "Generelt"
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:13
msgid "Location sources:"
msgstr "Kilder for steder:"
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
msgid "Notifications"
msgstr "Varsling"
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:15
msgid "Play sound for events"
msgstr "Spill av lyd for hendelser"
-#: ../src/empathy-preferences.ui.h:15
-msgid "Preferences"
-msgstr "Brukervalg"
-
#: ../src/empathy-preferences.ui.h:16
msgid "Privacy"
msgstr "Personvern"
@@ -3221,10 +3235,26 @@ msgstr "_Publiser lokasjon til mine kontakter"
msgid "_Reduce location accuracy"
msgstr "_Reduser nøyaktighet for lokasjon"
-#: ../src/empathy-status-icon.c:179
+#: ../src/empathy-status-icon.c:141
msgid "Respond"
msgstr "Svar"
+#: ../src/empathy-status-icon.c:147
+msgid "Reject"
+msgstr "Avvis"
+
+#: ../src/empathy-status-icon.c:151
+msgid "Answer"
+msgstr "Svar"
+
+#: ../src/empathy-status-icon.c:158
+msgid "Decline"
+msgstr "Avslå"
+
+#: ../src/empathy-status-icon.c:162
+msgid "Accept"
+msgstr "Godta"
+
#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "Status"
@@ -3237,63 +3267,63 @@ msgstr "_Avslutt"
msgid "Contact Map View"
msgstr "Kartvisning for kontakter"
-#: ../src/empathy-debug-window.c:1154
+#: ../src/empathy-debug-window.c:1219
msgid "Save"
msgstr "Lagre"
-#: ../src/empathy-debug-window.c:1330
+#: ../src/empathy-debug-window.c:1395
msgid "Debug Window"
msgstr "Feilsøkingsvindu"
-#: ../src/empathy-debug-window.c:1410
+#: ../src/empathy-debug-window.c:1475
msgid "Pause"
msgstr "Pause"
-#: ../src/empathy-debug-window.c:1422
+#: ../src/empathy-debug-window.c:1487
msgid "Level "
msgstr "Nivå "
-#: ../src/empathy-debug-window.c:1442
+#: ../src/empathy-debug-window.c:1507
msgid "Debug"
msgstr "Feilsøk"
-#: ../src/empathy-debug-window.c:1448
+#: ../src/empathy-debug-window.c:1513
msgid "Info"
msgstr "Info"
-#: ../src/empathy-debug-window.c:1454 ../src/empathy-debug-window.c:1503
+#: ../src/empathy-debug-window.c:1519 ../src/empathy-debug-window.c:1568
msgid "Message"
msgstr "Melding"
-#: ../src/empathy-debug-window.c:1460
+#: ../src/empathy-debug-window.c:1525
msgid "Warning"
msgstr "Advarsel"
-#: ../src/empathy-debug-window.c:1466
+#: ../src/empathy-debug-window.c:1531
msgid "Critical"
msgstr "Kritisk"
-#: ../src/empathy-debug-window.c:1472
+#: ../src/empathy-debug-window.c:1537
msgid "Error"
msgstr "Feil"
-#: ../src/empathy-debug-window.c:1491
+#: ../src/empathy-debug-window.c:1556
msgid "Time"
msgstr "Tid"
-#: ../src/empathy-debug-window.c:1494
+#: ../src/empathy-debug-window.c:1559
msgid "Domain"
msgstr "Domene"
-#: ../src/empathy-debug-window.c:1496
+#: ../src/empathy-debug-window.c:1561
msgid "Category"
msgstr "Kategori"
-#: ../src/empathy-debug-window.c:1498
+#: ../src/empathy-debug-window.c:1563
msgid "Level"
msgstr "Nivå"
-#: ../src/empathy-debug-window.c:1535
+#: ../src/empathy-debug-window.c:1600
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -3312,27 +3342,30 @@ msgstr "Velg en kontakt å invitere til samtalen:"
msgid "Invite"
msgstr "Inviter"
-#: ../src/empathy-accounts.c:213
+#: ../src/empathy-accounts.c:182
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr "Ikke vis noen dialoger. Utfør arbeid (f.eks import) og avslutt"
-#: ../src/empathy-accounts.c:217
+#: ../src/empathy-accounts.c:186
msgid "Don't display any dialogs if there are any non-salut accounts"
-msgstr "Ikke vis noen dialoger hvis det finnes kontoer som ikke er for det lokale nettverket"
+msgstr ""
+"Ikke vis noen dialoger hvis det finnes kontoer som ikke er for det lokale "
+"nettverket"
-#: ../src/empathy-accounts.c:221
+#: ../src/empathy-accounts.c:190
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr "Velg en gitt konto ved oppstart (f.eks. gabble/jabber/foo_40eksempel_2eorg0)"
+msgstr ""
+"Velg en gitt konto ved oppstart (f.eks. gabble/jabber/foo_40eksempel_2eorg0)"
-#: ../src/empathy-accounts.c:223
+#: ../src/empathy-accounts.c:192
msgid "<account-id>"
msgstr "<konto-id>"
-#: ../src/empathy-accounts.c:231
+#: ../src/empathy-accounts.c:200
msgid "- Empathy Accounts"
msgstr "- Empathy-kontoer"
-#: ../src/empathy-accounts.c:247
+#: ../src/empathy-accounts.c:216
msgid "Empathy Accounts"
msgstr "Empathy-kontoer"