From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Jul 2010 18:24:48 +0000 (-0400)
Subject: Merge commit '862fc7c1ab1f7d709561bcb02fc8ede57b90a51b'
X-Git-Tag: 3.20100804~30
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/e5f67d3c8bd59ff715e2d71c3b4747aa11c61085?ds=inline;hp=-c

Merge commit '862fc7c1ab1f7d709561bcb02fc8ede57b90a51b'
---

e5f67d3c8bd59ff715e2d71c3b4747aa11c61085
diff --combined doc/plugins/po.mdwn
index fc7d1d502,c36414c8e..ddaba86f0
--- a/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',
-                                 'es' => 'Español',
-                                 'de' => 'Deutsch',
-         }
+         po_slave_languages => [ 'fr|Français',
+                                 'es|Español',
+                                 'de|Deutsch',
+         ]
  
  Decide which pages are translatable
  -----------------------------------
@@@ -301,9 -301,6 +301,9 @@@ to an array to support this. (If twere 
  >>>> no way to really sanely represent complex data structures in web
  >>>> setup. --[[Joey]]
  
 +>>>>> Implemented using the pipe separator, fixed the po.t test suite
 +>>>>> accordingly. Please have a look. --[[intrigeri]]
 +
  Pagespecs
  ---------
  
@@@ -354,7 -351,7 +354,7 @@@ 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 s/utf-8/UTF-8 part has been fixed.
  > * The ENCODING\n part is due to an inconsistency in po4a, which
  >   I've just send a patch for. --[[intrigeri]]