Merge branch 'backport' into work

Conflicts:

	configure.ac
	data/rc.xml
	openbox/client.c
	openbox/event.c
	openbox/focus_cycle.c
	openbox/focus_cycle_popup.c
	openbox/openbox.c
	openbox/prop.c
	openbox/prop.h
	openbox/screen.c
	parser/parse.c
	version.h.in

1 files changed, 1 insertions, 1 deletions

diff --git a/po/ja.po b/po/ja.po
index 4af2e9b5..31a070f7 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -296,7 +296,7 @@ msgstr "著作権 (c)"
 
 #: openbox/openbox.c:529
 msgid "Syntax: openbox [options]\n"
-msgstr "使い方: openbox [オプション]\n"
+msgstr "用法: openbox [オプション]\n"
 
 #: openbox/openbox.c:530
 msgid ""