Activate GUI for watermark layout.

It is now possible to layout properly a watermark whose scale is
computed based on the larger or smaller border. This make it possible
to use a watermark inside a style an apply it into images in portrait
and landscape mode with proper layout.
Merge branch 'watermark-layout-options'

* watermark-layout-options:
  Activate GUI for watermark layout.
Update french translation.