aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2010-08-02 15:14:33 +0200
committerintrigeri <intrigeri@boum.org>2010-08-02 15:14:33 +0200
commit97a706f73ce2cedc8fd8a9bbeea6d25783260b2e (patch)
tree8005df0c4a9acb75885a29bb95649061e8e2e476
parente083e4caa8175c4ccc45dd06e9b9cd784dcbbc94 (diff)
downloadikiwiki-97a706f73ce2cedc8fd8a9bbeea6d25783260b2e.tar
ikiwiki-97a706f73ce2cedc8fd8a9bbeea6d25783260b2e.tar.gz
both are now fixed in my po branch.
-rw-r--r--doc/plugins/po.mdwn3
-rw-r--r--doc/todo/po:_avoid_rebuilding_to_fix_meta_titles.mdwn2
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 0f1d66d32..91273ba98 100644
--- 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 d4e1f743c..402f70b79 100644
--- 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]]