diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-02-02 11:36:17 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-02-02 11:37:35 -0500 |
| commit | 0dc7eca4cdfff6425e19a0bace0f9ae8834d04e8 (patch) | |
| tree | 0fe4df591efed9b1d50607ac1ec1d45565714403 /po/no.po | |
| parent | 76fcb473fa801728badf916cfebe349822759056 (diff) | |
| parent | 746859c1017e9cdf73eb91470e795f0c4b98b21a (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/client.c
openbox/event.c
openbox/mouse.c
openbox/openbox.c
openbox/prop.c
openbox/prop.h
openbox/screen.c
parser/parse.c
parser/parse.h
Diffstat (limited to 'po/no.po')
| -rw-r--r-- | po/no.po | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.6\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-01-29 13:43+0100\n" +"POT-Creation-Date: 2008-02-02 09:06-0500\n" "PO-Revision-Date: 2008-01-29 13:37+0100\n" "Last-Translator: Michael Kjelbergvik Thung <postlogic@gmail.com>\n" "Language-Team: None\n" @@ -30,11 +30,11 @@ msgstr "Feil ved konvertering av '%s' fra utf8 " msgid "Failed to execute '%s': %s" msgstr "Kunne ikke kjøre '%s': %s" -#: openbox/client.c:1979 openbox/client.c:2011 +#: openbox/client.c:1988 openbox/client.c:2020 msgid "Killing..." msgstr "Dreper..." -#: openbox/client.c:1981 openbox/client.c:2013 +#: openbox/client.c:1990 openbox/client.c:2022 msgid "Not Responding" msgstr "Svarer Ikke" @@ -309,7 +309,9 @@ msgstr "Vindusbehandleren på skjerm %d vil ikke avslutte" msgid "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." -msgstr "Openbox er innstillt til %d skrivebord, men nåværende sesjon har %d. Benytter sesjonens innstilling." +msgstr "" +"Openbox er innstillt til %d skrivebord, men nåværende sesjon har %d. " +"Benytter sesjonens innstilling." #: openbox/screen.c:1168 #, c-format |