* New upstream release.

  * Fix convert file key naming (LP: #847807)
  * Use environment variable to get seat path (LP: #856455)
  * Fix abort when using ConsoleKit fallback (LP: #740382)
  * Update session icon instead of creating a new one (LP: #854292)
  * Update to latest Launchpad translations

1 files changed, 206 insertions, 82 deletions

diff --git a/po/nb.po b/po/nb.po
index a8b2c2d..58502c3 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,63 +7,93 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-17 10:48-0500\n"
-"PO-Revision-Date: 2010-03-17 13:45+0000\n"
-"Last-Translator: Kjetil Birkeland Moe <kjetilbi@stud.ntnu.no>\n"
+"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"PO-Revision-Date: 2011-09-19 14:25+0000\n"
+"Last-Translator: Kjetil Birkeland Moe <kjetil@skifremme.com>\n"
 "Language-Team: Norwegian Bokmal\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-03-17 19:48+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-09-27 15:12+0000\n"
+"X-Generator: Launchpad (build 14041)\n"
 
-#: ../data/indicator-session.schemas.in.h:1
-msgid "Makes it so that the logout button doesn't show in the session menu."
-msgstr ""
+#: ../data/com.canonical.indicator.session.gschema.xml.in.h:1
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "Skjul avloggingsknappen i øktmenyen."
+
+#: ../data/com.canonical.indicator.session.gschema.xml.in.h:2
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "Skjul omstartknappen i øktmenyen."
+
+#: ../data/com.canonical.indicator.session.gschema.xml.in.h:3
+msgid ""
+"Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "Skjul avsluttingsknappen i øktmenyen."
 
-#: ../data/indicator-session.schemas.in.h:2
+#: ../data/com.canonical.indicator.session.gschema.xml.in.h:4
 msgid "Remove the Log Out item from the session menu"
-msgstr ""
+msgstr "Fjern \"Logg av\"-elementet fra øktmenyen"
+
+#: ../data/com.canonical.indicator.session.gschema.xml.in.h:5
+msgid "Remove the Restart item from the session menu"
+msgstr "Fjern omstartelementet fra øktmenyen."
 
-#: ../data/indicator-session.schemas.in.h:3
+#: ../data/com.canonical.indicator.session.gschema.xml.in.h:6
+msgid "Remove the shutdown item from the session menu"
+msgstr "Fjern omstartknappen fra øktmenyen."
+
+#: ../data/com.canonical.indicator.session.gschema.xml.in.h:7
 msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
 "Overstyr dialogboksen for å bekrefte handlingene logg av, start på nytt og "
-"slå av."
+"avslutt."
 
-#: ../data/indicator-session.schemas.in.h:4
+#: ../data/com.canonical.indicator.session.gschema.xml.in.h:8
 msgid ""
 "Whether or not to show confirmation dialogs for logout, restart and shutdown "
 "actions."
 msgstr ""
-"Om bekreftelsesdialogbokser for handlingene logg av, start på nytt og slå "
-"av, skal vises ."
+"Om bekreftelsesdialogbokser for handlingene logg av, start på nytt og "
+"avslutt skal vises ."
+
+#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
+msgid "Classic Guest Session"
+msgstr "Klassisk gjesteøkt"
 
-#: ../src/gconf-helper.c:63 ../src/session-service.c:613
+#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
+msgid "Start a guest session using the classic desktop"
+msgstr "Start en gjesteøkt med det et klassisk skrivebordsmiljø"
+
+#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
+#: ../src/device-menu-mgr.c:649
+msgid "Lock Screen"
+msgstr "Lås skjerm"
+
+#: ../data/indicator-session-shutdown.desktop.in.in.h:1
+#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
+msgid "Shut Down"
+msgstr "Slå av"
+
+#: ../data/indicator-session-logout.desktop.in.in.h:1
+#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
 msgid "Log Out"
 msgstr "Logg av"
 
-#: ../src/gconf-helper.c:64 ../src/session-service.c:638
-#: ../src/session-service.c:722
+#: ../data/indicator-session-restart.desktop.in.in.h:1
+#: ../src/settings-helper.c:85
 msgid "Restart"
 msgstr "Start på nytt"
 
-#: ../src/gconf-helper.c:65 ../src/session-service.c:647
-msgid "Switch Off"
-msgstr "Slå av"
-
-#: ../src/gconf-helper.c:67 ../src/session-service.c:615
-msgid "Log Out..."
+#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
+msgid "Log Out…"
 msgstr "Logg av..."
 
-#: ../src/gconf-helper.c:68 ../src/session-service.c:640
-#: ../src/session-service.c:724
-msgid "Restart..."
+#: ../src/settings-helper.c:89
+msgid "Restart…"
 msgstr "Start på nytt..."
 
-#: ../src/gconf-helper.c:69 ../src/session-service.c:649
-msgid "Switch Off..."
+#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
+msgid "Shut Down…"
 msgstr "Slå av..."
 
 #. LOGOUT_DIALOG_LOGOUT,
@@ -81,7 +111,7 @@ msgstr "Start på nytt"
 #. LOGOUT_DIALOG_SHUTDOWN,
 #: ../src/dialog.c:37
 msgctxt "title"
-msgid "Switch Off"
+msgid "Shut Down"
 msgstr "Slå av"
 
 #. LOGOUT_DIALOG_LOGOUT,
@@ -97,7 +127,8 @@ msgstr "Ønsker du å lukke alle programmer og starte datamaskinen på nytt?"
 
 #. LOGOUT_DIALOG_SHUTDOWN,
 #: ../src/dialog.c:43
-msgid "Are you sure you want to close all programs and shut down the computer?"
+msgid ""
+"Are you sure you want to close all programs and shut down the computer?"
 msgstr "Ønsker du å lukke alle programmer og slå av datamaskinen?"
 
 #. LOGOUT_DIALOG_LOGOUT,
@@ -115,7 +146,7 @@ msgstr "Start på nytt"
 #. LOGOUT_DIALOG_SHUTDOWN,
 #: ../src/dialog.c:49
 msgctxt "button"
-msgid "Switch Off"
+msgid "Shut Down"
 msgstr "Slå av"
 
 #. LOGOUT_DIALOG_LOGOUT,
@@ -127,13 +158,13 @@ msgstr "Logg av"
 #. LOGOUT_DIALOG_RESTART,
 #: ../src/dialog.c:56
 msgctxt "button auth"
-msgid "Restart..."
+msgid "Restart…"
 msgstr "Start på nytt..."
 
 #. LOGOUT_DIALOG_SHUTDOWN,
 #: ../src/dialog.c:57
 msgctxt "button auth"
-msgid "Switch Off..."
+msgid "Shut Down…"
 msgstr "Slå av..."
 
 #. TRANSLATORS: This button appears on the logout dialog when
@@ -144,70 +175,163 @@ msgid "Restart Instead"
 msgstr "Start på nytt i stedet"
 
 #: ../src/dialog.c:64
-msgid "Restart Instead..."
-msgstr "Start på nytt i stedet ..."
+msgid "Restart Instead…"
+msgstr "Start på nytt istedet..."
 
 #: ../src/dialog.c:65
-msgid "Some software updates won't apply until the computer next restarts."
-msgstr "Noen programvareoppdateringer trer ikke i kraft før etter en omstart."
+msgid "Some software updates won’t apply until the computer next restarts."
+msgstr ""
+"Noen programvareoppdateringer trer ikke i kraft før datamaskinen er startet "
+"på nytt."
 
-#: ../src/dialog.c:217 ../src/dialog.c:222
+#: ../src/dialog.c:219 ../src/dialog.c:224
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../src/indicator-session.c:272
-msgid "Switch User..."
-msgstr "Bytt bruker..."
+#: ../src/indicator-session.c:538
+msgctxt "session_menu:switchfrom"
+msgid "1"
+msgstr "1"
+
+#: ../src/indicator-session.c:551
+msgid "Switch User Account…"
+msgstr "Bytt brukerkonto…"
 
-#. TODO: We need some way to remove the elipsis from appearing
-#. twice in the label.  Not sure how to do that yet.
-#: ../src/indicator-session.c:301
+#: ../src/indicator-session.c:578
 #, c-format
-msgid "Switch From %s..."
+msgid "Switch From %s…"
 msgstr "Bytt fra %s..."
 
-#: ../src/session-service.c:512
-msgid "Lock Screen"
-msgstr "Lås skjerm"
+#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
+#: ../src/device-menu-mgr.c:548
+msgid "Software Up to Date"
+msgstr "Programvaren er oppdatert"
 
-#: ../src/session-service.c:535
-msgid "Guest Session"
-msgstr "Gjesteøkt"
+#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
+msgid "Updates Available…"
+msgstr "Oppdateringer er tilgjengelige …"
+
+#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
+msgid "Updates Installing…"
+msgstr "Installerer oppdateringer …"
+
+#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
+msgid "Restart to Complete Updates…"
+msgstr "Oppdatering krever omstart..."
+
+#: ../src/device-menu-mgr.c:516
+msgid "System Settings…"
+msgstr "Systeminnstillinger …"
+
+#: ../src/device-menu-mgr.c:527
+msgid "Displays…"
+msgstr "Skjermer..."
+
+#: ../src/device-menu-mgr.c:537
+msgid "Startup Applications…"
+msgstr "Oppstartsprogrammer …"
+
+#: ../src/device-menu-mgr.c:566
+msgid "Attached Devices"
+msgstr "Tilkoblede enheter"
 
-#: ../src/session-service.c:623
-msgid "Sleep"
+#: ../src/device-menu-mgr.c:577
+msgid "Printers"
+msgstr "Skrivere"
+
+#: ../src/device-menu-mgr.c:588
+msgid "Scanners"
+msgstr "Skannere"
+
+#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
+msgid "Webcam"
+msgstr "Nettkamera"
+
+#: ../src/device-menu-mgr.c:692
+msgid "Suspend"
 msgstr "Hvilemodus"
 
-#: ../src/session-service.c:630
+#: ../src/device-menu-mgr.c:704
 msgid "Hibernate"
 msgstr "Dvalemodus"
 
-#: ../src/session-service.c:712
-msgid "Restart Required"
-msgstr "Omstart kreves"
+#: ../src/user-menu-mgr.c:175
+msgid "Guest Session"
+msgstr "Gjesteøkt"
+
+#: ../src/user-menu-mgr.c:189
+msgid "Guest"
+msgstr "Gjest"
 
-#: ../src/session-service.c:714
-msgid "Restart Required..."
-msgstr "Omstart kreves..."
+#: ../src/user-menu-mgr.c:270
+msgid "Online Accounts…"
+msgstr "Nettkontoer..."
 
-#~ msgid ""
-#~ "You recently installed updates which will only take effect after a "
-#~ "restart.  Restart to apply software updates."
+#: ../src/user-menu-mgr.c:285
+msgid "User Accounts…"
+msgstr "Brukerkontoer..."
+
+#: ../src/udev-mgr.c:255
+#, c-format
+msgid "%s Webcam"
+msgstr "%s Webkamera"
+
+#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
+#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
+msgid "Scanner"
+msgstr "Skanner"
+
+#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
+#, c-format
+msgid "%s Scanner"
+msgstr "%s Skanner"
+
+#~ msgid "Restart..."
+#~ msgstr "Start på nytt..."
+
+#~ msgid "Shut Down..."
+#~ msgstr "Slå av..."
+
+#~ msgid "Switch User..."
+#~ msgstr "Bytt bruker..."
+
+#~ msgid "Some software updates won't apply until the computer next restarts."
 #~ msgstr ""
-#~ "Du installerte nylig oppdateringer som bare gjøres gjeldende etter en "
-#~ "omstart.  Start på nytt for å ta i bruk programvareoppdateringer."
-
-#~ msgid "You will be logged out in %d second."
-#~ msgid_plural "You will be logged out in %d seconds."
-#~ msgstr[0] "Du blir logget av om %d sekund."
-#~ msgstr[1] "Du blir logget av om %d sekunder."
-
-#~ msgid "The computer will restart in %d second."
-#~ msgid_plural "The computer will restart in %d seconds."
-#~ msgstr[0] "Datamaskinen starter på nytt om %d sekund."
-#~ msgstr[1] "Datamaskinen starter på nytt om %d sekunder."
-
-#~ msgid "The computer will switch off in %d second."
-#~ msgid_plural "The computer will switch off in %d seconds."
-#~ msgstr[0] "Datamaskinen slås av om %d sekund."
-#~ msgstr[1] "Datamaskinen slås av om %d sekunder."
+#~ "Noen programvareoppdateringer trer ikke i kraft før etter en omstart."
+
+#~ msgid "Restart Instead..."
+#~ msgstr "Start på nytt i stedet ..."
+
+#~ msgctxt "button auth"
+#~ msgid "Restart..."
+#~ msgstr "Start på nytt..."
+
+#~ msgid "Log Out..."
+#~ msgstr "Logg av..."
+
+#, c-format
+#~ msgid "Switch From %s..."
+#~ msgstr "Bytt fra %s..."
+
+#~ msgctxt "button auth"
+#~ msgid "Shut Down..."
+#~ msgstr "Slå av..."
+
+#~ msgid "Makes it so that the logout button doesn't show in the session menu."
+#~ msgstr "Skjul avloggingsknappen i øktmenyen."
+
+#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgstr "Skjul omstartknappen i øktmenyen."
+
+#~ msgid ""
+#~ "Makes it so that the shutdown button doesn't show in the session menu."
+#~ msgstr "Skjul slå av-knappen i øktmenyen."
+
+#~ msgid "Restart to Complete Update…"
+#~ msgstr "Start på nytt for å fullføre oppdatering..."
+
+#~ msgid "Restart to Complete Update"
+#~ msgstr "Start på nytt for å fullføre oppdatering"
+
+#~ msgid "Session"
+#~ msgstr "Økt"