Merge branch 'master' into po

diff --git a/doc/plugins/contrib/po.mdwn b/doc/plugins/contrib/po.mdwn
index c39008466a759a5b43cd2546329c8167d0fc899e..a5e3375ce2c2d6ac7164afb74f3e352c245d9ec8 100644 (file)
--- a/doc/plugins/contrib/po.mdwn
+++ b/doc/plugins/contrib/po.mdwn
@@ -328,3 +328,14 @@ but the po thing is supposed to work without these ugly `our`.
 Seems like it was the last unaddressed item from Joey's review, so I'm
 daring a timid "please pull"... or rather, please review again :)
 --[[intrigeri]]
+
+> Ok, I've reviewed and merged into my own po branch. It's looking very
+> mergeable. I would still like to go over the `po.pm` code in detail and 
+> review it, but it's very complex, and I'm happy with all the changes
+> outside `po.pm`. 
+> 
+> * Is it worth trying to fix compatability with `indexpages`?
+> * Would it make sense to go ahead and modify `page.tmpl` to use
+>   OTHERLANGUAGES and PERCENTTRANSLATED, instead of documenting how to modify it?
+> 
+> --[[Joey]] 

diff --git a/doc/todo/need_global_renamepage_hook.mdwn b/doc/todo/need_global_renamepage_hook.mdwn
index a6080ddc14bb50c2f72236c7aa1a13bbce7dc93a..874460b292dff86ef6eaa6ab25f5656326bdba84 100644 (file)
--- a/doc/todo/need_global_renamepage_hook.mdwn
+++ b/doc/todo/need_global_renamepage_hook.mdwn
@@ -107,3 +107,7 @@ hashes is desired, it could return the full set of hashes.
 >>> I've implemented this nice solution in my po branch, please review.
 >>> I'm slowly coming back to do the last bits needed to get my po and
 >>> meta branch merged.  --[[intrigeri]]
+
+>>>> It looks good. I made some small changes to it in my own po branch.
+>>>> Nothing significant really. If this were not tied up in the po branch,
+>>>> I've have merged it to master already. --[[Joey]]