aboutsummaryrefslogtreecommitdiffstats
path: root/po/nb.po
diff options
context:
space:
mode:
authorKjartan Maraas <kmaraas@gnome.org>2012-07-09 15:40:09 +0800
committerKjartan Maraas <kmaraas@gnome.org>2012-07-09 15:40:09 +0800
commit1eb83c95020a883d01dca4dd09d1cf3e242866c1 (patch)
treea4ff8ad24c3e565479a519a42aac3b765b3a443c /po/nb.po
parent1c664bed2c3ab4ed1d2763eb80675949a6ff4ca1 (diff)
downloadgsoc2013-empathy-1eb83c95020a883d01dca4dd09d1cf3e242866c1.tar
gsoc2013-empathy-1eb83c95020a883d01dca4dd09d1cf3e242866c1.tar.gz
gsoc2013-empathy-1eb83c95020a883d01dca4dd09d1cf3e242866c1.tar.bz2
gsoc2013-empathy-1eb83c95020a883d01dca4dd09d1cf3e242866c1.tar.lz
gsoc2013-empathy-1eb83c95020a883d01dca4dd09d1cf3e242866c1.tar.xz
gsoc2013-empathy-1eb83c95020a883d01dca4dd09d1cf3e242866c1.tar.zst
gsoc2013-empathy-1eb83c95020a883d01dca4dd09d1cf3e242866c1.zip
Updated Norwegian bokmål translation
Diffstat (limited to 'po/nb.po')
-rw-r--r--po/nb.po938
1 files changed, 432 insertions, 506 deletions
diff --git a/po/nb.po b/po/nb.po
index 54ca9c539..7e59fd495 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy 3.5.x\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-30 13:06+0200\n"
-"PO-Revision-Date: 2012-05-30 13:09+0200\n"
+"POT-Creation-Date: 2012-07-09 09:39+0200\n"
+"PO-Revision-Date: 2012-07-09 09:40+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"
@@ -35,7 +35,7 @@ msgstr "Prat på Google Talk, Facebook, MSN og mange andre pratetjenester"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:1
-#: ../src/empathy-accounts-dialog.c:2516
+#: ../src/empathy-accounts-dialog.c:2523
msgid "Messaging and VoIP Accounts"
msgstr "Meldings- og VoIP-kontoer"
@@ -104,67 +104,42 @@ msgid "Whether to show contacts that are offline in the contact list."
msgstr "Om kontakter som er frakoblet skal vises i kontaktlisten."
#: ../data/org.gnome.Empathy.gschema.xml.h:14
-msgid "Show avatars"
-msgstr "Vis personbilder"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:15
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "Om personbilder skal vises i kontaktlisten og samtalevinduer."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:16
-msgid "Show protocols"
-msgstr "Vis protokoller"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:17
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Om protokoller for kontakter skal vises i kontaktlisten."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:18
msgid "Show Balance in contact list"
msgstr "Vis saldo i kontaktliste"
-#: ../data/org.gnome.Empathy.gschema.xml.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.h:15
msgid "Whether to show account balances in the contact list."
msgstr "Om saldo for konto skal vises i kontaktlisten."
-#: ../data/org.gnome.Empathy.gschema.xml.h:20
-msgid "Compact contact list"
-msgstr "Kompakt kontaktliste"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:21
-msgid "Whether to show the contact list in compact mode."
-msgstr "Om kontaktlisten skal vises i kompakt modus."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.h:16
msgid "Hide main window"
msgstr "Skjul hovedvinduet"
-#: ../data/org.gnome.Empathy.gschema.xml.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.h:17
msgid "Hide the main window."
msgstr "Skjul hovedvinduet."
-#: ../data/org.gnome.Empathy.gschema.xml.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.h:18
msgid "Default directory to select an avatar image from"
msgstr "Forvalgt mappe for personbilde"
-#: ../data/org.gnome.Empathy.gschema.xml.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.h:19
msgid "The last directory that an avatar image was chosen from."
msgstr "Den forrige mappen et personbilde ble valgt fra."
-#: ../data/org.gnome.Empathy.gschema.xml.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.h:20
msgid "Open new chats in separate windows"
msgstr "Åpne nye samtaler i egne vinduer"
-#: ../data/org.gnome.Empathy.gschema.xml.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.h:21
msgid "Always open a separate chat window for new chats."
msgstr "Alltid åpne et eget vindu til nye samtaler."
-#: ../data/org.gnome.Empathy.gschema.xml.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.h:22
msgid "Display incoming events in the status area"
msgstr "Vis innkommende hendelser i statusområdet"
-#: ../data/org.gnome.Empathy.gschema.xml.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.h:23
msgid ""
"Display incoming events in the status area. If false, present them to the "
"user immediately."
@@ -172,133 +147,119 @@ msgstr ""
"Vis innkommende hendelser i statusområdet. Hvis denne er «false» vises disse "
"til bruker med det samme."
-#: ../data/org.gnome.Empathy.gschema.xml.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.h:24
msgid "The position for the chat window side pane"
msgstr "Posisjon for pratevinduets sidelinje"
-#: ../data/org.gnome.Empathy.gschema.xml.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.h:25
msgid "The stored position (in pixels) of the chat window side pane."
msgstr "Lagret posisjon (i pikselr) for pratevinduets sideområde."
-#: ../data/org.gnome.Empathy.gschema.xml.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.h:26
msgid "Show contact groups"
msgstr "Vis kontaktgrupper"
-#: ../data/org.gnome.Empathy.gschema.xml.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.h:27
msgid "Whether to show groups in the contact list."
msgstr "Om kontaktgrupper skal vises i kontaktlisten."
-#: ../data/org.gnome.Empathy.gschema.xml.h:34
-msgid "Contact list sort criterion"
-msgstr "Sorteringskriterier for kontaktliste"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:35
-msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's state with the value \"state\". A value of \"name\" will sort "
-"the contact list by name."
-msgstr ""
-"Hvilke kriterier som skal brukes ved sortering av kontaktlisten. Forvalg er "
-"å sortere kontakter etter kontaktens tilstand med verdien «state». Hvis man "
-"bruker «name» vil kontaktlisten sorteres etter kontaktens navn."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.h:28
msgid "Use notification sounds"
msgstr "Bruk varslingslyder"
-#: ../data/org.gnome.Empathy.gschema.xml.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.h:29
msgid "Whether to play a sound to notify of events."
msgstr "Om lyder skal spilles av for å varsle om hendelser."
-#: ../data/org.gnome.Empathy.gschema.xml.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.h:30
msgid "Disable sounds when away"
msgstr "Slå av lyder når du er borte"
-#: ../data/org.gnome.Empathy.gschema.xml.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.h:31
msgid "Whether to play sound notifications when away or busy."
msgstr "Om lyder skal spilles av når du er borte eller opptatt."
-#: ../data/org.gnome.Empathy.gschema.xml.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.h:32
msgid "Play a sound for incoming messages"
msgstr "Spill av lyd når meldinger kommer inn"
-#: ../data/org.gnome.Empathy.gschema.xml.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.h:33
msgid "Whether to play a sound to notify of incoming messages."
msgstr "Om lyder skal spilles av for å varsle om innkommende meldinger."
-#: ../data/org.gnome.Empathy.gschema.xml.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.h:34
msgid "Play a sound for outgoing messages"
msgstr "Spill av lyd for utgående meldinger"
-#: ../data/org.gnome.Empathy.gschema.xml.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.h:35
msgid "Whether to play a sound to notify of outgoing messages."
msgstr "Om lyder skal spilles av for å varsle om utgående meldinger."
-#: ../data/org.gnome.Empathy.gschema.xml.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.h:36
msgid "Play a sound for new conversations"
msgstr "Spill av lyd ved nye samtaler"
-#: ../data/org.gnome.Empathy.gschema.xml.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.h:37
msgid "Whether to play a sound to notify of new conversations."
msgstr "Om lyder skal spilles av for å varsle om nye samtaler."
-#: ../data/org.gnome.Empathy.gschema.xml.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.h:38
msgid "Play a sound when a contact logs in"
msgstr "Spill av lyd når kontakter logger inn"
-#: ../data/org.gnome.Empathy.gschema.xml.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.h:39
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."
-#: ../data/org.gnome.Empathy.gschema.xml.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.h:40
msgid "Play a sound when a contact logs out"
msgstr "Spill av lyd når kontakter logger ut"
-#: ../data/org.gnome.Empathy.gschema.xml.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.h:41
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."
-#: ../data/org.gnome.Empathy.gschema.xml.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.h:42
msgid "Play a sound when we log in"
msgstr "Spill av lyd når du logger inn"
-#: ../data/org.gnome.Empathy.gschema.xml.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.h:43
msgid "Whether to play a sound when logging into a network."
msgstr "Om lyder skal spilles av når du logger inn på et nettverk."
-#: ../data/org.gnome.Empathy.gschema.xml.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.h:44
msgid "Play a sound when we log out"
msgstr "Spill av lyd når du logger ut"
-#: ../data/org.gnome.Empathy.gschema.xml.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.h:45
msgid "Whether to play a sound when logging out of a network."
msgstr "Om lyder skal spilles av når du logger ut av et nettverk."
-#: ../data/org.gnome.Empathy.gschema.xml.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.h:46
msgid "Enable popup notifications for new messages"
msgstr "Aktiver varsling oppsprettmeldinger for nye meldinger"
-#: ../data/org.gnome.Empathy.gschema.xml.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.h:47
msgid "Whether to show a popup notification when receiving a new message."
msgstr "Om varsling skal vises når en ny melding mottas."
-#: ../data/org.gnome.Empathy.gschema.xml.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.h:48
msgid "Disable popup notifications when away"
msgstr "Slå av varsling når du er borte"
-#: ../data/org.gnome.Empathy.gschema.xml.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.h:49
msgid "Whether to show popup notifications when away or busy."
msgstr "Om varsling skal vises når du er borte eller opptatt."
-#: ../data/org.gnome.Empathy.gschema.xml.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.h:50
msgid "Pop up notifications if the chat isn't focused"
msgstr "Vis varsling når prat ikke er fokusert"
-#: ../data/org.gnome.Empathy.gschema.xml.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.h:51
msgid ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
@@ -306,77 +267,79 @@ msgstr ""
"Om varsling skal vises når en melding mottas selv om pratevinduet er åpent "
"men ikke har fokus."
-#: ../data/org.gnome.Empathy.gschema.xml.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.h:52
msgid "Pop up notifications when a contact logs in"
msgstr "Vis varsling når en kontakt logger inn"
-#: ../data/org.gnome.Empathy.gschema.xml.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.h:53
msgid "Whether to show a popup notification when a contact goes online."
msgstr "Om et varsel skal vises når en kontakt er kobler fra."
-#: ../data/org.gnome.Empathy.gschema.xml.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.h:54
msgid "Pop up notifications when a contact logs out"
msgstr "Vis varsling når en kontakt logger ut"
-#: ../data/org.gnome.Empathy.gschema.xml.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.h:55
msgid "Whether to show a popup notification when a contact goes offline."
msgstr "Om varsel skal vises når en kontakt kobler fra."
-#: ../data/org.gnome.Empathy.gschema.xml.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.h:56
msgid "Use graphical smileys"
msgstr "Vis smilefjes grafisk"
-#: ../data/org.gnome.Empathy.gschema.xml.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.h:57
msgid "Whether to convert smileys into graphical images in conversations."
msgstr "Om smilefjes skal konverteres til grafiske bilder i samtaler."
-#: ../data/org.gnome.Empathy.gschema.xml.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.h:58
msgid "Show contact list in rooms"
msgstr "Vis kontaktliste i rom"
-#: ../data/org.gnome.Empathy.gschema.xml.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.h:59
msgid "Whether to show the contact list in chat rooms."
msgstr "Om kontaktlisten skal vises i praterom."
-#: ../data/org.gnome.Empathy.gschema.xml.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.h:60
msgid "Chat window theme"
msgstr "Tema for samtalevindu"
-#: ../data/org.gnome.Empathy.gschema.xml.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.h:61
msgid "The theme that is used to display the conversation in chat windows."
msgstr "Temaet som brukes til å vise samtaler."
-#: ../data/org.gnome.Empathy.gschema.xml.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.h:62
msgid "Chat window theme variant"
msgstr "Temavariant for samtalevindu"
-#: ../data/org.gnome.Empathy.gschema.xml.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.h:63
msgid ""
"The theme variant that is used to display the conversation in chat windows."
msgstr "Temavariant som brukes til å vise samtale i pratevinduer."
-#: ../data/org.gnome.Empathy.gschema.xml.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.h:64
msgid "Path of the Adium theme to use"
msgstr "Sti til Adium-tema som skal brukes"
-#: ../data/org.gnome.Empathy.gschema.xml.h:73
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Sti til Adium-tema skal brukes hvis tema for prat er Adium."
+#: ../data/org.gnome.Empathy.gschema.xml.h:65
+msgid ""
+"Path of the Adium theme to use if the theme used for chat is Adium. "
+"Deprecated."
+msgstr "Sti til Adium-tema skal brukes hvis tema for prat er Adium. Utfaset."
-#: ../data/org.gnome.Empathy.gschema.xml.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.h:66
msgid "Enable WebKit Developer Tools"
msgstr "Slå på utviklerverktøy for WebKit"
-#: ../data/org.gnome.Empathy.gschema.xml.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.h:67
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr "Om utviklerverktøy for WebKit, som Web Inspector, skal slås på."
-#: ../data/org.gnome.Empathy.gschema.xml.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.h:68
msgid "Inform other users when you are typing to them"
msgstr "Informer andre brukere når du skriver til dem"
-#: ../data/org.gnome.Empathy.gschema.xml.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.h:69
msgid ""
"Whether to send the 'composing' or 'paused' chat states. Does not currently "
"affect the 'gone' state."
@@ -384,39 +347,39 @@ msgstr ""
"Hvorvidt tilstand for «skriver» eller «pause» i prat skal sendes. Påvirker "
"ikke status «borte»."
-#: ../data/org.gnome.Empathy.gschema.xml.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.h:70
msgid "Use theme for chat rooms"
msgstr "Bruk tema for samtalerom"
-#: ../data/org.gnome.Empathy.gschema.xml.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.h:71
msgid "Whether to use the theme for chat rooms."
msgstr "Om tema skal brukes for praterom eller ikke."
-#: ../data/org.gnome.Empathy.gschema.xml.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.h:72
msgid "Spell checking languages"
msgstr "Stavekontrollspråk"
-#: ../data/org.gnome.Empathy.gschema.xml.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.h:73
msgid ""
"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
msgstr ""
"Kommaseparert liste over stavekontrollspråk som skal brukes (f.eks \"no, en, "
"fr, nl\")."
-#: ../data/org.gnome.Empathy.gschema.xml.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.h:74
msgid "Enable spell checker"
msgstr "Bruk stavekontroll"
-#: ../data/org.gnome.Empathy.gschema.xml.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.h:75
msgid ""
"Whether to check words typed against the languages you want to check with."
msgstr "Om stavekontroll skal sjekke ord mot de språkene du ønsker å bruke."
-#: ../data/org.gnome.Empathy.gschema.xml.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.h:76
msgid "Nick completed character"
msgstr "Tegn for fullføring av kallenavn"
-#: ../data/org.gnome.Empathy.gschema.xml.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.h:77
msgid ""
"Character to add after nickname when using nick completion (tab) in group "
"chat."
@@ -424,54 +387,54 @@ msgstr ""
"Tegn som skal legges til etter kallenavn når fullføring av kallenavn med "
"tabulator benyttes i gruppeprat."
-#: ../data/org.gnome.Empathy.gschema.xml.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.h:78
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.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.h:79
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."
-#: ../data/org.gnome.Empathy.gschema.xml.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.h:80
msgid "Last account selected in Join Room dialog"
msgstr "Siste konto valgt i dialogen «Bli med i rom»"
-#: ../data/org.gnome.Empathy.gschema.xml.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.h:81
msgid "D-Bus object path of the last account selected to join a room."
msgstr "D-Bus objektsti for siste konto valgt for å bli med i et rom."
-#: ../data/org.gnome.Empathy.gschema.xml.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.h:82
msgid "Camera device"
msgstr "Kameraenhet"
-#: ../data/org.gnome.Empathy.gschema.xml.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.h:83
msgid "Default camera device to use in video calls, e.g. /dev/video0."
msgstr "Forvalgt kameraenhet til bruk for videosamtaler. F.eks. /dev/video0."
-#: ../data/org.gnome.Empathy.gschema.xml.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.h:84
msgid "Camera position"
msgstr "Kameraposisjon"
-#: ../data/org.gnome.Empathy.gschema.xml.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.h:85
msgid "Position the camera preview should be during a call."
msgstr "Posisjon for kameraforhåndsvisning under en samtale."
-#: ../data/org.gnome.Empathy.gschema.xml.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.h:86
msgid "Echo cancellation support"
msgstr "Støtte for utlikning av ekko"
-#: ../data/org.gnome.Empathy.gschema.xml.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.h:87
msgid "Whether to enable Pulseaudio's echo cancellation filter."
msgstr "Hvorvidt Pulseaudio's filter for utlikning av ekko skal slås på."
-#: ../data/org.gnome.Empathy.gschema.xml.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.h:88
msgid "Show hint about closing the main window"
msgstr "Vis hint om lukking av hovedvinduet"
-#: ../data/org.gnome.Empathy.gschema.xml.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.h:89
msgid ""
"Whether to show the message dialog about closing the main window with the "
"'x' button in the title bar."
@@ -479,43 +442,43 @@ msgstr ""
"Om meldingsdialog om lukking av vinduet med «x»-knappen i tittelfeltet skal "
"vises."
-#: ../data/org.gnome.Empathy.gschema.xml.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.h:90
msgid "Empathy can publish the user's location"
msgstr "Empathy kan publisere brukers plassering"
-#: ../data/org.gnome.Empathy.gschema.xml.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.h:91
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "Om Empathy kan publisere brukers plassering til kontakter."
-#: ../data/org.gnome.Empathy.gschema.xml.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.h:92
msgid "Empathy can use the network to guess the location"
msgstr "Empathy kan bruke nettverket til å gjette plassering"
-#: ../data/org.gnome.Empathy.gschema.xml.h:101
+#: ../data/org.gnome.Empathy.gschema.xml.h:93
msgid "Whether Empathy can use the network to guess the location."
msgstr "Om Empathy kan bruke nettverket for å gjette plassering."
-#: ../data/org.gnome.Empathy.gschema.xml.h:102
+#: ../data/org.gnome.Empathy.gschema.xml.h:94
msgid "Empathy can use the cellular network to guess the location"
msgstr "Empathy kan bruke mobilnettverk til å gjette plassering"
-#: ../data/org.gnome.Empathy.gschema.xml.h:103
+#: ../data/org.gnome.Empathy.gschema.xml.h:95
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr "Om Empathy kan bruke mobilnettverk for å gjette plassering."
-#: ../data/org.gnome.Empathy.gschema.xml.h:104
+#: ../data/org.gnome.Empathy.gschema.xml.h:96
msgid "Empathy can use the GPS to guess the location"
msgstr "Empathy kan bruke GPS til å gjette plassering"
-#: ../data/org.gnome.Empathy.gschema.xml.h:105
+#: ../data/org.gnome.Empathy.gschema.xml.h:97
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "Om Empathy kan bruke GPS for å gjette plassering."
-#: ../data/org.gnome.Empathy.gschema.xml.h:106
+#: ../data/org.gnome.Empathy.gschema.xml.h:98
msgid "Empathy should reduce the location's accuracy"
msgstr "Empathy skal redusere nøyaktighet for plasseringenseri"
-#: ../data/org.gnome.Empathy.gschema.xml.h:107
+#: ../data/org.gnome.Empathy.gschema.xml.h:99
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr ""
@@ -729,19 +692,19 @@ msgstr "Programvaren din er for gammel"
msgid "Internal error"
msgstr "Intern feil"
-#: ../libempathy/empathy-utils.c:533
+#: ../libempathy/empathy-utils.c:503
msgid "People Nearby"
msgstr "Personer i nærheten"
-#: ../libempathy/empathy-utils.c:538
+#: ../libempathy/empathy-utils.c:508
msgid "Yahoo! Japan"
msgstr "Yahoo! Japan"
-#: ../libempathy/empathy-utils.c:567
+#: ../libempathy/empathy-utils.c:537
msgid "Google Talk"
msgstr "Google Talk"
-#: ../libempathy/empathy-utils.c:568
+#: ../libempathy/empathy-utils.c:538
msgid "Facebook Chat"
msgstr "Facebook-prat"
@@ -809,56 +772,56 @@ msgstr "Passord for praterom «%s» på konto %s (%s)"
msgid "All accounts"
msgstr "Alle kontoer"
-#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-account-widget.c:680
#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
#: ../src/empathy-import-widget.c:323
msgid "Account"
msgstr "Konto"
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:681
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
msgid "Password"
msgstr "Passord"
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:682
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
msgid "Server"
msgstr "Tjener"
-#: ../libempathy-gtk/empathy-account-widget.c:685
+#: ../libempathy-gtk/empathy-account-widget.c:683
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
msgid "Port"
msgstr "Port"
-#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:767
#, c-format
msgid "%s"
msgstr "%s"
-#: ../libempathy-gtk/empathy-account-widget.c:819
+#: ../libempathy-gtk/empathy-account-widget.c:822
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1426
+#: ../libempathy-gtk/empathy-account-widget.c:1434
msgid "Username:"
msgstr "Brukernavn:"
-#: ../libempathy-gtk/empathy-account-widget.c:1743
+#: ../libempathy-gtk/empathy-account-widget.c:1751
msgid "A_pply"
msgstr "_Bruk"
-#: ../libempathy-gtk/empathy-account-widget.c:1772
+#: ../libempathy-gtk/empathy-account-widget.c:1780
msgid "L_og in"
msgstr "L_ogg inn"
-#: ../libempathy-gtk/empathy-account-widget.c:1842
+#: ../libempathy-gtk/empathy-account-widget.c:1850
msgid "This account already exists on the server"
msgstr "Denne kontoen eksisterer allerede på tjeneren"
-#: ../libempathy-gtk/empathy-account-widget.c:1846
+#: ../libempathy-gtk/empathy-account-widget.c:1854
msgid "Create a new account on the server"
msgstr "Lag en ny konto på tjeneren"
@@ -867,19 +830,19 @@ msgstr "Lag en ny konto på tjeneren"
#. * like: "MyUserName on freenode".
#. * 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:2253
+#: ../libempathy-gtk/empathy-account-widget.c:2271
#, 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:2279
+#: ../libempathy-gtk/empathy-account-widget.c:2297
#, c-format
msgid "%s Account"
msgstr "%s-konto"
-#: ../libempathy-gtk/empathy-account-widget.c:2283
+#: ../libempathy-gtk/empathy-account-widget.c:2301
msgid "New account"
msgstr "Ny konto"
@@ -1518,7 +1481,7 @@ msgstr "ikke implementert"
msgid "unknown"
msgstr "ukjent"
-#: ../libempathy-gtk/empathy-chat.c:1682 ../src/empathy-chat-window.c:940
+#: ../libempathy-gtk/empathy-chat.c:1682 ../src/empathy-chat-window.c:942
msgid "Topic:"
msgstr "Emne:"
@@ -1560,7 +1523,7 @@ msgstr "Sett inn smilefjes"
#. send button
#: ../libempathy-gtk/empathy-chat.c:2413
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-ui-utils.c:1179
msgid "_Send"
msgstr "_Send"
@@ -1569,11 +1532,11 @@ msgstr "_Send"
msgid "_Spelling Suggestions"
msgstr "_Staveforslag"
-#: ../libempathy-gtk/empathy-chat.c:2559
+#: ../libempathy-gtk/empathy-chat.c:2576
msgid "Failed to retrieve recent logs"
msgstr "Klarte ikke å hente siste logger"
-#: ../libempathy-gtk/empathy-chat.c:2698
+#: ../libempathy-gtk/empathy-chat.c:2720
#, c-format
msgid "%s has disconnected"
msgstr "%s har koblet fra"
@@ -1581,12 +1544,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:2705
+#: ../libempathy-gtk/empathy-chat.c:2727
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s ble sparket av %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2708
+#: ../libempathy-gtk/empathy-chat.c:2730
#, c-format
msgid "%s was kicked"
msgstr "%s ble sparket"
@@ -1594,17 +1557,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:2716
+#: ../libempathy-gtk/empathy-chat.c:2738
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s ble bannlyst av %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2719
+#: ../libempathy-gtk/empathy-chat.c:2741
#, c-format
msgid "%s was banned"
msgstr "%s ble bannlyst"
-#: ../libempathy-gtk/empathy-chat.c:2723
+#: ../libempathy-gtk/empathy-chat.c:2745
#, c-format
msgid "%s has left the room"
msgstr "%s har forlatt rommet"
@@ -1614,17 +1577,17 @@ 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:2732
+#: ../libempathy-gtk/empathy-chat.c:2754
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2757
+#: ../libempathy-gtk/empathy-chat.c:2779
#, c-format
msgid "%s has joined the room"
msgstr "%s har blitt med i rommet"
-#: ../libempathy-gtk/empathy-chat.c:2782
+#: ../libempathy-gtk/empathy-chat.c:2804
#, c-format
msgid "%s is now known as %s"
msgstr "%s er nå kjent som %s"
@@ -1632,55 +1595,55 @@ msgstr "%s er nå kjent som %s"
#. We don't know if the incoming call has been accepted or not, so we
#. * assume it hasn't and if it has, we'll set the proper status when
#. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2969 ../src/empathy-event-manager.c:1167
-#: ../src/empathy-call-window.c:1465 ../src/empathy-call-window.c:1515
-#: ../src/empathy-call-window.c:2566
+#: ../libempathy-gtk/empathy-chat.c:2991 ../src/empathy-event-manager.c:1176
+#: ../src/empathy-call-window.c:1468 ../src/empathy-call-window.c:1518
+#: ../src/empathy-call-window.c:2571
msgid "Disconnected"
msgstr "Koblet fra"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3633
+#: ../libempathy-gtk/empathy-chat.c:3666
msgid "Would you like to store this password?"
msgstr "Vil du lagre dette passordet?"
-#: ../libempathy-gtk/empathy-chat.c:3639
+#: ../libempathy-gtk/empathy-chat.c:3672
msgid "Remember"
msgstr "Husk"
-#: ../libempathy-gtk/empathy-chat.c:3649
+#: ../libempathy-gtk/empathy-chat.c:3682
msgid "Not now"
msgstr "Ikke nå"
-#: ../libempathy-gtk/empathy-chat.c:3693
+#: ../libempathy-gtk/empathy-chat.c:3726
#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
msgid "Retry"
msgstr "Prøv igjen"
-#: ../libempathy-gtk/empathy-chat.c:3697
+#: ../libempathy-gtk/empathy-chat.c:3730
msgid "Wrong password; please try again:"
msgstr "Feil passord; vennligst prøv igjen:"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3827
+#: ../libempathy-gtk/empathy-chat.c:3860
msgid "This room is protected by a password:"
msgstr "Dette rommet er beskyttet med et passord:"
-#: ../libempathy-gtk/empathy-chat.c:3854
+#: ../libempathy-gtk/empathy-chat.c:3887
#: ../src/empathy-new-chatroom-dialog.c:780
msgid "Join"
msgstr "Bli med"
-#: ../libempathy-gtk/empathy-chat.c:4046 ../src/empathy-event-manager.c:1188
+#: ../libempathy-gtk/empathy-chat.c:4079 ../src/empathy-event-manager.c:1197
msgid "Connected"
msgstr "Koblet til"
-#: ../libempathy-gtk/empathy-chat.c:4101
+#: ../libempathy-gtk/empathy-chat.c:4134
msgid "Conversation"
msgstr "Samtale"
#. Translators: this string is a something like
#. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4106
+#: ../libempathy-gtk/empathy-chat.c:4139
#, c-format
msgid "%s (SMS)"
msgstr "%s (SMS)"
@@ -1712,7 +1675,7 @@ msgstr "Rediger blokkerte kontakter"
#. Account and Identifier
#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
#: ../libempathy-gtk/empathy-contact-search-dialog.c:524
-#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../libempathy-gtk/empathy-individual-widget.c:1485
#: ../src/empathy-chatrooms-window.ui.h:2
#: ../src/empathy-new-chatroom-dialog.ui.h:6
msgid "Account:"
@@ -1722,54 +1685,13 @@ msgstr "Konto:"
msgid "Blocked Contacts"
msgstr "Blokkerte kontakter"
-#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:322
-#: ../libempathy-gtk/empathy-webkit-utils.c:277
-msgid "_Copy Link Address"
-msgstr "_Kopier lenkens adresse"
-
-#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:329
-#: ../libempathy-gtk/empathy-webkit-utils.c:284
-msgid "_Open Link"
-msgstr "_Åpne lenke"
-
-#. Translators: timestamp displayed between conversations in
-#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:417
-msgid "%A %B %d %Y"
-msgstr "%A %d %B %Y"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:325
+#: ../libempathy-gtk/empathy-contact-dialogs.c:190
#: ../libempathy-gtk/empathy-individual-dialogs.c:118
msgid "New Contact"
msgstr "Ny kontakt"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:394
-#: ../libempathy-gtk/empathy-individual-dialogs.c:197
-#, c-format
-msgid "Block %s?"
-msgstr "Blokker %s?"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:399
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
-#, c-format
-msgid "Are you sure you want to block '%s' from contacting you again?"
-msgstr "Er du sikker på at du vil blokkere «%s» fra å kontakte deg igjen?"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:404
-#: ../libempathy-gtk/empathy-individual-dialogs.c:274
-msgid "_Block"
-msgstr "_Blokker"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:422
-#: ../libempathy-gtk/empathy-individual-dialogs.c:283
-msgid "_Report this contact as abusive"
-msgid_plural "_Report these contacts as abusive"
-msgstr[0] "_Rapporter denne kontakten"
-msgstr[1] "_Rapporter disse kontaktene"
-
#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
+#: ../libempathy-gtk/empathy-subscription-dialog.c:235
msgid "Subscription Request"
msgstr "Abonnementsforespørsel"
@@ -1935,7 +1857,7 @@ msgstr "Høyde:"
#: ../libempathy-gtk/empathy-contact-widget.c:852
#: ../libempathy-gtk/empathy-individual-widget.c:593
#: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:42
+#: ../src/empathy-preferences.ui.h:39
msgid "Location"
msgstr "Sted"
@@ -2099,6 +2021,18 @@ msgstr "Velg"
msgid "Group"
msgstr "Gruppe"
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
+#: ../libempathy-gtk/empathy-subscription-dialog.c:122
+#, c-format
+msgid "Block %s?"
+msgstr "Blokker %s?"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-subscription-dialog.c:126
+#, c-format
+msgid "Are you sure you want to block '%s' from contacting you again?"
+msgstr "Er du sikker på at du vil blokkere «%s» fra å kontakte deg igjen?"
+
#: ../libempathy-gtk/empathy-individual-dialogs.c:257
msgid "The following identity will be blocked:"
msgid_plural "The following identities will be blocked:"
@@ -2111,6 +2045,19 @@ msgid_plural "The following identities can not be blocked:"
msgstr[0] "Følgende identitet kan ikke blokkeres:"
msgstr[1] "Følgende identiteter kan ikke blokkeres:"
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
+#: ../libempathy-gtk/empathy-subscription-dialog.c:131
+#: ../libempathy-gtk/empathy-subscription-dialog.c:276
+msgid "_Block"
+msgstr "_Blokker"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
+#: ../libempathy-gtk/empathy-subscription-dialog.c:151
+msgid "_Report this contact as abusive"
+msgid_plural "_Report these contacts as abusive"
+msgstr[0] "_Rapporter denne kontakten"
+msgstr[1] "_Rapporter disse kontaktene"
+
#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "Endre kontaktinformasjon"
@@ -2123,160 +2070,159 @@ msgstr "Lenkede kontakter"
#. 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:172
+#: ../libempathy-gtk/empathy-individual-menu.c:174
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:344
+#: ../libempathy-gtk/empathy-individual-menu.c:349
msgid "Select account to use to place the call"
msgstr "Velg en konto til bruk for samtalen"
-#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-individual-menu.c:353
#: ../libempathy-gtk/empathy-log-window.ui.h:6
#: ../src/empathy-call-window.ui.h:18
msgid "Call"
msgstr "Ring"
-#: ../libempathy-gtk/empathy-individual-menu.c:413
+#: ../libempathy-gtk/empathy-individual-menu.c:418
msgid "Mobile"
msgstr "Mobil"
-#: ../libempathy-gtk/empathy-individual-menu.c:415
+#: ../libempathy-gtk/empathy-individual-menu.c:420
msgid "Work"
msgstr "Arbeid"
-#: ../libempathy-gtk/empathy-individual-menu.c:417
+#: ../libempathy-gtk/empathy-individual-menu.c:422
msgid "HOME"
msgstr "Hjemme"
-#: ../libempathy-gtk/empathy-individual-menu.c:658
+#: ../libempathy-gtk/empathy-individual-menu.c:663
msgid "_Block Contact"
msgstr "_Blokker kontakt"
+#: ../libempathy-gtk/empathy-individual-menu.c:719
+msgid "Delete and _Block"
+msgstr "Slett og _blokker"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:781
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Vil du virkelig fjerne kontakten «%s»?"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:790
+#, c-format
+msgid ""
+"Do you really want to remove the linked contact '%s'? Note that this will "
+"remove all the contacts which make up this linked contact."
+msgstr ""
+"Vil du virkelig fjerne lenket kontakt «%s»? Merk at dette vil fjerne alle "
+"kontaktene den lenkede kontakten består av."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:801
+msgid "Removing contact"
+msgstr "Fjerner kontakt"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:865
+#: ../libempathy-gtk/empathy-individual-view.c:2454
+msgid "_Remove"
+msgstr "Fje_rn"
+
#. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-individual-menu.c:1228
#: ../libempathy-gtk/empathy-new-message-dialog.c:318
msgid "_Chat"
msgstr "_Prat"
#. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
#: ../libempathy-gtk/empathy-new-message-dialog.c:312
msgid "_SMS"
msgstr "_SMS"
-#: ../libempathy-gtk/empathy-individual-menu.c:1085
+#: ../libempathy-gtk/empathy-individual-menu.c:1296
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Lydsamtale"
-#: ../libempathy-gtk/empathy-individual-menu.c:1118
+#: ../libempathy-gtk/empathy-individual-menu.c:1329
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Videosamtale"
-#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../libempathy-gtk/empathy-individual-menu.c:1370
#: ../src/empathy-roster-window-menubar.ui.h:11
msgid "_Previous Conversations"
msgstr "_Tidligere samtaler"
-#: ../libempathy-gtk/empathy-individual-menu.c:1188
+#: ../libempathy-gtk/empathy-individual-menu.c:1399
msgid "Send File"
msgstr "Send fil"
-#: ../libempathy-gtk/empathy-individual-menu.c:1218
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
msgid "Share My Desktop"
msgstr "Del mitt skrivebord"
-#: ../libempathy-gtk/empathy-individual-menu.c:1244
-#: ../libempathy-gtk/empathy-individual-widget.c:1357
+#: ../libempathy-gtk/empathy-individual-menu.c:1455
+#: ../libempathy-gtk/empathy-individual-widget.c:1368
msgid "Favorite"
msgstr "Favoritt"
-#: ../libempathy-gtk/empathy-individual-menu.c:1263
+#: ../libempathy-gtk/empathy-individual-menu.c:1474
msgid "gnome-contacts not installed"
msgstr "gnome-contacts er ikke installert"
-#: ../libempathy-gtk/empathy-individual-menu.c:1266
+#: ../libempathy-gtk/empathy-individual-menu.c:1477
msgid "Please install gnome-contacts to access contacts details."
msgstr "Vennligst installer gnome-contacts for tilgang til kontaktdetaljer."
-#: ../libempathy-gtk/empathy-individual-menu.c:1397
+#: ../libempathy-gtk/empathy-individual-menu.c:1608
msgid "Infor_mation"
msgstr "Infor_masjon"
-#: ../libempathy-gtk/empathy-individual-menu.c:1446
+#: ../libempathy-gtk/empathy-individual-menu.c:1657
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "R_ediger"
#. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1562
-#: ../src/empathy-chat-window.c:1211
+#: ../libempathy-gtk/empathy-individual-menu.c:1773
+#: ../src/empathy-chat-window.c:1213
msgid "Inviting you to this room"
msgstr "Inviterer deg til dette rommet"
-#: ../libempathy-gtk/empathy-individual-menu.c:1608
+#: ../libempathy-gtk/empathy-individual-menu.c:1819
msgid "_Invite to Chat Room"
msgstr "_Inviter til praterom"
-#: ../libempathy-gtk/empathy-individual-menu.c:1804
+#: ../libempathy-gtk/empathy-individual-menu.c:2015
msgid "_Add Contact…"
msgstr "_Legg til kontakt …"
-#: ../libempathy-gtk/empathy-individual-view.c:2364
-msgid "Delete and _Block"
-msgstr "Slett og _blokker"
-
-#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2374
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Vil du virkelig fjerne gruppen «%s»?"
-#: ../libempathy-gtk/empathy-individual-view.c:2402
+#: ../libempathy-gtk/empathy-individual-view.c:2377
msgid "Removing group"
msgstr "Fjerner gruppe"
-#: ../libempathy-gtk/empathy-individual-view.c:2470
+#: ../libempathy-gtk/empathy-individual-view.c:2445
msgid "Re_name"
msgstr "Endre _navn"
-#. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2479
-#: ../libempathy-gtk/empathy-individual-view.c:2683
-msgid "_Remove"
-msgstr "Fje_rn"
-
-#: ../libempathy-gtk/empathy-individual-view.c:2556
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Vil du virkelig fjerne kontakten «%s»?"
-
-#: ../libempathy-gtk/empathy-individual-view.c:2565
-#, c-format
-msgid ""
-"Do you really want to remove the linked contact '%s'? Note that this will "
-"remove all the contacts which make up this linked contact."
-msgstr ""
-"Vil du virkelig fjerne lenket kontakt «%s»? Merk at dette vil fjerne alle "
-"kontaktene den lenkede kontakten består av."
-
-#: ../libempathy-gtk/empathy-individual-view.c:2577
-msgid "Removing contact"
-msgstr "Fjerner kontakt"
-
#. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1293
+#: ../libempathy-gtk/empathy-individual-widget.c:1304
msgid "Alias:"
msgstr "Alias:"
#. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-individual-widget.c:1502
+#: ../libempathy-gtk/empathy-individual-widget.c:1513
msgid "Identifier:"
msgstr "Identifikator:"
-#: ../libempathy-gtk/empathy-individual-widget.c:1641
+#: ../libempathy-gtk/empathy-individual-widget.c:1652
#, c-format
msgid "Linked contact containing %u contact"
msgid_plural "Linked contacts containing %u contacts"
@@ -2316,135 +2262,135 @@ msgstr "ny tjener"
msgid "SSL"
msgstr "SSL"
-#: ../libempathy-gtk/empathy-log-window.c:617
+#: ../libempathy-gtk/empathy-log-window.c:616
msgid "History"
msgstr "Historikk"
-#: ../libempathy-gtk/empathy-log-window.c:672
+#: ../libempathy-gtk/empathy-log-window.c:671
msgid "Show"
msgstr "Vis"
-#: ../libempathy-gtk/empathy-log-window.c:694
+#: ../libempathy-gtk/empathy-log-window.c:693
msgid "Search"
msgstr "Søk"
-#: ../libempathy-gtk/empathy-log-window.c:1145
+#: ../libempathy-gtk/empathy-log-window.c:1144
#, c-format
msgid "Chat in %s"
msgstr "Prat i %s"
-#: ../libempathy-gtk/empathy-log-window.c:1147
+#: ../libempathy-gtk/empathy-log-window.c:1146
#, c-format
msgid "Chat with %s"
msgstr "Prat med %s"
-#: ../libempathy-gtk/empathy-log-window.c:1197
-#: ../libempathy-gtk/empathy-log-window.c:1341
+#: ../libempathy-gtk/empathy-log-window.c:1196
+#: ../libempathy-gtk/empathy-log-window.c:1340
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:1284
+#: ../libempathy-gtk/empathy-log-window.c:1283
#, 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:1290
+#: ../libempathy-gtk/empathy-log-window.c:1289
#, c-format
msgid "<b>%s:</b> %s"
msgstr "<b>%s:</b> %s"
-#: ../libempathy-gtk/empathy-log-window.c:1365
+#: ../libempathy-gtk/empathy-log-window.c:1364
#, c-format
msgid "%s second"
msgid_plural "%s seconds"
msgstr[0] "%s sekund"
msgstr[1] "%s sekunder"
-#: ../libempathy-gtk/empathy-log-window.c:1372
+#: ../libempathy-gtk/empathy-log-window.c:1371
#, c-format
msgid "%s minute"
msgid_plural "%s minutes"
msgstr[0] "%s minutt"
msgstr[1] "%s minutter"
-#: ../libempathy-gtk/empathy-log-window.c:1380
+#: ../libempathy-gtk/empathy-log-window.c:1379
#, c-format
msgid "Call took %s, ended at %s"
msgstr "Samtalen tok %s, avsluttet %s"
-#: ../libempathy-gtk/empathy-log-window.c:1711
+#: ../libempathy-gtk/empathy-log-window.c:1710
msgid "Today"
msgstr "I dag"
-#: ../libempathy-gtk/empathy-log-window.c:1715
+#: ../libempathy-gtk/empathy-log-window.c:1714
msgid "Yesterday"
msgstr "I går"
#. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1730
+#: ../libempathy-gtk/empathy-log-window.c:1729
msgid "%e %B %Y"
msgstr "%e %B %Y"
-#: ../libempathy-gtk/empathy-log-window.c:1834
-#: ../libempathy-gtk/empathy-log-window.c:3457
+#: ../libempathy-gtk/empathy-log-window.c:1833
+#: ../libempathy-gtk/empathy-log-window.c:3456
msgid "Anytime"
msgstr "Når som helst"
-#: ../libempathy-gtk/empathy-log-window.c:1933
-#: ../libempathy-gtk/empathy-log-window.c:2392
+#: ../libempathy-gtk/empathy-log-window.c:1932
+#: ../libempathy-gtk/empathy-log-window.c:2391
msgid "Anyone"
msgstr "Hvem som helst"
-#: ../libempathy-gtk/empathy-log-window.c:2705
+#: ../libempathy-gtk/empathy-log-window.c:2704
msgid "Who"
msgstr "Hvem"
-#: ../libempathy-gtk/empathy-log-window.c:2914
+#: ../libempathy-gtk/empathy-log-window.c:2913
msgid "When"
msgstr "Når"
-#: ../libempathy-gtk/empathy-log-window.c:3032
+#: ../libempathy-gtk/empathy-log-window.c:3031
msgid "Anything"
msgstr "Hva som helst"
-#: ../libempathy-gtk/empathy-log-window.c:3034
+#: ../libempathy-gtk/empathy-log-window.c:3033
msgid "Text chats"
msgstr "Tekstsamtaler"
-#: ../libempathy-gtk/empathy-log-window.c:3035
-#: ../src/empathy-preferences.ui.h:32
+#: ../libempathy-gtk/empathy-log-window.c:3034
+#: ../src/empathy-preferences.ui.h:29
msgid "Calls"
msgstr "Samtaler"
-#: ../libempathy-gtk/empathy-log-window.c:3039
+#: ../libempathy-gtk/empathy-log-window.c:3038
msgid "Incoming calls"
msgstr "Innkommende samtaler"
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3039
msgid "Outgoing calls"
msgstr "Utgående samtaler"
-#: ../libempathy-gtk/empathy-log-window.c:3041
+#: ../libempathy-gtk/empathy-log-window.c:3040
msgid "Missed calls"
msgstr "Tapte samtaler"
-#: ../libempathy-gtk/empathy-log-window.c:3061
+#: ../libempathy-gtk/empathy-log-window.c:3060
msgid "What"
msgstr "Hva"
-#: ../libempathy-gtk/empathy-log-window.c:3750
+#: ../libempathy-gtk/empathy-log-window.c:3749
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:3754
+#: ../libempathy-gtk/empathy-log-window.c:3753
msgid "Clear All"
msgstr "Tøm alle"
-#: ../libempathy-gtk/empathy-log-window.c:3761
+#: ../libempathy-gtk/empathy-log-window.c:3760
msgid "Delete from:"
msgstr "Slett fra:"
@@ -2466,12 +2412,12 @@ msgid "Profile"
msgstr "Profil"
#: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.ui.h:19 ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-chat-window.ui.h:19 ../src/empathy-preferences.ui.h:11
msgid "Chat"
msgstr "Prat"
#: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-call-window.ui.h:24
msgid "Video"
msgstr "Video"
@@ -2615,7 +2561,7 @@ msgstr "Egendefinerte meldinger …"
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
#.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:588
+#: ../libempathy-gtk/empathy-protocol-chooser.c:597
#, c-format
msgid "New %s account"
msgstr "Ny %s-konto"
@@ -2684,31 +2630,15 @@ msgstr "Samtale avsluttet"
msgid "Edit Custom Messages"
msgstr "Rediger egendefinerte meldinger"
-#: ../libempathy-gtk/empathy-theme-adium.c:1051
+#: ../libempathy-gtk/empathy-theme-adium.c:1126
#, c-format
msgid "Message edited at %s"
msgstr "Melding redigert %s"
-#: ../libempathy-gtk/empathy-theme-adium.c:1757
+#: ../libempathy-gtk/empathy-theme-adium.c:1843
msgid "Normal"
msgstr "Normal"
-#: ../libempathy-gtk/empathy-theme-manager.c:70
-msgid "Classic"
-msgstr "Klassisk"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:71
-msgid "Simple"
-msgstr "Enkel"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:72
-msgid "Clean"
-msgstr "Tøm"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:73
-msgid "Blue"
-msgstr "Blå"
-
#: ../libempathy-gtk/empathy-tls-dialog.c:150
msgid "The identity provided by the chat server cannot be verified."
msgstr "Identiteten som ble oppgitt av pratetjeneren kan ikke verifiseres."
@@ -2786,19 +2716,19 @@ msgstr "Husk dette valget for fremtidige tilkoblinger"
msgid "Certificate Details"
msgstr "Sertifikatdetaljer"
-#: ../libempathy-gtk/empathy-ui-utils.c:1754
+#: ../libempathy-gtk/empathy-ui-utils.c:1049
msgid "Unable to open URI"
msgstr "Kan ikke åpne URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1173
msgid "Select a file"
msgstr "Velg en fil"
-#: ../libempathy-gtk/empathy-ui-utils.c:1947
+#: ../libempathy-gtk/empathy-ui-utils.c:1247
msgid "Insufficient free space to save file"
msgstr "Ikke nok ledig plass til å lagre filen"
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1255
#, c-format
msgid ""
"%s of free space are required to save this file, but only %s is available. "
@@ -2807,7 +2737,7 @@ msgstr ""
"%s ledig plass kreves for å lagre denne filen, men kun %s er tilgjengelig. "
"Vennligst velg en annen lokasjon."
-#: ../libempathy-gtk/empathy-ui-utils.c:1999
+#: ../libempathy-gtk/empathy-ui-utils.c:1301
#, c-format
msgid "Incoming file from %s"
msgstr "Innkommende fil fra %s"
@@ -2979,6 +2909,16 @@ msgstr "Vestlig"
msgid "Vietnamese"
msgstr "Vietnamesisk"
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-webkit-utils.c:278
+msgid "_Copy Link Address"
+msgstr "_Kopier lenkens adresse"
+
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-webkit-utils.c:285
+msgid "_Open Link"
+msgstr "_Åpne lenke"
+
#: ../libempathy-gtk/empathy-calendar-button.c:66
msgid "Select..."
msgstr "Velg …"
@@ -2987,11 +2927,26 @@ msgstr "Velg …"
msgid "_Select"
msgstr "_Velg"
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:201
+#: ../libempathy-gtk/empathy-subscription-dialog.c:241
+#: ../src/empathy-event-manager.c:1114
+#, c-format
+msgid "%s would like permission to see when you are online"
+msgstr "%s ønsker rettigheter til å se når du er tilkoblet"
+
+#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+#: ../src/empathy-event-manager.c:731
+msgid "_Decline"
+msgstr "_Avslå"
+
+#: ../libempathy-gtk/empathy-subscription-dialog.c:283
+msgid "_Accept"
+msgstr "Godt_a"
+
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:225
msgid "No error message"
msgstr "Ingen feilmelding"
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:274
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:298
msgid "Instant Message (Empathy)"
msgstr "Lynmelding (Empathy)"
@@ -3082,7 +3037,7 @@ 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å."
-#: ../src/empathy-accounts-dialog.c:403 ../src/empathy-call-window.c:1265
+#: ../src/empathy-accounts-dialog.c:403 ../src/empathy-call-window.c:1268
msgid "Connecting…"
msgstr "Kobler til …"
@@ -3130,20 +3085,20 @@ msgstr "Klarte ikke å hente din personlige informasjon fra tjeneren."
msgid "Go online to edit your personal information."
msgstr "Rediger din personlige informasjon på nettet."
-#: ../src/empathy-accounts-dialog.c:855
+#: ../src/empathy-accounts-dialog.c:862
msgid "_Edit Connection Parameters..."
msgstr "R_ediger parametere for tilkoblingen …"
-#: ../src/empathy-accounts-dialog.c:1351
+#: ../src/empathy-accounts-dialog.c:1358
#, 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:1355
+#: ../src/empathy-accounts-dialog.c:1362
msgid "This will not remove your account on the server."
msgstr "Dette vil ikke fjerne din konto på tjeneren."
-#: ../src/empathy-accounts-dialog.c:1560
+#: ../src/empathy-accounts-dialog.c:1567
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3152,24 +3107,24 @@ msgstr ""
"dine endringer. Er du sikker på at du vil fortsette?"
#. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1751
+#: ../src/empathy-accounts-dialog.c:1758
msgid "_Enabled"
msgstr "Slått _på"
#. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1774
+#: ../src/empathy-accounts-dialog.c:1781
msgid "Rename"
msgstr "Endre navn"
-#: ../src/empathy-accounts-dialog.c:2190
+#: ../src/empathy-accounts-dialog.c:2197
msgid "_Skip"
msgstr "_Hopp over"
-#: ../src/empathy-accounts-dialog.c:2194
+#: ../src/empathy-accounts-dialog.c:2201
msgid "_Connect"
msgstr "_Koble til"
-#: ../src/empathy-accounts-dialog.c:2373
+#: ../src/empathy-accounts-dialog.c:2380
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -3282,52 +3237,44 @@ msgid "Display the dialpad"
msgstr "Vis ringetastatur"
#: ../src/empathy-call-window.ui.h:22
-msgid "Send Video"
-msgstr "Send video"
-
-#: ../src/empathy-call-window.ui.h:23
msgid "Toggle video transmission"
msgstr "Slå av/på overføring av video"
-#: ../src/empathy-call-window.ui.h:24
-msgid "Send Audio"
-msgstr "Send lyd"
-
-#: ../src/empathy-call-window.ui.h:25
+#: ../src/empathy-call-window.ui.h:23
msgid "Toggle audio transmission"
msgstr "Slå av/på overføring av lyd"
-#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:25
msgid "Encoding Codec:"
msgstr "Kodek for koding:"
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-call-window.c:2518
-#: ../src/empathy-call-window.c:2519 ../src/empathy-call-window.c:2520
-#: ../src/empathy-call-window.c:2521
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-call-window.c:2523
+#: ../src/empathy-call-window.c:2524 ../src/empathy-call-window.c:2525
+#: ../src/empathy-call-window.c:2526
msgid "Unknown"
msgstr "Ukjent"
-#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:27
msgid "Decoding Codec:"
msgstr "Kodek for dekoding:"
-#: ../src/empathy-call-window.ui.h:30
+#: ../src/empathy-call-window.ui.h:28
msgid "Remote Candidate:"
msgstr "Ekstern kandidat:"
-#: ../src/empathy-call-window.ui.h:31
+#: ../src/empathy-call-window.ui.h:29
msgid "Local Candidate:"
msgstr "Lokal kandidat:"
-#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-call-window.ui.h:30 ../src/empathy-preferences.ui.h:28
msgid "Audio"
msgstr "Lyd"
-#: ../src/empathy-chat-window.c:286
+#: ../src/empathy-chat-window.c:288
msgid "Close this window?"
msgstr "Lukk dette vinduet?"
-#: ../src/empathy-chat-window.c:291
+#: ../src/empathy-chat-window.c:293
#, c-format
msgid ""
"Closing this window will leave %s. You will not receive any further messages "
@@ -3336,7 +3283,7 @@ msgstr ""
"Hvis du lukker dette vinduet vil du forlate %s. Du vil ikke motta videre "
"meldinger før du blir med igjen."
-#: ../src/empathy-chat-window.c:302
+#: ../src/empathy-chat-window.c:304
#, c-format
msgid ""
"Closing this window will leave a chat room. You will not receive any further "
@@ -3351,12 +3298,12 @@ msgstr[1] ""
"Hvis du lukker dette vinduet vil du forlate %u praterom. Du vil ikke motta "
"videre meldinger før du blir med igjen."
-#: ../src/empathy-chat-window.c:311
+#: ../src/empathy-chat-window.c:313
#, c-format
msgid "Leave %s?"
msgstr "Forlat %s?"
-#: ../src/empathy-chat-window.c:312
+#: ../src/empathy-chat-window.c:314
msgid ""
"You will not receive any further messages from this chat room until you "
"rejoin it."
@@ -3364,54 +3311,54 @@ msgstr ""
"Du vil ikke motta videre meldinger fra dette praterommet før du blir med "
"igjen."
-#: ../src/empathy-chat-window.c:331
+#: ../src/empathy-chat-window.c:333
msgid "Close window"
msgstr "Lukk vindu"
-#: ../src/empathy-chat-window.c:331
+#: ../src/empathy-chat-window.c:333
msgid "Leave room"
msgstr "Forlat rom"
-#: ../src/empathy-chat-window.c:660 ../src/empathy-chat-window.c:680
+#: ../src/empathy-chat-window.c:662 ../src/empathy-chat-window.c:682
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d ulest)"
msgstr[1] "%s (%d uleste)"
-#: ../src/empathy-chat-window.c:672
+#: ../src/empathy-chat-window.c:674
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (og %u annen)"
msgstr[1] "%s (og %u andre)"
-#: ../src/empathy-chat-window.c:688
+#: ../src/empathy-chat-window.c:690
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d ulest fra andre)"
msgstr[1] "%s (%d uleste fra andre)"
-#: ../src/empathy-chat-window.c:697
+#: ../src/empathy-chat-window.c:699
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%d ulest fra alle)"
msgstr[1] "%s (%d uleste fra alle)"
-#: ../src/empathy-chat-window.c:912
+#: ../src/empathy-chat-window.c:914
msgid "SMS:"
msgstr "SMS:"
-#: ../src/empathy-chat-window.c:922
+#: ../src/empathy-chat-window.c:924
#, c-format
msgid "Sending %d message"
msgid_plural "Sending %d messages"
msgstr[0] "Sender %d melding"
msgstr[1] "Sender %d meldinger"
-#: ../src/empathy-chat-window.c:944
+#: ../src/empathy-chat-window.c:946
msgid "Typing a message."
msgstr "Skriver en melding"
@@ -3495,7 +3442,7 @@ msgstr "Håndter favorittrom"
msgid "Incoming video call"
msgstr "Innkommende videosamtale"
-#: ../src/empathy-event-manager.c:510 ../src/empathy-call-window.c:1482
+#: ../src/empathy-event-manager.c:510 ../src/empathy-call-window.c:1485
msgid "Incoming call"
msgstr "Innkommende samtale"
@@ -3510,7 +3457,7 @@ msgid "%s is calling you. Do you want to answer?"
msgstr "%s ringer deg. Vil du svare?"
#: ../src/empathy-event-manager.c:518 ../src/empathy-event-manager.c:915
-#: ../src/empathy-call-window.c:1488
+#: ../src/empathy-call-window.c:1491
#, c-format
msgid "Incoming call from %s"
msgstr "Innkommende samtale fra %s"
@@ -3541,10 +3488,6 @@ msgstr "Invitasjon til å bli med i %s"
msgid "%s is inviting you to join %s"
msgstr "%s inviterer deg til å bli med i %s"
-#: ../src/empathy-event-manager.c:731
-msgid "_Decline"
-msgstr "_Avslå"
-
#: ../src/empathy-event-manager.c:736
msgid "_Join"
msgstr "_Bli med"
@@ -3559,7 +3502,7 @@ msgstr "%s inviterte deg til å bli med i %s"
msgid "You have been invited to join %s"
msgstr "Du har blitt invitert til å bli med i %s"
-#: ../src/empathy-event-manager.c:915 ../src/empathy-call-window.c:1488
+#: ../src/empathy-event-manager.c:915 ../src/empathy-call-window.c:1491
#, c-format
msgid "Incoming video call from %s"
msgstr "Innkommende videosamtale fra %s"
@@ -3569,16 +3512,11 @@ msgstr "Innkommende videosamtale fra %s"
msgid "Incoming file transfer from %s"
msgstr "Innkommende filoverføring fra %s"
-#: ../src/empathy-event-manager.c:983 ../src/empathy-roster-window.c:356
+#: ../src/empathy-event-manager.c:983 ../src/empathy-roster-window.c:223
msgid "Password required"
msgstr "Passord kreves"
-#: ../src/empathy-event-manager.c:1105
-#, c-format
-msgid "%s would like permission to see when you are online"
-msgstr "%s ønsker rettigheter til å se når du er tilkoblet"
-
-#: ../src/empathy-event-manager.c:1111
+#: ../src/empathy-event-manager.c:1120
#, c-format
msgid ""
"\n"
@@ -3725,58 +3663,58 @@ msgstr "Protokoll"
msgid "Source"
msgstr "Kilde"
-#: ../src/empathy-roster-window.c:373
+#: ../src/empathy-roster-window.c:240
msgid "Provide Password"
msgstr "Oppgi passord"
-#: ../src/empathy-roster-window.c:379
+#: ../src/empathy-roster-window.c:246
msgid "Disconnect"
msgstr "Koble fra"
-#: ../src/empathy-roster-window.c:639
+#: ../src/empathy-roster-window.c:417
msgid "You need to setup an account to see contacts here."
msgstr "Du må sette opp en konto for å se kontakter her."
-#: ../src/empathy-roster-window.c:655
-msgid "No match found"
-msgstr "Ingen treff funnet"
-
-#: ../src/empathy-roster-window.c:765
+#: ../src/empathy-roster-window.c:504
#, c-format
msgid "Sorry, %s accounts can’t be used until your %s software is updated."
msgstr "Beklager %s-kontoer kan ikke brukes før %s-programvaren er oppdatert."
-#: ../src/empathy-roster-window.c:831
+#: ../src/empathy-roster-window.c:570
msgid "Update software..."
msgstr "Oppdater programvare …"
-#: ../src/empathy-roster-window.c:837 ../src/empathy-roster-window.c:954
+#: ../src/empathy-roster-window.c:576 ../src/empathy-roster-window.c:693
msgid "Close"
msgstr "Lukk"
-#: ../src/empathy-roster-window.c:942
+#: ../src/empathy-roster-window.c:681
msgid "Reconnect"
msgstr "Koble til på nytt"
-#: ../src/empathy-roster-window.c:948
+#: ../src/empathy-roster-window.c:687
msgid "Edit Account"
msgstr "Rediger konto"
-#: ../src/empathy-roster-window.c:1128
+#: ../src/empathy-roster-window.c:867
msgid "Top up account"
msgstr "Fyll opp konto"
-#: ../src/empathy-roster-window.c:1813
+#: ../src/empathy-roster-window.c:1529
msgid "You need to enable one of your accounts to see contacts here."
msgstr "Du må slå på en av kontoene for å se kontakter her."
#. translators: argument is an account name
-#: ../src/empathy-roster-window.c:1821
+#: ../src/empathy-roster-window.c:1537
#, c-format
msgid "You need to enable %s to see contacts here."
msgstr "Du må slå på %s for å se kontakter her."
-#: ../src/empathy-roster-window.c:2154 ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-roster-window.c:1901
+msgid "No match found"
+msgstr "Ingen treff funnet"
+
+#: ../src/empathy-roster-window.c:2132 ../src/empathy-preferences.ui.h:4
msgid "Contact List"
msgstr "Kontaktliste"
@@ -3927,187 +3865,175 @@ msgstr "Kunne ikke laste romliste"
msgid "Room List"
msgstr "Romliste"
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:143
msgid "Message received"
msgstr "Melding mottatt"
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:144
msgid "Message sent"
msgstr "Melding sendt"
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:145
msgid "New conversation"
msgstr "Ny samtale"
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:146
msgid "Contact comes online"
msgstr "Kontakt kobler til"
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:147
msgid "Contact goes offline"
msgstr "Kontakt kobler fra"
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:148
msgid "Account connected"
msgstr "Konto koblet til"
-#: ../src/empathy-preferences.c:152
+#: ../src/empathy-preferences.c:149
msgid "Account disconnected"
msgstr "Konto koblet fra"
-#: ../src/empathy-preferences.c:429
+#: ../src/empathy-preferences.c:386
msgid "Language"
msgstr "Språk"
#. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:678
+#: ../src/empathy-preferences.c:635
msgid "Juliet"
msgstr "Juliet"
#. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:685
+#: ../src/empathy-preferences.c:642
msgid "Romeo"
msgstr "Romeo"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:691
+#: ../src/empathy-preferences.c:648
msgid "O Romeo, Romeo, wherefore art thou Romeo?"
msgstr "O Romeo, Romeo, wherefore art thou Romeo?"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:695
+#: ../src/empathy-preferences.c:652
msgid "Deny thy father and refuse thy name;"
msgstr "Deny thy father and refuse thy name;"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:698
+#: ../src/empathy-preferences.c:655
msgid "Or if thou wilt not, be but sworn my love"
msgstr "Or if thou wilt not, be but sworn my love"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:701
+#: ../src/empathy-preferences.c:658
msgid "And I'll no longer be a Capulet."
msgstr "And I'll no longer be a Capulet."
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:704
+#: ../src/empathy-preferences.c:661
msgid "Shall I hear more, or shall I speak at this?"
msgstr "Shall I hear more, or shall I speak at this?"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:707
+#: ../src/empathy-preferences.c:664
msgid "Juliet has disconnected"
msgstr "Juliet har koblet fra"
-#: ../src/empathy-preferences.c:1112
+#: ../src/empathy-preferences.c:1030
msgid "Preferences"
msgstr "Brukervalg"
#: ../src/empathy-preferences.ui.h:2
-msgid "Show protocol in avatar"
-msgstr "Vis protokoll i personbilder"
+msgid "Show groups"
+msgstr "Vis grupper"
#: ../src/empathy-preferences.ui.h:3
msgid "Show account balances"
msgstr "Vis saldo for konto"
-#: ../src/empathy-preferences.ui.h:4
-msgid "Sort contacts by:"
-msgstr "Sorter kontakter etter:"
-
#: ../src/empathy-preferences.ui.h:5
-msgid "status"
-msgstr "status"
-
-#: ../src/empathy-preferences.ui.h:6
-msgid "name"
-msgstr "navn"
-
-#: ../src/empathy-preferences.ui.h:8
msgid "Start chats in:"
msgstr "Start prat om:"
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:6
msgid "new ta_bs"
msgstr "nye fa_ner"
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:7
msgid "new _windows"
msgstr "nye _vinduer"
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:8
msgid "Show _smileys as images"
msgstr "Vis _smilefjes som bilder"
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:9
msgid "Show contact _list in rooms"
msgstr "Vis kontakt_liste i rom"
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:10
msgid "Log conversations"
msgstr "Logg samtaler"
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:12
msgid "Display incoming events in the notification area"
msgstr "Vis innkommende hendelser i varslingsområdet"
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:13
msgid "_Automatically connect on startup"
msgstr "Koble til _automatisk ved oppstart"
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:14
msgid "Behavior"
msgstr "Oppførsel"
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:15
msgid "General"
msgstr "Generelt"
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:16
msgid "_Enable bubble notifications"
msgstr "_Aktiver varsling med bobler"
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:17
msgid "Disable notifications when _away or busy"
msgstr "Slå av varsling når du er borte eller oppt_att"
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:18
msgid "Enable notifications when the _chat is not focused"
msgstr "Aktiver varsling når _prat ikke er fokusert"
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:19
msgid "Enable notifications when a contact comes online"
msgstr "Slå på varsling når en kontakt kobler seg til"
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:20
msgid "Enable notifications when a contact goes offline"
msgstr "Slå på varsling når en kontakt kobler seg fra"
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:21
msgid "Notifications"
msgstr "Varsling"
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:22
msgid "_Enable sound notifications"
msgstr "_Aktiver varsling med lyder"
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:23
msgid "Disable sounds when _away or busy"
msgstr "Slå av lyder når du er b_orte eller opptatt"
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:24
msgid "Play sound for events"
msgstr "Spill av lyd for hendelser"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:25
msgid "Sounds"
msgstr "Lyder"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:26
msgid "Use _echo cancellation to improve call quality"
msgstr "Bruk _ekkokansellering for å forbedre kvaliteten på samtalen"
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:27
msgid ""
"Echo cancellation helps to make your voice sound clearer to the other "
"person, but may cause problems on some computers. If you or the other person "
@@ -4119,11 +4045,11 @@ msgstr ""
"den andre personen hører rare lyder eller feil under samtaler kan du prøve å "
"slå av utlikning av ekko og starte samtalen på nytt."
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:30
msgid "_Publish location to my contacts"
msgstr "_Publiser plassering til mine kontakter"
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:31
msgid ""
"Reduced location accuracy means that nothing more precise than your city, "
"state and country will be published. GPS coordinates will be accurate to 1 "
@@ -4133,54 +4059,54 @@ msgstr ""
"publisert. GPS-koordinater vil ha nøyaktighet lik en desimalplass."
#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:33
msgid "_Reduce location accuracy"
msgstr "_Reduser nøyaktighet for plassering"
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:34
msgid "Privacy"
msgstr "Personvern"
-#: ../src/empathy-preferences.ui.h:38
+#: ../src/empathy-preferences.ui.h:35
msgid "_GPS"
msgstr "_GPS"
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:36
msgid "_Cellphone"
msgstr "_Mobiltelefon"
-#: ../src/empathy-preferences.ui.h:40
+#: ../src/empathy-preferences.ui.h:37
msgid "_Network (IP, Wi-Fi)"
msgstr "_Nettverk (IP, Wi-Fi)"
-#: ../src/empathy-preferences.ui.h:41
+#: ../src/empathy-preferences.ui.h:38
msgid "Location sources:"
msgstr "Kilder for steder:"
-#: ../src/empathy-preferences.ui.h:43
+#: ../src/empathy-preferences.ui.h:40
msgid ""
"The list of languages reflects only the languages for which you have a "
"dictionary installed."
msgstr ""
"Listen med språk viser bare de språkene det er installert ordliste for."
-#: ../src/empathy-preferences.ui.h:44
+#: ../src/empathy-preferences.ui.h:41
msgid "Enable spell checking for languages:"
msgstr "Slå på stavekontroll for språk:"
-#: ../src/empathy-preferences.ui.h:45
+#: ../src/empathy-preferences.ui.h:42
msgid "Spell Checking"
msgstr "Stavekontroll"
-#: ../src/empathy-preferences.ui.h:46
+#: ../src/empathy-preferences.ui.h:43
msgid "Chat Th_eme:"
msgstr "Samtale_tema:"
-#: ../src/empathy-preferences.ui.h:47
+#: ../src/empathy-preferences.ui.h:44
msgid "Variant:"
msgstr "Variant:"
-#: ../src/empathy-preferences.ui.h:48
+#: ../src/empathy-preferences.ui.h:45
msgid "Themes"
msgstr "Temaer"
@@ -4339,13 +4265,13 @@ msgid "Respond"
msgstr "Svar"
#: ../src/empathy-notifications-approver.c:197
-#: ../src/empathy-call-window.c:1492
+#: ../src/empathy-call-window.c:1495
msgid "Reject"
msgstr "Avvis"
#: ../src/empathy-notifications-approver.c:202
#: ../src/empathy-notifications-approver.c:207
-#: ../src/empathy-call-window.c:1493
+#: ../src/empathy-call-window.c:1496
msgid "Answer"
msgstr "Svar"
@@ -4377,60 +4303,60 @@ msgstr "%s prøvde å ringe deg, men du var i en annen samtale."
#. Translators: this is an "Info" label. It should be as short
#. * as possible.
-#: ../src/empathy-call-window.c:1122 ../src/empathy-call-window.c:1138
+#: ../src/empathy-call-window.c:1125 ../src/empathy-call-window.c:1141
msgid "i"
msgstr "i"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1857
+#: ../src/empathy-call-window.c:1862
#, c-format
msgid "Call with %s"
msgstr "Samtale med %s"
-#: ../src/empathy-call-window.c:2109
+#: ../src/empathy-call-window.c:2114
msgid "The IP address as seen by the machine"
msgstr "IP-adresse som sett av maskinen"
-#: ../src/empathy-call-window.c:2111
+#: ../src/empathy-call-window.c:2116
msgid "The IP address as seen by a server on the Internet"
msgstr "IP-adresse som sett av en tjener på internett"
-#: ../src/empathy-call-window.c:2113
+#: ../src/empathy-call-window.c:2118
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-call-window.c:2115
+#: ../src/empathy-call-window.c:2120
msgid "The IP address of a relay server"
msgstr "IP-adresse for en relay-tjener"
-#: ../src/empathy-call-window.c:2117
+#: ../src/empathy-call-window.c:2122
msgid "The IP address of the multicast group"
msgstr "IP-adresse for multicast-gruppe"
-#: ../src/empathy-call-window.c:2864
+#: ../src/empathy-call-window.c:2869
msgid "On hold"
msgstr "På vent"
-#: ../src/empathy-call-window.c:2867
+#: ../src/empathy-call-window.c:2871
msgid "Mute"
msgstr "Demp"
-#: ../src/empathy-call-window.c:2869
+#: ../src/empathy-call-window.c:2873
msgid "Duration"
msgstr "Varighet"
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2872
+#: ../src/empathy-call-window.c:2876
#, c-format
msgid "%s — %d:%02dm"
msgstr "%s – %d:%02dm"
-#: ../src/empathy-call-window.c:2968
+#: ../src/empathy-call-window.c:2972
msgid "Technical Details"
msgstr "Tekniske detaljer"
-#: ../src/empathy-call-window.c:3007
+#: ../src/empathy-call-window.c:3011
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -4439,7 +4365,7 @@ msgstr ""
"Programvaren til %s forstår ikke noen av lydformatene som støttes av din "
"datamaskin"
-#: ../src/empathy-call-window.c:3012
+#: ../src/empathy-call-window.c:3016
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -4448,7 +4374,7 @@ msgstr ""
"Programvaren til %s forstår ikke noen av videoformatene som støttes av din "
"datamaskin"
-#: ../src/empathy-call-window.c:3018
+#: ../src/empathy-call-window.c:3022
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -4457,25 +4383,25 @@ 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:3024
+#: ../src/empathy-call-window.c:3028
msgid "There was a failure on the network"
msgstr "Det oppsto en feil på nettverket"
-#: ../src/empathy-call-window.c:3028
+#: ../src/empathy-call-window.c:3032
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:3031
+#: ../src/empathy-call-window.c:3035
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:3043
+#: ../src/empathy-call-window.c:3047
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -4486,32 +4412,32 @@ msgstr ""
"\">rapporter denne feilen</a> og legg ved loggene som samles inn i "
"«Feilsøking»-vinduet i Hjelp-menyen."
-#: ../src/empathy-call-window.c:3052
+#: ../src/empathy-call-window.c:3056
msgid "There was a failure in the call engine"
msgstr "Det oppsto en feil i samtalemotoren"
-#: ../src/empathy-call-window.c:3055
+#: ../src/empathy-call-window.c:3059
msgid "The end of the stream was reached"
msgstr "Slutt på strømmen ble nådd"
-#: ../src/empathy-call-window.c:3095
+#: ../src/empathy-call-window.c:3099
msgid "Can't establish audio stream"
msgstr "Kan ikke etablere lydstrøm"
-#: ../src/empathy-call-window.c:3105
+#: ../src/empathy-call-window.c:3109
msgid "Can't establish video stream"
msgstr "Kan ikke etablere videostrøm"
-#: ../src/empathy-call-window.c:3142
+#: ../src/empathy-call-window.c:3146
#, c-format
msgid "Your current balance is %s."
msgstr "Din saldo er %s."
-#: ../src/empathy-call-window.c:3146
+#: ../src/empathy-call-window.c:3150
msgid "Sorry, you don’t have enough credit for that call."
msgstr "Du har ikke nok kreditt til å starte denne samtalen."
-#: ../src/empathy-call-window.c:3148
+#: ../src/empathy-call-window.c:3152
msgid "Top Up"
msgstr "Fyll opp"
@@ -4535,11 +4461,7 @@ msgstr "Hvilken type konto har du?"
msgid "Adding new account"
msgstr "Legger til ny konto"
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
-msgid "People nearby"
-msgstr "Personer i nærheten"
-
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:149
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
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 "
@@ -4549,7 +4471,11 @@ msgstr ""
"deg automatisk. Hvis du vil bruke denne funksjonen må du sjekke om detaljene "
"under er riktige."
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:180
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:98
+msgid "People nearby"
+msgstr "Personer i nærheten"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:113
msgid ""
"You can change these details later or disable this feature by choosing <span "
"style=\"italic\">Edit → Accounts</span> in the Contact List."