Merge branch 'backport' into work

Conflicts:

	openbox/grab.c
	openbox/keyboard.c

1 files changed, 4 insertions, 0 deletions

diff --git a/openbox/screen.c b/openbox/screen.c
index 90f8b27c..773cb75f 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -394,6 +394,10 @@ void screen_startup(gboolean reconfig)
                        NET_NUMBER_OF_DESKTOPS, CARDINAL, &d))
     {
         if (d != config_desktops_num) {
+            /* TRANSLATORS: If you need to specify a different order of the
+               arguments, you can use %1$d for the first one and %2$d for the
+               second one. For example,
+               "The current session has %2$d desktops, but Openbox is configured for %1$d ..." */
             g_warning(_("Openbox is configured for %d desktops, but the current session has %d.  Overriding the Openbox configuration."),
                       config_desktops_num, d);
         }