diff --git a/po/nb.po b/po/nb.po
index bcb332632..c2f75d1ad 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell 3.1.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-12 19:59+0200\n"
-"PO-Revision-Date: 2011-07-12 20:00+0200\n"
+"POT-Creation-Date: 2011-07-18 13:48+0200\n"
+"PO-Revision-Date: 2011-07-18 13:50+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: \n"
@@ -17,7 +17,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.1\n"
 
 #: ../data/gnome-shell.desktop.in.in.h:1
 msgid "GNOME Shell"
@@ -62,7 +61,10 @@ msgid ""
 "GNOME Shell extensions have a uuid property; this key lists extensions which "
 "should not be loaded. This setting overrides enabled-extensions for "
 "extensions that appear in both lists."
-msgstr "GNOME Shell-utvidelser har en uuid-egenskap. Denne nøkkelen lister utvidelser som ikke bør lastes. Denne innstillingen overstyrer enabled-extensions for utvidelser som finnes i begge listene."
+msgstr ""
+"GNOME Shell-utvidelser har en uuid-egenskap. Denne nøkkelen lister "
+"utvidelser som ikke bør lastes. Denne innstillingen overstyrer enabled-"
+"extensions for utvidelser som finnes i begge listene."
 
 #: ../data/org.gnome.shell.gschema.xml.in.h:7
 msgid "History for command (Alt-F2) dialog"
@@ -101,9 +103,7 @@ msgid ""
 "'videorate ! vp8enc quality=10 speed=2 threads=%T ! queue ! webmmux' and "
 "records to WEBM using the VP8 codec. %T is used as a placeholder for a guess "
 "at the optimal thread count on the system."
-msgstr ""
-"Setter GStreamer-rør som brukes til å kode opptak. Den følger syntaksen som "
-"brukes for gst-launch."
+msgstr "Setter GStreamer-rør som brukes til å kode opptak. Den følger syntaksen som brukes for gst-launch."
 
 #: ../data/org.gnome.shell.gschema.xml.in.h:15
 msgid "Show date in clock"
@@ -195,23 +195,23 @@ msgstr "Kjøring av «%s» feilet:"
 msgid "All"
 msgstr "Alle"
 
-#: ../js/ui/appDisplay.js:351
+#: ../js/ui/appDisplay.js:359
 msgid "APPLICATIONS"
 msgstr "PROGRAMMER"
 
-#: ../js/ui/appDisplay.js:377
+#: ../js/ui/appDisplay.js:385
 msgid "SETTINGS"
 msgstr "INNSTILLINGER"
 
-#: ../js/ui/appDisplay.js:650
+#: ../js/ui/appDisplay.js:658
 msgid "New Window"
 msgstr "Nytt vindu"
 
-#: ../js/ui/appDisplay.js:653
+#: ../js/ui/appDisplay.js:661
 msgid "Remove from Favorites"
 msgstr "Fjern fra favoritter"
 
-#: ../js/ui/appDisplay.js:654
+#: ../js/ui/appDisplay.js:662
 msgid "Add to Favorites"
 msgstr "Legg til i favoritter"
 
@@ -344,13 +344,13 @@ msgid "Nothing Scheduled"
 msgstr "Ingenting planlagt"
 
 #. Translators: Shown on calendar heading when selected day occurs on current year
-#: ../js/ui/calendar.js:717 ../js/ui/telepathyClient.js:705
+#: ../js/ui/calendar.js:717 ../js/ui/telepathyClient.js:749
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A %B %d"
 
 #. Translators: Shown on calendar heading when selected day occurs on different year
-#: ../js/ui/calendar.js:720 ../js/ui/telepathyClient.js:708
+#: ../js/ui/calendar.js:720 ../js/ui/telepathyClient.js:752
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A %B %d, %Y"
@@ -371,7 +371,7 @@ msgstr "Denne uken"
 msgid "Next week"
 msgstr "Neste uke"
 
-#: ../js/ui/dash.js:172 ../js/ui/messageTray.js:1114
+#: ../js/ui/dash.js:172 ../js/ui/messageTray.js:1122
 msgid "Remove"
 msgstr "Fjern"
 
@@ -535,11 +535,11 @@ msgstr "Vis kildekode"
 msgid "Web Page"
 msgstr "Nettside"
 
-#: ../js/ui/messageTray.js:1107
+#: ../js/ui/messageTray.js:1115
 msgid "Open"
 msgstr "Åpne"
 
-#: ../js/ui/messageTray.js:2278
+#: ../js/ui/messageTray.js:2286
 msgid "System Information"
 msgstr "Systeminformasjon"
 
@@ -562,18 +562,18 @@ msgid "Dash"
 msgstr "Favoritter"
 
 #. TODO - _quit() doesn't really work on apps in state STARTING yet
