aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKjartan Maraas <kmaraas@gnome.org>2011-07-12 18:50:05 +0800
committerKjartan Maraas <kmaraas@gnome.org>2011-07-12 18:50:05 +0800
commitd786fd74bda1df1067d71897f525f2a0e0fa50f7 (patch)
tree3a9a075e0dc89a6eb5abe79e11bb35b09657eae8
parent55d7a944fa0783718a69e4d1b5e574f326befa58 (diff)
downloadgsoc2013-empathy-d786fd74bda1df1067d71897f525f2a0e0fa50f7.tar
gsoc2013-empathy-d786fd74bda1df1067d71897f525f2a0e0fa50f7.tar.gz
gsoc2013-empathy-d786fd74bda1df1067d71897f525f2a0e0fa50f7.tar.bz2
gsoc2013-empathy-d786fd74bda1df1067d71897f525f2a0e0fa50f7.tar.lz
gsoc2013-empathy-d786fd74bda1df1067d71897f525f2a0e0fa50f7.tar.xz
gsoc2013-empathy-d786fd74bda1df1067d71897f525f2a0e0fa50f7.tar.zst
gsoc2013-empathy-d786fd74bda1df1067d71897f525f2a0e0fa50f7.zip
Updated Norwegian bokmål translation
-rw-r--r--po/nb.po398
1 files changed, 212 insertions, 186 deletions
diff --git a/po/nb.po b/po/nb.po
index c895d97c9..c5a1e6169 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -5,10 +5,10 @@
# Torstein Adolf Winterseth <kvikende@fsfe.org>, 2010.
msgid ""
msgstr ""
-"Project-Id-Version: empathy 2.92.x\n"
+"Project-Id-Version: empathy 3.1.x\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-02 01:37+0200\n"
-"PO-Revision-Date: 2011-07-02 01:37+0200\n"
+"POT-Creation-Date: 2011-07-12 12:48+0200\n"
+"PO-Revision-Date: 2011-07-12 12:50+0200\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
"Language: no\n"
@@ -1516,8 +1516,8 @@ msgid "%s is now known as %s"
msgstr "%s er nå kjent som %s"
#: ../libempathy-gtk/empathy-chat.c:2688
-#: ../src/empathy-streamed-media-window.c:1935
-#: ../src/empathy-event-manager.c:1241 ../src/empathy-call-window.c:1869
+#: ../src/empathy-streamed-media-window.c:1939
+#: ../src/empathy-event-manager.c:1241 ../src/empathy-call-window.c:1858
msgid "Disconnected"
msgstr "Koblet fra"
@@ -1552,7 +1552,7 @@ msgid "Join"
msgstr "Bli med"
#: ../libempathy-gtk/empathy-chat.c:3755 ../src/empathy-event-manager.c:1262
-#: ../src/empathy-call-window.c:2125
+#: ../src/empathy-call-window.c:2105
msgid "Connected"
msgstr "Koblet til"
@@ -1608,13 +1608,13 @@ msgstr "Blokkerte kontakter"
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:1410
+#: ../libempathy-gtk/empathy-theme-adium.c:1417
msgid "_Copy Link Address"
msgstr "_Kopier lenkens adresse"
#. Open Link menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:1417
+#: ../libempathy-gtk/empathy-theme-adium.c:1424
msgid "_Open Link"
msgstr "_Åpne lenke"
@@ -1722,48 +1722,48 @@ msgid "_Block Contact"
msgstr "_Blokker kontakt"
#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:547
+#: ../libempathy-gtk/empathy-individual-menu.c:548
#: ../src/empathy-main-window.ui.h:16
msgid "_Chat"
msgstr "_Prat"
#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:638
+#: ../libempathy-gtk/empathy-individual-menu.c:639
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Lydsamtale"
#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:682
+#: ../libempathy-gtk/empathy-individual-menu.c:684
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Videosamtale"
#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:737
#: ../src/empathy-main-window.ui.h:27
msgid "_Previous Conversations"
msgstr "_Tidligere samtaler"
#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:766
+#: ../libempathy-gtk/empathy-individual-menu.c:778
msgid "Send File"
msgstr "Send fil"
#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:808
+#: ../libempathy-gtk/empathy-individual-menu.c:820
msgid "Share My Desktop"
msgstr "Del mitt skrivebord"
#: ../libempathy-gtk/empathy-contact-menu.c:525
#: ../libempathy-gtk/empathy-contact-widget.c:1890
-#: ../libempathy-gtk/empathy-individual-menu.c:843
+#: ../libempathy-gtk/empathy-individual-menu.c:855
#: ../libempathy-gtk/empathy-individual-widget.c:1386
msgid "Favorite"
msgstr "Favoritt"
#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:871
+#: ../libempathy-gtk/empathy-individual-menu.c:883
msgid "Infor_mation"
msgstr "Infor_masjon"
@@ -1773,13 +1773,13 @@ msgid "_Edit"
msgstr "R_ediger"
#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1058
+#: ../libempathy-gtk/empathy-individual-menu.c:1070
#: ../src/empathy-chat-window.c:1010
msgid "Inviting you to this room"
msgstr "Inviterer deg til dette rommet"
#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1104
+#: ../libempathy-gtk/empathy-individual-menu.c:1116
msgid "_Invite to Chat Room"
msgstr "_Inviter til praterom"
@@ -2103,25 +2103,25 @@ msgstr "Kontakter som velges i listen til venstre vil bli koblet sammen."
#. Translators: this is used in the context menu for a contact. The first
#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
#. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:137
+#: ../libempathy-gtk/empathy-individual-menu.c:138
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:593
+#: ../libempathy-gtk/empathy-individual-menu.c:594
#: ../libempathy-gtk/empathy-new-message-dialog.c:248
msgid "_SMS"
msgstr "_SMS"
-#: ../libempathy-gtk/empathy-individual-menu.c:919
+#: ../libempathy-gtk/empathy-individual-menu.c:931
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "R_ediger"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:945
+#: ../libempathy-gtk/empathy-individual-menu.c:957
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "Koble kontakter …"
@@ -2222,117 +2222,127 @@ msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "_Fjern kobling"
-#: ../libempathy-gtk/empathy-log-window.c:419
+#: ../libempathy-gtk/empathy-log-window.c:458
+msgid "History"
+msgstr "Historikk"
+
+#: ../libempathy-gtk/empathy-log-window.c:510
msgid "Show"
msgstr "Vis"
-#: ../libempathy-gtk/empathy-log-window.c:441
+#: ../libempathy-gtk/empathy-log-window.c:532
msgid "Search"
msgstr "Søk"
-#: ../libempathy-gtk/empathy-log-window.c:676
-#: ../libempathy-gtk/empathy-log-window.c:840
-msgctxt "A date with the time"
-msgid "%A, %e %B %Y %X"
-msgstr "%A, %e %B %Y %X"
+#: ../libempathy-gtk/empathy-log-window.c:946
+#, c-format
+msgid "Chat in %s"
+msgstr "Prat i %s"
-#: ../libempathy-gtk/empathy-log-window.c:678
+#: ../libempathy-gtk/empathy-log-window.c:948
#, c-format
msgid "Chat with %s"
msgstr "Prat med %s"
+#: ../libempathy-gtk/empathy-log-window.c:998
+#: ../libempathy-gtk/empathy-log-window.c:1176
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%A, %e %B %Y %X"
+
#. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:797
+#: ../libempathy-gtk/empathy-log-window.c:1118
#, c-format
msgid "<i>* %s %s</i>"
msgstr "<i>* %s %s</i>"
#. Translators: this is a message: 'Danielle: hello'
#. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:803
+#: ../libempathy-gtk/empathy-log-window.c:1124
#, c-format
msgid "<b>%s:</b> %s"
msgstr "<b>%s:</b> %s"
-#: ../libempathy-gtk/empathy-log-window.c:859
-#: ../libempathy-gtk/empathy-log-window.c:861 ../src/empathy-ft-manager.c:1026
+#: ../libempathy-gtk/empathy-log-window.c:1195
+#: ../libempathy-gtk/empathy-log-window.c:1197
+#: ../src/empathy-ft-manager.c:1026
msgid "%"
msgstr "%"
-#: ../libempathy-gtk/empathy-log-window.c:868
+#: ../libempathy-gtk/empathy-log-window.c:1204
#, c-format
msgid "Call took %s, ended at %s"
msgstr "Samtalen tok %s, avsluttet %s"
-#: ../libempathy-gtk/empathy-log-window.c:1195
+#: ../libempathy-gtk/empathy-log-window.c:1536
msgid "Today"
msgstr "I dag"
-#: ../libempathy-gtk/empathy-log-window.c:1199
+#: ../libempathy-gtk/empathy-log-window.c:1540
msgid "Yesterday"
msgstr "I går"
-#: ../libempathy-gtk/empathy-log-window.c:1215
+#: ../libempathy-gtk/empathy-log-window.c:1556
msgctxt ""
"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
msgid "%e %B %Y"
msgstr "%e %B %Y"
-#: ../libempathy-gtk/empathy-log-window.c:1296
-#: ../libempathy-gtk/empathy-log-window.c:2736
+#: ../libempathy-gtk/empathy-log-window.c:1637
+#: ../libempathy-gtk/empathy-log-window.c:3203
msgid "Anytime"
msgstr "Når som helst"
-#: ../libempathy-gtk/empathy-log-window.c:1368
-#: ../libempathy-gtk/empathy-log-window.c:1712
+#: ../libempathy-gtk/empathy-log-window.c:1717
+#: ../libempathy-gtk/empathy-log-window.c:2154
msgid "Anyone"
msgstr "Hvem som helst"
-#: ../libempathy-gtk/empathy-log-window.c:1992
+#: ../libempathy-gtk/empathy-log-window.c:2451
msgid "Who"
msgstr "Hvem"
-#: ../libempathy-gtk/empathy-log-window.c:2196
+#: ../libempathy-gtk/empathy-log-window.c:2655
msgid "When"
msgstr "Når"
-#: ../libempathy-gtk/empathy-log-window.c:2312
+#: ../libempathy-gtk/empathy-log-window.c:2771
msgid "Anything"
msgstr "Hva som helst"
-#: ../libempathy-gtk/empathy-log-window.c:2314
+#: ../libempathy-gtk/empathy-log-window.c:2773
msgid "Text chats"
msgstr "Tekstsamtaler"
-#: ../libempathy-gtk/empathy-log-window.c:2316
+#: ../libempathy-gtk/empathy-log-window.c:2775
msgid "Calls"
msgstr "Samtaler"
-#: ../libempathy-gtk/empathy-log-window.c:2321
+#: ../libempathy-gtk/empathy-log-window.c:2780
msgid "Incoming calls"
msgstr "Innkommende samtaler"
-#: ../libempathy-gtk/empathy-log-window.c:2322
+#: ../libempathy-gtk/empathy-log-window.c:2781
msgid "Outgoing calls"
msgstr "Utgående samtaler"
-#: ../libempathy-gtk/empathy-log-window.c:2323
+#: ../libempathy-gtk/empathy-log-window.c:2782
msgid "Missed calls"
msgstr "Tapte samtaler"
-#: ../libempathy-gtk/empathy-log-window.c:2344
+#: ../libempathy-gtk/empathy-log-window.c:2804
msgid "What"
msgstr "Hva"
-#: ../libempathy-gtk/empathy-log-window.c:3039
+#: ../libempathy-gtk/empathy-log-window.c:3506
msgid "Are you sure you want to delete all logs of previous conversations?"
msgstr "Er du sikker på at du vil slette alle logger av tidligere samtaler?"
-#: ../libempathy-gtk/empathy-log-window.c:3043
+#: ../libempathy-gtk/empathy-log-window.c:3510
msgid "Clear All"
msgstr "Tøm alle"
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3517
msgid "Delete from:"
msgstr "Slett fra:"
@@ -2343,7 +2353,7 @@ msgstr "<span size=\"x-large\">Laster …</span>"
#. translators: Call is a noun. This string is used in the window
#. * title
#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1340
+#: ../src/empathy-streamed-media-window.c:1344
msgid "Call"
msgstr "Ring"
@@ -2357,29 +2367,25 @@ msgid "Delete All History..."
msgstr "Slett all historikk …"
#: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "History"
-msgstr "Historikk"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
msgid "Profile"
msgstr "Profil"
-#: ../libempathy-gtk/empathy-log-window.ui.h:7
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
#: ../src/empathy-call-window.ui.h:20
#: ../src/empathy-streamed-media-window.ui.h:20
msgid "Video"
msgstr "Video"
-#: ../libempathy-gtk/empathy-log-window.ui.h:8
+#: ../libempathy-gtk/empathy-log-window.ui.h:7
#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:20
msgid "_Edit"
msgstr "_Rediger"
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
msgid "_File"
msgstr "_Fil"
-#: ../libempathy-gtk/empathy-log-window.ui.h:10
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
msgid "page 2"
msgstr "side 2"
@@ -2398,17 +2404,17 @@ msgid "New Conversation"
msgstr "Ny samtale"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:216
+#: ../libempathy-gtk/empathy-new-call-dialog.c:231
msgid "Send _Video"
msgstr "Send _video"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:224
+#: ../libempathy-gtk/empathy-new-call-dialog.c:242
msgid "C_all"
msgstr "S_amtale"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:234
+#: ../libempathy-gtk/empathy-new-call-dialog.c:252
msgid "New Call"
msgstr "Ny samtale"
@@ -2537,12 +2543,12 @@ msgstr "Rediger egendefinerte meldinger"
msgid "Remove"
msgstr "Fjern"
-#: ../libempathy-gtk/empathy-theme-adium.c:1118
+#: ../libempathy-gtk/empathy-theme-adium.c:1121
#, c-format
msgid "Message edited at %s"
msgstr "Melding redigert %s"
-#: ../libempathy-gtk/empathy-theme-adium.c:1937
+#: ../libempathy-gtk/empathy-theme-adium.c:1943
msgid "Normal"
msgstr "Normal"
@@ -3089,7 +3095,7 @@ msgid "Your new account has not been saved yet."
msgstr "Din nye konto er ikke lagret ennå."
#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:797 ../src/empathy-call-window.c:780
+#: ../src/empathy-streamed-media-window.c:801 ../src/empathy-call-window.c:880
msgid "Connecting…"
msgstr "Kobler til …"
@@ -3197,121 +3203,121 @@ msgstr "Empathy autentiseringsklient"
msgid "People nearby"
msgstr "Personer i nærheten"
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:120
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:124
msgid "- Empathy Audio/Video Client"
msgstr "- Empathy lyd-/bildeklient"
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:138
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:145
msgid "Empathy Audio/Video Client"
msgstr "Empathy lyd-/bildeklient"
-#: ../src/empathy-streamed-media-window.c:478 ../src/empathy-call-window.c:472
+#: ../src/empathy-streamed-media-window.c:478 ../src/empathy-call-window.c:458
msgid "Contrast"
msgstr "Kontrast"
-#: ../src/empathy-streamed-media-window.c:481 ../src/empathy-call-window.c:475
+#: ../src/empathy-streamed-media-window.c:481 ../src/empathy-call-window.c:461
msgid "Brightness"
msgstr "Lysstyrke"
-#: ../src/empathy-streamed-media-window.c:484 ../src/empathy-call-window.c:478
+#: ../src/empathy-streamed-media-window.c:484 ../src/empathy-call-window.c:464
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-streamed-media-window.c:589 ../src/empathy-call-window.c:583
+#: ../src/empathy-streamed-media-window.c:589 ../src/empathy-call-window.c:569
msgid "Volume"
msgstr "Volum"
-#: ../src/empathy-streamed-media-window.c:1153
-#: ../src/empathy-call-window.c:1127
+#: ../src/empathy-streamed-media-window.c:1157
+#: ../src/empathy-call-window.ui.h:22
msgid "_Sidebar"
msgstr "_Sidelinje"
-#: ../src/empathy-streamed-media-window.c:1173
+#: ../src/empathy-streamed-media-window.c:1177
#: ../src/empathy-call-window.c:1149
msgid "Audio input"
msgstr "Lydinngang"
-#: ../src/empathy-streamed-media-window.c:1177
+#: ../src/empathy-streamed-media-window.c:1181
#: ../src/empathy-call-window.c:1153
msgid "Video input"
msgstr "Videoinngang"
-#: ../src/empathy-streamed-media-window.c:1181
+#: ../src/empathy-streamed-media-window.c:1185
#: ../src/empathy-call-window.c:1157
msgid "Dialpad"
msgstr "Nummertavle"
-#: ../src/empathy-streamed-media-window.c:1192
+#: ../src/empathy-streamed-media-window.c:1196
#: ../src/empathy-call-window.c:1167
msgid "Details"
msgstr "Detaljer"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1261
-#: ../src/empathy-call-window.c:1239
+#: ../src/empathy-streamed-media-window.c:1265
+#: ../src/empathy-call-window.c:1250
#, c-format
msgid "Call with %s"
msgstr "Samtale med %s"
-#: ../src/empathy-streamed-media-window.c:1494
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-streamed-media-window.c:1498
+#: ../src/empathy-call-window.c:1447
msgid "The IP address as seen by the machine"
msgstr "IP-adresse som sett av maskinen"
-#: ../src/empathy-streamed-media-window.c:1496
-#: ../src/empathy-call-window.c:1461
+#: ../src/empathy-streamed-media-window.c:1500
+#: ../src/empathy-call-window.c:1449
msgid "The IP address as seen by a server on the Internet"
msgstr "IP-adresse som sett av en tjener på internett"
-#: ../src/empathy-streamed-media-window.c:1498
-#: ../src/empathy-call-window.c:1463
+#: ../src/empathy-streamed-media-window.c:1502
+#: ../src/empathy-call-window.c:1451
msgid "The IP address of the peer as seen by the other side"
msgstr "IP-adresse for peer som sett av andre siden"
-#: ../src/empathy-streamed-media-window.c:1500
-#: ../src/empathy-call-window.c:1465
+#: ../src/empathy-streamed-media-window.c:1504
+#: ../src/empathy-call-window.c:1453
msgid "The IP address of a relay server"
msgstr "IP-adresse for en relay-tjener"
-#: ../src/empathy-streamed-media-window.c:1502
-#: ../src/empathy-call-window.c:1467
+#: ../src/empathy-streamed-media-window.c:1506
+#: ../src/empathy-call-window.c:1455
msgid "The IP address of the multicast group"
msgstr "IP-adresse for multicast-gruppe"
-#: ../src/empathy-streamed-media-window.c:1884
+#: ../src/empathy-streamed-media-window.c:1888
msgctxt "encoding video codec"
msgid "Unknown"
msgstr "Ukjent"
-#: ../src/empathy-streamed-media-window.c:1887
+#: ../src/empathy-streamed-media-window.c:1891
msgctxt "encoding audio codec"
msgid "Unknown"
msgstr "Ukjent"
-#: ../src/empathy-streamed-media-window.c:1890
+#: ../src/empathy-streamed-media-window.c:1894
msgctxt "decoding video codec"
msgid "Unknown"
msgstr "Ukjent"
-#: ../src/empathy-streamed-media-window.c:1893
+#: ../src/empathy-streamed-media-window.c:1897
msgctxt "decoding audio codec"
msgid "Unknown"
msgstr "Ukjent"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2185
+#: ../src/empathy-streamed-media-window.c:2189
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Koblet til - %d:%02dm"
-#: ../src/empathy-streamed-media-window.c:2246
-#: ../src/empathy-call-window.c:2187
+#: ../src/empathy-streamed-media-window.c:2250
+#: ../src/empathy-call-window.c:2167
msgid "Technical Details"
msgstr "Tekniske detaljer"
-#: ../src/empathy-streamed-media-window.c:2284
-#: ../src/empathy-call-window.c:2225
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2205
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -3320,8 +3326,8 @@ msgstr ""
"Programvaren til %s forstår ikke noen av lydformatene som støttes av din "
"datamaskin"
-#: ../src/empathy-streamed-media-window.c:2289
-#: ../src/empathy-call-window.c:2230
+#: ../src/empathy-streamed-media-window.c:2293
+#: ../src/empathy-call-window.c:2210
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -3330,8 +3336,8 @@ msgstr ""
"Programvaren til %s forstår ikke noen av videoformatene som støttes av din "
"datamaskin"
-#: ../src/empathy-streamed-media-window.c:2295
-#: ../src/empathy-call-window.c:2236
+#: ../src/empathy-streamed-media-window.c:2299
+#: ../src/empathy-call-window.c:2216
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -3340,29 +3346,29 @@ msgstr ""
"Kan ikke etablere tilkobling til %s. En av dere kan være på et nettverk som "
"ikke tillater direkte tilkoblinger."
-#: ../src/empathy-streamed-media-window.c:2301
-#: ../src/empathy-call-window.c:2242
+#: ../src/empathy-streamed-media-window.c:2305
+#: ../src/empathy-call-window.c:2222
msgid "There was a failure on the network"
msgstr "Det oppsto en feil på nettverket"
-#: ../src/empathy-streamed-media-window.c:2305
-#: ../src/empathy-call-window.c:2246
+#: ../src/empathy-streamed-media-window.c:2309
+#: ../src/empathy-call-window.c:2226
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-streamed-media-window.c:2308
-#: ../src/empathy-call-window.c:2249
+#: ../src/empathy-streamed-media-window.c:2312
+#: ../src/empathy-call-window.c:2229
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-streamed-media-window.c:2318
-#: ../src/empathy-call-window.c:2261
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:2241
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3373,23 +3379,23 @@ msgstr ""
"\">rapporter denne feilen</a> og legg ved loggene som samles inn i "
"«Feilsøking»-vinduet i Hjelp-menyen."
-#: ../src/empathy-streamed-media-window.c:2326
-#: ../src/empathy-call-window.c:2270
+#: ../src/empathy-streamed-media-window.c:2330
+#: ../src/empathy-call-window.c:2250
msgid "There was a failure in the call engine"
msgstr "Det oppsto en feil i samtalemotoren"
-#: ../src/empathy-streamed-media-window.c:2329
-#: ../src/empathy-call-window.c:2273
+#: ../src/empathy-streamed-media-window.c:2333
+#: ../src/empathy-call-window.c:2253
msgid "The end of the stream was reached"
msgstr "Slutt på strømmen ble nådd"
-#: ../src/empathy-streamed-media-window.c:2369
-#: ../src/empathy-call-window.c:2313
+#: ../src/empathy-streamed-media-window.c:2373
+#: ../src/empathy-call-window.c:2293
msgid "Can't establish audio stream"
msgstr "Kan ikke etablere lydstrøm"
-#: ../src/empathy-streamed-media-window.c:2379
-#: ../src/empathy-call-window.c:2323
+#: ../src/empathy-streamed-media-window.c:2383
+#: ../src/empathy-call-window.c:2303
msgid "Can't establish video stream"
msgstr "Kan ikke etablere videostrøm"
@@ -3404,117 +3410,91 @@ msgid "Call the contact again"
msgstr "Ring kontakten igjen"
#: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Kamera av"
-
-#: ../src/empathy-call-window.ui.h:4
-#: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Kamera på"
-
-#: ../src/empathy-call-window.ui.h:5
#: ../src/empathy-streamed-media-window.ui.h:5
msgid "Decoding Codec:"
msgstr "Kodek for dekoding:"
-#: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Slå av kamera og stopp sending av video"
-
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Slå på kamera og send video"
+#: ../src/empathy-call-window.ui.h:4
+msgid "Disable camera"
+msgstr "Slå av kamera"
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Slå på kamera men ikke send video"
+#: ../src/empathy-call-window.ui.h:5
+msgid "Display the dialpad"
+msgstr "Vis ringetastatur"
-#: ../src/empathy-call-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:6
#: ../src/empathy-streamed-media-window.ui.h:9
msgid "Encoding Codec:"
msgstr "Kodek for koding:"
-#: ../src/empathy-call-window.ui.h:10
+#: ../src/empathy-call-window.ui.h:7
#: ../src/empathy-streamed-media-window.ui.h:10
msgid "Hang up"
msgstr "Legg på"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:8
#: ../src/empathy-streamed-media-window.ui.h:11
msgid "Hang up current call"
msgstr "Legg på denne samtalen"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:9
#: ../src/empathy-streamed-media-window.ui.h:12
msgid "Local Candidate:"
msgstr "Lokal kandidat:"
-#: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Forhåndsvis"
+#: ../src/empathy-call-window.ui.h:10
+msgid "Maximise me"
+msgstr "Maksimer meg"
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:11
+msgid "Minimise me"
+msgstr "Minimer meg"
+
+#: ../src/empathy-call-window.ui.h:12
#: ../src/empathy-streamed-media-window.ui.h:14
msgid "Redial"
msgstr "Ring på nytt"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:13
#: ../src/empathy-streamed-media-window.ui.h:15
msgid "Remote Candidate:"
msgstr "Ekstern kandidat:"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:14
#: ../src/empathy-streamed-media-window.ui.h:16
msgid "Send Audio"
msgstr "Send lyd"
+#: ../src/empathy-call-window.ui.h:15
+msgid "Send Video"
+msgstr "Send video"
+
+#: ../src/empathy-call-window.ui.h:16
+msgid "Show dialpad"
+msgstr "Vis ringetastatur"
+
#: ../src/empathy-call-window.ui.h:17
#: ../src/empathy-streamed-media-window.ui.h:17
msgid "Toggle audio transmission"
msgstr "Slå av/på overføring av lyd"
#: ../src/empathy-call-window.ui.h:18
+msgid "Toggle video transmission"
+msgstr "Slå av/på overføring av video"
+
+#: ../src/empathy-call-window.ui.h:19
#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:1824 ../src/empathy-call-window.c:1825
-#: ../src/empathy-call-window.c:1826 ../src/empathy-call-window.c:1827
+#: ../src/empathy-call-window.c:1813 ../src/empathy-call-window.c:1814
+#: ../src/empathy-call-window.c:1815 ../src/empathy-call-window.c:1816
msgid "Unknown"
msgstr "Ukjent"
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ideo"
-
#: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Video av"
-
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Video på"
-
-#: ../src/empathy-call-window.ui.h:23
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Forhåndsvis video"
-
-#: ../src/empathy-call-window.ui.h:24
#: ../src/empathy-streamed-media-window.ui.h:24
msgid "_Call"
msgstr "_Ring"
-#: ../src/empathy-call-window.ui.h:25
-msgid "_Dialpad"
-msgstr "_Nummertavle"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-main-window.ui.h:30
+#: ../src/empathy-call-window.ui.h:23 ../src/empathy-main-window.ui.h:30
#: ../src/empathy-streamed-media-window.ui.h:25
msgid "_View"
msgstr "_Vis"
@@ -4309,6 +4289,46 @@ msgstr "Status"
msgid "_Quit"
msgstr "_Avslutt"
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "Kamera av"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "Kamera på"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "Slå av kamera og stopp sending av video"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "Slå på kamera og send video"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "Slå på kamera men ikke send video"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "Forhåndsvis"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "V_ideo"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "Video av"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "Video på"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "Forhåndsvis video"
+
#: ../src/empathy-map-view.c:448
msgid "Contact Map View"
msgstr "Kartvisning for kontakter"
@@ -4461,18 +4481,24 @@ msgstr "Oppgi"
msgid "%s just tried to call you, but you were in another call."
msgstr "%s prøvde å ringe deg, men du var i en annen samtale."
-#: ../src/empathy-call-window.c:1246
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:787 ../src/empathy-call-window.c:801
+msgid "i"
+msgstr "i"
+
+#: ../src/empathy-call-window.c:1257
#, c-format
msgid "Call with %d participants"
msgstr "Samtale med %d deltakere"
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2124
+#: ../src/empathy-call-window.c:2104
#, c-format
msgid "%s — %d:%02dm"
msgstr "%s – %d:%02dm"
-#: ../src/empathy-call-window.c:2125
+#: ../src/empathy-call-window.c:2105
msgid "On hold"
msgstr "På vent"