XWIKI-11475: Add translation keys to some include and display macro parameters

* also reordered the keys of the include and display macro
  to group them by macro