Merge branch 'backport' into work

Conflicts:
	openbox/actions/desktop.c
	openbox/client.c
	openbox/event.c
	openbox/extensions.c
	openbox/popup.c
	openbox/screen.c
	parser/parse.c

1 files changed, 2 insertions, 2 deletions

diff --git a/po/no.po b/po/no.po
index 5fe220d7..a702caa4 100644
--- a/po/no.po
+++ b/po/no.po
@@ -453,8 +453,8 @@ 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