-#: ../js/ui/panel.js:533
+#: ../js/ui/panel.js:532
 #, c-format
 msgid "Quit %s"
 msgstr "Avslutt %s"
 
-#. Button on the left side of the panel.
-#. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:914
+#. Translators: If there is no suitable word for "Activities"
+#. in your language, you can use the word for "Overview".
+#: ../js/ui/panel.js:568
 msgid "Activities"
 msgstr "Aktiviteter"
 
-#: ../js/ui/panel.js:1014
+#: ../js/ui/panel.js:951
 msgid "Top Bar"
 msgstr "Topp-panel"
 
@@ -639,41 +639,41 @@ msgstr "Søker …"
 msgid "No matching results."
 msgstr "Ingen treff."
 
-#: ../js/ui/statusMenu.js:202 ../js/ui/statusMenu.js:206
-#: ../js/ui/statusMenu.js:272
+#: ../js/ui/statusMenu.js:192 ../js/ui/statusMenu.js:196
+#: ../js/ui/statusMenu.js:262
 msgid "Power Off..."
 msgstr "Slå av …"
 
-#: ../js/ui/statusMenu.js:204 ../js/ui/statusMenu.js:206
-#: ../js/ui/statusMenu.js:271
+#: ../js/ui/statusMenu.js:194 ../js/ui/statusMenu.js:196
+#: ../js/ui/statusMenu.js:261
 msgid "Suspend"
 msgstr "Hvilemodus"
 
-#: ../js/ui/statusMenu.js:227
+#: ../js/ui/statusMenu.js:217
 msgid "Available"
 msgstr "Tilgjengelig"
 
-#: ../js/ui/statusMenu.js:232
+#: ../js/ui/statusMenu.js:222
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../js/ui/statusMenu.js:240
+#: ../js/ui/statusMenu.js:230
 msgid "My Account"
 msgstr "Min konto"
 
-#: ../js/ui/statusMenu.js:244
+#: ../js/ui/statusMenu.js:234
 msgid "System Settings"
 msgstr "Systeminnstillinger"
 
-#: ../js/ui/statusMenu.js:252
+#: ../js/ui/statusMenu.js:242
 msgid "Lock Screen"
 msgstr "Lås skjerm"
 
-#: ../js/ui/statusMenu.js:257
+#: ../js/ui/statusMenu.js:247
 msgid "Switch User"
 msgstr "Bytt bruker"
 
-#: ../js/ui/statusMenu.js:262
+#: ../js/ui/statusMenu.js:252
 msgid "Log Out..."
 msgstr "Logg ut …"
 
@@ -805,7 +805,7 @@ msgstr "Alltid gi tilgang"
 msgid "Grant this time only"
 msgstr "Gi tilgang kun denne ene gangen"
 
-#: ../js/ui/status/bluetooth.js:409
+#: ../js/ui/status/bluetooth.js:409 ../js/ui/telepathyClient.js:954
 msgid "Reject"
 msgstr "Avvis"
 
@@ -894,13 +894,13 @@ msgstr "ikke tilgjengelig"
 msgid "connection failed"
 msgstr "tilkobling feilet"
 
-#: ../js/ui/status/network.js:582 ../js/ui/status/network.js:1489
+#: ../js/ui/status/network.js:582 ../js/ui/status/network.js:1507
 msgid "More..."
 msgstr "Mer …"
 
 #. TRANSLATORS: this is the indication that a connection for another logged in user is active,
 #. and we cannot access its settings (including the name)
-#: ../js/ui/status/network.js:618 ../js/ui/status/network.js:1427
+#: ../js/ui/status/network.js:618 ../js/ui/status/network.js:1444
 msgid "Connected (private)"
 msgstr "Tilkoblet (privat)"
 
@@ -917,7 +917,7 @@ msgid "Auto dial-up"
 msgstr "Automatisk oppringt"
 
 #. TRANSLATORS: this the automatic wireless connection name (including the network name)
-#: ../js/ui/status/network.js:898 ../js/ui/status/network.js:1439
+#: ../js/ui/status/network.js:898 ../js/ui/status/network.js:1456
 #, c-format
 msgid "Auto %s"
 msgstr "Automatisk %s"
@@ -926,68 +926,68 @@ msgstr "Automatisk %s"
 msgid "Auto bluetooth"
 msgstr "Automatisk Bluetooth"
 
-#: ../js/ui/status/network.js:1441
+#: ../js/ui/status/network.js:1458
 msgid "Auto wireless"
 msgstr "Automatisk trådløst"
 
-#: ../js/ui/status/network.js:1531
+#: ../js/ui/status/network.js:1550
 msgid "Enable networking"
 msgstr "Slå på nettverk"
 
-#: ../js/ui/status/network.js:1543
+#: ../js/ui/status/network.js:1562
 msgid "Wired"
 msgstr "Kablet"
 
