aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--doc/plugins/po.mdwn4
2 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index c27af5615..0f6a7c810 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
ikiwiki (3.20100723) UNRELEASED; urgency=low
* template: Fix dependency tracking. Broken in version 3.20100427.
+ * po: The po_slave_languages setting is now a list, so the order of
+ translated languages can be controlled. (intrigeri)
-- Joey Hess <joeyh@debian.org> Fri, 23 Jul 2010 14:00:32 -0400
diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index ddaba86f0..d70247295 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -304,6 +304,10 @@ to an array to support this. (If twere done, twere best done quickly.)
>>>>> Implemented using the pipe separator, fixed the po.t test suite
>>>>> accordingly. Please have a look. --[[intrigeri]]
+>>>>>> Merged. I wonder if "ll: Lang" would be better than pipe?
+>>>>>> Also, the compatability code for HASH is not really needed,
+>>>>>> ikiwiki has not been released using a hash for it. --[[Joey]]
+
Pagespecs
---------