both are now fixed in my po branch.

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 0f1d66d32adebeb728852ea13a13bef2f37b47d0..91273ba9810e1db4e2919aa84d29d12b636f88ea 100644 (file)
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -315,3 +315,6 @@ underlay, and the underlays lack translation to a given language.
 >>>>>> although they do not in this case. I still need to have a deep
 >>>>>> look at the underlays-related code you added to `po.pm` a while
 >>>>>> ago. Stay tuned. --[[intrigeri]]
+
+>>>>>>> Fixed in my po branch, along with other related small bugs that
+>>>>>>> happen in the very same situation only. --[[intrigeri]]

diff --git a/doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn b/doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn
index d4e1f743cdd4d9d1daa721f81c4b5d92e51db311..402f70b7906f7d246c8355f2db5c84a5e1e1a7af 100644 (file)
--- a/doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn
+++ b/doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn
@@ -41,3 +41,5 @@ Re the meta title escaping issue worked around by `change`.
 
 >>>>>> Sure. I was fearing to break other plugins if I did so, so I
 >>>>>> did not dare to. I'll try this. --[[intrigeri]]
+
+>>>>>>> Done in my po branch, please have a look. --[[intrigeri]]