Merge branch 'backport' into work

[chaz/openbox] / po / no.po

diff --git a/po/no.po b/po/no.po
index f8c176b649dff779790982fabcb16fd9ae77cff8..a702caa47fbc5e734bb2d938608fd18c70348f99 100644 (file)
--- a/po/no.po
+++ b/po/no.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.7\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2008-03-13 13:29+0100\n"
+"POT-Creation-Date: 2008-11-15 22:28+0100\n"
 "PO-Revision-Date: 2008-03-13 13:37+0100\n"
 "Last-Translator: Michael Kjelbergvik Thung <postlogic@gmail.com>\n"
 "Language-Team: None\n"
@@ -37,8 +37,8 @@ msgstr "Utfør"
 msgid "Failed to convert the path \"%s\" from utf8"
 msgstr "Feil ved konvertering av \"%s\" fra utf8 "
 
-#: openbox/actions/exit.c:52 openbox/actions/session.c:62
-#: openbox/client.c:3458
+#: openbox/actions/exit.c:52 openbox/actions/session.c:64
+#: openbox/client.c:3465
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -54,7 +54,9 @@ msgstr "Er du sikker på at du vil avslutte Openbox?"
 msgid "Exit Openbox"
 msgstr "Avslutt Openbox"
 
-#: openbox/actions/session.c:41
+#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the
+#. name of the action you write in rc.xml
+#: openbox/actions/session.c:43
 msgid ""
 "The SessionLogout action is not available since Openbox was built without "
 "session management support"
@@ -62,27 +64,27 @@ msgstr ""
 "SessionLogout er ikke tilgjengelig fordi Openbox ble kompilert uten støtte "
 "for sesjonsbehandling"
 
-#: openbox/actions/session.c:63 openbox/actions/session.c:68
+#: openbox/actions/session.c:65 openbox/actions/session.c:70
 msgid "Log Out"
 msgstr "Logg Ut"
 
-#: openbox/actions/session.c:67
+#: openbox/actions/session.c:69
 msgid "Are you sure you want to log out?"
 msgstr "Er du sikker på at du vil logge ut?"
 
-#: openbox/client.c:2005
+#: openbox/client.c:2012
 msgid "Unnamed Window"
 msgstr "Ukjent Vindu"
 
-#: openbox/client.c:2019 openbox/client.c:2051
+#: openbox/client.c:2026 openbox/client.c:2058
 msgid "Killing..."
 msgstr "Dreper..."
 
-#: openbox/client.c:2021 openbox/client.c:2053
+#: openbox/client.c:2028 openbox/client.c:2060
 msgid "Not Responding"
 msgstr "Svarer Ikke"
 
-#: openbox/client.c:3447
+#: openbox/client.c:3454
 #, c-format
 msgid ""
 "The window \"%s\" does not seem to be responding.  Do you want to force it "
@@ -91,11 +93,11 @@ msgstr ""
 "Vinduet \"%s\" svarer ikke. Vil du utføre tvunget avslutning ved å sende "
 "signalet %s?"
 
-#: openbox/client.c:3449
+#: openbox/client.c:3456
 msgid "End Process"
 msgstr "Avslutt Prosess"
 
-#: openbox/client.c:3453
+#: openbox/client.c:3460
 #, c-format
 msgid ""
 "The window \"%s\" does not seem to be responding.  Do you want to disconnect "
@@ -104,7 +106,7 @@ msgstr ""
 "Vinduet \"%s\" svarer ikke. Vil du fjerne tilknytning av vinduet til X-"
 "serveren?"
 
-#: openbox/client.c:3455
+#: openbox/client.c:3462
 msgid "Disconnect"
 msgstr "Fjern tilknytning"
 
@@ -411,12 +413,18 @@ msgstr "Vindusbehandleren på skjerm %d vil ikke avslutte"
 #. second one. For example,
 #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..."
 #: openbox/screen.c:412
-#, c-format
+#, fuzzy, c-format
 msgid ""
+"Openbox is configured for %d desktop, but the current session has %d.  "
+"Overriding the Openbox configuration."
+msgid_plural ""
 "Openbox is configured for %d desktops, but the current session has %d.  "
 "Overriding the Openbox configuration."
-msgstr ""
-"Aktiv sesjon har %2$d desktoper, mens Openbox er konfigurert til %1$d.  "
+msgstr[0] ""
+"Aktiv sesjon har %2$d skrivebord, mens Openbox er konfigurert til %1$d.  "
+"Benytter innstillingene for den aktive sesjonen."
+msgstr[1] ""
+"Aktiv sesjon har %2$d skrivebord, mens Openbox er konfigurert til %1$d.  "
 "Benytter innstillingene for den aktive sesjonen."
 
 #: openbox/screen.c:1180
@@ -434,19 +442,19 @@ msgstr "Kan ikke lage katalog \"%s\": %s"
 msgid "Unable to save the session to \"%s\": %s"
 msgstr "Kan ikke lagre sesjon til \"%s\": %s"
 
-#: openbox/session.c:598
+#: openbox/session.c:605
 #, c-format
 msgid "Error while saving the session to \"%s\": %s"
 msgstr "Feil ved lagring av sesjon til \"%s\": %s"
 
-#: openbox/session.c:835
+#: openbox/session.c:842
 msgid "Not connected to a session manager"
 msgstr "Ikke tilknyttet en sesjonsbehandler"
 
 #: openbox/startupnotify.c:243
 #, c-format
-msgid "Running %s\n"
-msgstr "Kjører %s\n"
+msgid "Running %s"
+msgstr "Kjører %s"
 
 #: openbox/translate.c:59
 #, c-format