Merge remote branch 'upstream/master' into prv/po

Conflicts:
	doc/plugins/po.mdwn

diff --combined doc/plugins/po.mdwn
index dc0b638e2d2e14cfbc832cf0e89fe3578be76e37,dd85edf3dd8b1313f2a2d097483ef2f612aee1a6..30bac7068e5436b177ee9915f65783fcbd72b175
--- 1/doc/plugins/po.mdwn
--- 2/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@@ -54,10 -54,10 +54,10 @@@ Supported language
  `po_slave_languages` is used to set the list of supported "slave"
  languages, such as:
  
 -        po_slave_languages => { 'fr' => 'Français',
 +        po_slave_languages => [ 'fr' => 'Français',
                                  'es' => 'Español',
                                  'de' => 'Deutsch',
 -        }
 +        ]
  
  Decide which pages are translatable
  -----------------------------------
@@@ -130,7 -130,7 +130,7 @@@ lighttp
  --------
  
  Recent versions of lighttpd should be able to use
 -`$HTTP["language"]` to configure the translatted pages to be served.
 +`$HTTP["language"]` to configure the translated pages to be served.
  
  See [Lighttpd Issue](http://redmine.lighttpd.net/issues/show/1119)
  
@@@ -213,16 -213,16 +213,16 @@@ preferred `$EDITOR`, without needing t
  Markup languages support
  ------------------------
  
 -[[Markdown|mdwn]] is well supported. Some other markup languages supported
 -by ikiwiki mostly work, but some pieces of syntax are not rendered
 -correctly on the slave pages:
 +[[Markdown|mdwn]] and [[html]] are well supported. Some other markup
 +languages supported by ikiwiki mostly work, but some pieces of syntax
 +are not rendered correctly on the slave pages:
  
  * [[reStructuredText|rst]]: anonymous hyperlinks and internal
    cross-references
  * [[wikitext]]: conversion of newlines to paragraphs
  * [[creole]]: verbatim text is wrapped, tables are broken
 -* [[html]] and LaTeX: not supported yet; the dedicated po4a modules
 -  could be used to support them, but they would need a security audit
 +* LaTeX: not supported yet; the dedicated po4a module
 +  could be used to support it, but it would need a security audit
  * other markup languages have not been tested.
  
  Security
@@@ -254,6 -254,18 +254,6 @@@ once [[intrigeri]]'s `meta` branch is m
  An integration branch, called `meta-po`, merges [[intrigeri]]'s `po`
  and `meta` branches, and thus has this additional features.
  
 -Language display order
 -----------------------
 -
 -Jonas pointed out that one might want to control the order that links to
 -other languages are listed, for various reasons. Currently, there is no
 -order, as `po_slave_languages` is a hash. It would need to be converted
 -to an array to support this. (If twere done, twere best done quickly.)
 ---[[Joey]] 
 -
 -> Done in my po branch, preserving backward compatibility. Please
 -> review :) --[[intrigeri]]
 -
  Pagespecs
  ---------
  
@@@ -281,6 -293,9 +281,9 @@@ Also, this may only happen if the page 
  underlay, and the underlays lack translation to a given language.
  --[[Joey]] 
  
+ > Any simple testcase to reproduce it, please? I've never seen this
+ > happen yet. --[[intrigeri]]
+ 
  Double commits of po files
  --------------------------
  
@@@ -295,11 -310,18 +298,18 @@@ and then committed again. The second co
  Same thing happens when a change to an existing page triggers a po file
  update. --[[Joey]] 
  
+ > * The s/utf-8/UTF-8 part is fixed in my po branch.
+ > * The ENCODING\n part is due to an inconsistency in po4a, which
+ >   I've just send a patch for. --[[intrigeri]]
+ 
  Ugly messages with empty files
  ------------------------------
  
  If there are empty .mdwn files, the po plugin displays some ugly messages.
  
+ > This is due to a bug in po4a (not checking definedness of a
+ > variable). One-liner patch sent. --[[intrigeri]]
+ 
  Translation of directives
  -------------------------