-#: ../js/ui/status/network.js:1554
+#: ../js/ui/status/network.js:1573
 msgid "Wireless"
 msgstr "Trådløst"
 
-#: ../js/ui/status/network.js:1564
+#: ../js/ui/status/network.js:1583
 msgid "Mobile broadband"
 msgstr "Mobilt bredbånd"
 
-#: ../js/ui/status/network.js:1574
+#: ../js/ui/status/network.js:1593
 msgid "VPN Connections"
 msgstr "VPN-tilkoblinger"
 
-#: ../js/ui/status/network.js:1586
+#: ../js/ui/status/network.js:1605
 msgid "Network Settings"
 msgstr "Innstillinger for nettverk"
 
-#: ../js/ui/status/network.js:1878
+#: ../js/ui/status/network.js:1897
 #, c-format
 msgid "You're now connected to mobile broadband connection '%s'"
 msgstr "Du er nå koblet til mobil bredbåndstilkobling «%s»"
 
-#: ../js/ui/status/network.js:1882
+#: ../js/ui/status/network.js:1901
 #, c-format
 msgid "You're now connected to wireless network '%s'"
 msgstr "Du er nå koblet til trådløst nettverk «%s»"
 
-#: ../js/ui/status/network.js:1886
+#: ../js/ui/status/network.js:1905
 #, c-format
 msgid "You're now connected to wired network '%s'"
 msgstr "Du er nå koblet til kablet nettverk «%s»"
 
-#: ../js/ui/status/network.js:1890
+#: ../js/ui/status/network.js:1909
 #, c-format
 msgid "You're now connected to VPN network '%s'"
 msgstr "Du er nå koblet til virtuelt privat nettverk «%s»"
 
-#: ../js/ui/status/network.js:1895
+#: ../js/ui/status/network.js:1914
 #, c-format
 msgid "You're now connected to '%s'"
 msgstr "Du er nå koblet til «%s»"
 
-#: ../js/ui/status/network.js:1903
+#: ../js/ui/status/network.js:1922
 msgid "Connection established"
 msgstr "Tilkobling etablert"
 
-#: ../js/ui/status/network.js:2029
+#: ../js/ui/status/network.js:2048
 msgid "Networking is disabled"
 msgstr "Nettverk er slått av"
 
-#: ../js/ui/status/network.js:2154
+#: ../js/ui/status/network.js:2173
 msgid "Network Manager"
 msgstr "Nettverkshåndtering"
 
@@ -997,11 +997,11 @@ msgstr "Innstillinger for strøm"
 
 #. 0 is reported when UPower does not have enough data
 #. to estimate battery life
-#: ../js/ui/status/power.js:110
+#: ../js/ui/status/power.js:109
 msgid "Estimating..."
 msgstr "Estimerer …"
 
-#: ../js/ui/status/power.js:117
+#: ../js/ui/status/power.js:116
 #, c-format
 msgid "%d hour remaining"
 msgid_plural "%d hours remaining"
@@ -1009,75 +1009,75 @@ msgstr[0] "%d time gjenstår"
 msgstr[1] "%d timer gjenstår"
 
 #. TRANSLATORS: this is a time string, as in "%d hours %d minutes remaining"
-#: ../js/ui/status/power.js:120
+#: ../js/ui/status/power.js:119
 #, c-format
 msgid "%d %s %d %s remaining"
 msgstr "%d %s %d %s gjenstår"
 
-#: ../js/ui/status/power.js:122
+#: ../js/ui/status/power.js:121
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "time"
 msgstr[1] "timer"
 
-#: ../js/ui/status/power.js:122
+#: ../js/ui/status/power.js:121
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutt"
 msgstr[1] "minutter"
 
-#: ../js/ui/status/power.js:125
+#: ../js/ui/status/power.js:124
 #, c-format
 msgid "%d minute remaining"
 msgid_plural "%d minutes remaining"
 msgstr[0] "%d minutt gjenstår"
 msgstr[1] "%d minutter gjenstår"
 
-#: ../js/ui/status/power.js:227
+#: ../js/ui/status/power.js:216
 msgid "AC adapter"
 msgstr "Strømadapter"
 
-#: ../js/ui/status/power.js:229
+#: ../js/ui/status/power.js:218
 msgid "Laptop battery"
 msgstr "Batteri på bærbar"
 
-#: ../js/ui/status/power.js:231
+#: ../js/ui/status/power.js:220
 msgid "UPS"
 msgstr "UPS"
 
-#: ../js/ui/status/power.js:233
+#: ../js/ui/status/power.js:222
 msgid "Monitor"
 msgstr "Skjerm"
 
-#: ../js/ui/status/power.js:235
+#: ../js/ui/status/power.js:224
 msgid "Mouse"
 msgstr "Mus"
 
-#: ../js/ui/status/power.js:237
+#: ../js/ui/status/power.js:226
 msgid "Keyboard"
 msgstr "Tastatur"
 
-#: ../js/ui/status/power.js:239
+#: ../js/ui/status/power.js:228
 msgid "PDA"
 msgstr "PDA"
 
-#: ../js/ui/status/power.js:241
+#: ../js/ui/status/power.js:230
 msgid "Cell phone"
 msgstr "Mobiltelefon"
 
-#: ../js/ui/status/power.js:243
+#: ../js/ui/status/power.js:232
 msgid "Media player"
 msgstr "Medieavspiller"
 
-#: ../js/ui/status/power.js:245
+#: ../js/ui/status/power.js:234
 msgid "Tablet"
 msgstr "Nettbrett"
 
-#: ../js/ui/status/power.js:247
+#: ../js/ui/status/power.js:236
 msgid "Computer"
 msgstr "Datamaskin"
 
-#: ../js/ui/status/power.js:249 ../src/shell-app-system.c:1088
+#: ../js/ui/status/power.js:238 ../src/shell-app-system.c:1088
 msgid "Unknown"
 msgstr "Ukjent"
 
@@ -1089,22 +1089,34 @@ msgstr "Volum"
 msgid "Microphone"
 msgstr "Mikrofon"
 
-#: ../js/ui/telepathyClient.js:497
+#. We got the TpContact
+#. FIXME: We don't have a 'chat room' icon (bgo #653737) use
+#. system-users for now as Empathy does.
+#: ../js/ui/telepathyClient.js:228
+msgid "Invitation"
+msgstr "Invitasjon"
+
+#. We got the TpContact
+#: ../js/ui/telepathyClient.js:291
+msgid "Call"
+msgstr "Ring"
+
+#: ../js/ui/telepathyClient.js:541
 #, c-format
 msgid "%s is online."
 msgstr "%s er tilkoblet."
 
-#: ../js/ui/telepathyClient.js:502
+#: ../js/ui/telepathyClient.js:546
 #, c-format
 msgid "%s is offline."
 msgstr "%s er frakoblet."
 
-#: ../js/ui/telepathyClient.js:505
+#: ../js/ui/telepathyClient.js:549
 #, c-format
 msgid "%s is away."
 msgstr "«%s» er borte."
 
-#: ../js/ui/telepathyClient.js:508
+#: ../js/ui/telepathyClient.js:552
 #, c-format
 msgid "%s is busy."
 msgstr "%s er opptatt."
@@ -1112,25 +1124,21 @@ msgstr "%s er opptatt."
 #. Translators: this is a time format string followed by a date.
 #. If applicable, replace %X with a strftime format valid for your
 #. locale, without seconds.
-#: ../js/ui/telepathyClient.js:697
+#: ../js/ui/telepathyClient.js:741
 #, no-c-format
 msgid "Sent at %X on %A"
 msgstr "Sendt %X på %A"
 
 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/telepathyClient.js:747
+#: ../js/ui/telepathyClient.js:791
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s er nå kjent som %s"
 
-#: ../js/ui/telepathyClient.js:811
-msgid "Invitation"
-msgstr "Invitasjon"
-
 #. translators: argument is a room name like
 #. * room@jabber.org for example.
-#: ../js/ui/telepathyClient.js:855
+#: ../js/ui/telepathyClient.js:898
 #, c-format
 msgid "Invitation to %s"
 msgstr "Invitasjon til %s"
@@ -1138,19 +1146,35 @@ msgstr "Invitasjon til %s"
 #. translators: first argument is the name of a contact and the second
 #. * one the name of a room. "Alice is inviting you to join room@jabber.org
 #. * for example.
-#: ../js/ui/telepathyClient.js:863
+#: ../js/ui/telepathyClient.js:906
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s inviterer deg til å bli med i %s"
 
-#: ../js/ui/telepathyClient.js:865
+#: ../js/ui/telepathyClient.js:908
 msgid "Decline"
 msgstr "Avslå"
 
-#: ../js/ui/telepathyClient.js:866
+#: ../js/ui/telepathyClient.js:909
 msgid "Accept"
 msgstr "Godta"
 
+#. translators: argument is a contact name like Alice for example.
+#: ../js/ui/telepathyClient.js:942
+#, c-format
+msgid "Video call from %s"
+msgstr "Videosamtale fra %s"
+
+#. translators: argument is a contact name like Alice for example.
+#: ../js/ui/telepathyClient.js:945
+#, c-format
+msgid "Call from %s"
+msgstr "Samtale fra %s"
+
+#: ../js/ui/telepathyClient.js:955
+msgid "Answer"
+msgstr "Svar"
+
 #. Translators: this is the text displayed
 #. in the search entry when no search is
 #. active; it should not exceed ~30