tests: msgmerge po files to have new syntax from pot files

15 files changed, 191 insertions, 102 deletions

diff --git a/tests/IT-attributes-1.ll.po b/tests/IT-attributes-1.ll.po
index 268b077..e2d63ab 100644
--- a/tests/IT-attributes-1.ll.po
+++ b/tests/IT-attributes-1.ll.po
@@ -1,19 +1,21 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-06-23 16:08-0400\n"
+"POT-Creation-Date: 2012-05-04 11:46-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tests/IT-attributes-1.xml:9(page/code@title)
+#. (itstool) path: page/code@title
+#: tests/IT-attributes-1.xml:9
 msgid "one"
 msgstr "eins"
 
-#: tests/IT-attributes-1.xml:9(code/span@title)
+#. (itstool) path: code/span@title
+#: tests/IT-attributes-1.xml:9
 msgid "two"
 msgstr "zwei"
-
diff --git a/tests/IT-context-1.ll.po b/tests/IT-context-1.ll.po
index 6ea88ff..c8a4836 100644
--- a/tests/IT-context-1.ll.po
+++ b/tests/IT-context-1.ll.po
@@ -1,35 +1,40 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-06-25 14:23-0400\n"
+"POT-Creation-Date: 2012-05-04 11:57-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tests/Context.xml:8(info/title)
+#. (itstool) path: info/title
+#: tests/IT-context-1.xml:8
 msgctxt "[[sort]]"
 msgid "Title"
 msgstr "Sort"
 
-#: tests/Context.xml:9(info/title)
+#. (itstool) path: info/title
+#: tests/IT-context-1.xml:9
 msgctxt "link"
 msgid "Link title"
 msgstr "Linky"
 
-#: tests/Context.xml:10(info/title)
+#. (itstool) path: info/title
+#: tests/IT-context-1.xml:10
 msgctxt "link:topic"
 msgid "Topic link title"
 msgstr "Topics"
 
-#: tests/Context.xml:12(page/title)
+#. (itstool) path: page/title
+#: tests/IT-context-1.xml:12
 msgid "Title"
 msgstr "Main title"
 
-#: tests/Context.xml:13(page/p)
+#. (itstool) path: page/p
+#: tests/IT-context-1.xml:13
 msgctxt "paragraph"
 msgid "Context is paragraph"
 msgstr "This is a paragraph"
-
diff --git a/tests/IT-dropRule-1.ll.po b/tests/IT-dropRule-1.ll.po
index 9a9d799..d703014 100644
--- a/tests/IT-dropRule-1.ll.po
+++ b/tests/IT-dropRule-1.ll.po
@@ -1,15 +1,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-06-01 22:50+0200\n"
+"POT-Creation-Date: 2012-05-04 11:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tests/IT-dropRule-1.xml:8(content/p)
+#. (itstool) path: content/p
+#: tests/IT-dropRule-1.xml:8
 msgid "Everything started now."
 msgstr "Tout commença à l'instant."
-
diff --git a/tests/IT-placeholder-1.ll.po b/tests/IT-placeholder-1.ll.po
index 43190bf..3da9bc5 100644
--- a/tests/IT-placeholder-1.ll.po
+++ b/tests/IT-placeholder-1.ll.po
@@ -1,19 +1,24 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-06-29 21:02+0200\n"
+"POT-Creation-Date: 2012-05-04 13:39-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tests/Placeholder.xml:3(note/p)
+#. (itstool) path: note/p
+#: tests/IT-placeholder-1.xml:3
 msgid "This is a note."
 msgstr "Voici une note."
 
-#: tests/Placeholder.xml:3(body/p)
-msgid "This is the first paragraph. It has a note on its final word<_:note-1/>."
-msgstr "Voici le premier paragraphe. Il contient une note liée à son dernier mot<_:note-1/>."
-
+#. (itstool) path: body/p
+#: tests/IT-placeholder-1.xml:3
+msgid ""
+"This is the first paragraph. It has a note on its final word<_:note-1/>."
+msgstr ""
+"Voici le premier paragraphe. Il contient une note liée à son dernier mot<_:"
+"note-1/>."
diff --git a/tests/Translate1.ll.po b/tests/Translate1.ll.po
index 8a43b60..e57b5c5 100644
--- a/tests/Translate1.ll.po
+++ b/tests/Translate1.ll.po
@@ -1,39 +1,47 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-30 18:39+0200\n"
+"POT-Creation-Date: 2012-05-04 10:43-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tests/Translate1.xml:15(body/par)
+#. (itstool) path: body/par
+#: tests/Translate1.xml:15
 msgid "Text with an image: <img alt=\"Image description\" src=\"img.png\"/>."
-msgstr "Texte avec une image : <img alt=\"Description d'image\" src=\"img.png\"/>."
+msgstr ""
+"Texte avec une image : <img alt=\"Description d'image\" src=\"img.png\"/>."
 
-#: tests/Translate1.xml:16(body/par@title)
+#. (itstool) path: body/par@title
+#: tests/Translate1.xml:16
 msgid "Text"
 msgstr "Texte"
 
-#: tests/Translate1.xml:16(body/par)
+#. (itstool) path: body/par
+#: tests/Translate1.xml:16
 msgid "This is the first paragraph. It has some <_:verbatim-1/>."
 msgstr "C'est le premier paragraphe. Il contient du texte <_:verbatim-1/>."
 
-#: tests/Translate1.xml:21(封面/汇集)
+#. (itstool) path: 封面/汇集
+#: tests/Translate1.xml:21
 msgid "The Lord of the Rings"
 msgstr "Le Seigneur des Anneaux"
 
-#: tests/Translate1.xml:22(封面/标题)
+#. (itstool) path: 封面/标题
+#: tests/Translate1.xml:22
 msgid "The Return of the King"
 msgstr "Le retour du Roi"
 
-#: tests/Translate1.xml:26(章节/头注)
+#. (itstool) path: 章节/头注
+#: tests/Translate1.xml:26
 msgid "Minas Tirith"
 msgstr "Minas Tirith"
 
-#: tests/Translate1.xml:27(章节/段落识别)
+#. (itstool) path: 章节/段落识别
+#: tests/Translate1.xml:27
 msgid "<_:姓名-1/> looked out from the shelter of <_:姓名-2/>'s cloak."
 msgstr "<_:姓名-1/> regarda depuis l'abri du manteau de <_:姓名-2/>."
-
diff --git a/tests/Translate2.ll.po b/tests/Translate2.ll.po
index 0ccb8de..7ee89c7 100644
--- a/tests/Translate2.ll.po
+++ b/tests/Translate2.ll.po
@@ -1,19 +1,21 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-31 21:15+0200\n"
+"POT-Creation-Date: 2012-05-04 10:48-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tests/Translate2.xml:8(body/par@title)
+#. (itstool) path: body/par@title
+#: tests/Translate2.xml:8
 msgid "Text"
 msgstr "Texte"
 
-#: tests/Translate2.xml:8(body/par)
+#. (itstool) path: body/par
+#: tests/Translate2.xml:8
 msgid "This is the first paragraph. It has some <_:code-1/>."
 msgstr "C'est le premier paragraphe. Il contient du texte <_:code-1/>."
-
diff --git a/tests/Translate3.ll.po b/tests/Translate3.ll.po
index 8348ee5..1775d0c 100644
--- a/tests/Translate3.ll.po
+++ b/tests/Translate3.ll.po
@@ -1,19 +1,25 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-31 21:23+0200\n"
+"POT-Creation-Date: 2012-05-04 11:00-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tests/Translate3.xml:6(head/title)
+#. (itstool) path: head/title
+#: tests/Translate3.xml:6
 msgid "The Life of a Simple Man"
 msgstr "La vie d'un simple homme"
 
-#: tests/Translate3.xml:9(body/p)
-msgid "Everything started when Zebulon discovered that he had a <_:span-1/> who was a serious baseball <_:span-2/>."
-msgstr "Tout commença alors que Zebulon découvrit qu'il avait un <_:span-1/> qui était un <_:span-2/> sérieux de baseball."
-
+#. (itstool) path: body/p
+#: tests/Translate3.xml:9
+msgid ""
+"Everything started when Zebulon discovered that he had a <_:span-1/> who was "
+"a serious baseball <_:span-2/>."
+msgstr ""
+"Tout commença alors que Zebulon découvrit qu'il avait un <_:span-1/> qui "
+"était un <_:span-2/> sérieux de baseball."
diff --git a/tests/Translate3.ll.wrong.po b/tests/Translate3.ll.wrong.po
index a143f9c..78b861c 100644
--- a/tests/Translate3.ll.wrong.po
+++ b/tests/Translate3.ll.wrong.po
@@ -1,19 +1,25 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-31 21:23+0200\n"
+"POT-Creation-Date: 2012-05-04 11:00-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tests/Translate3.xml:6(head/title)
+#. (itstool) path: head/title
+#: tests/Translate3.xml:6
 msgid "The Life of a Simple Man"
 msgstr "La vie d'un simple homme"
 
-#: tests/Translate3.xml:9(body/p)
-msgid "Everything started when Zebulon discovered that he had a <_:span-1/> who was a serious baseball <_:span-2/>."
-msgstr "Tout commença alors que Zebulon découvrit qu'il avait un <_:span-1> qui était un <_:span-2/> sérieux de baseball."
-
+#. (itstool) path: body/p
+#: tests/Translate3.xml:9
+msgid ""
+"Everything started when Zebulon discovered that he had a <_:span-1/> who was "
+"a serious baseball <_:span-2/>."
+msgstr ""
+"Tout commença alors que Zebulon découvrit qu'il avait un <_:span-1> qui "
+"était un <_:span-2/> sérieux de baseball."
diff --git a/tests/Translate4.ll.po b/tests/Translate4.ll.po
index 09505db..22b8bec 100644
--- a/tests/Translate4.ll.po
+++ b/tests/Translate4.ll.po
@@ -1,19 +1,25 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-31 21:28+0200\n"
+"POT-Creation-Date: 2012-05-04 11:16-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tests/Translate4.xml:3(head/title)
+#. (itstool) path: head/title
+#: tests/Translate4.xml:3
 msgid "The Life of a Simple Man"
 msgstr "La vie d'un simple homme"
 
-#: tests/Translate4.xml:6(body/p)
-msgid "Everything started when Zebulon discovered that he had a <_:fexp-1/> who was a serious baseball <_:fexp-2/>."
-msgstr "Tout commença alors que Zebulon découvrit qu'il avait un <_:fexp-1/> qui était un <_:fexp-2/> sérieux de baseball."
-
+#. (itstool) path: body/p
+#: tests/Translate4.xml:6
+msgid ""
+"Everything started when Zebulon discovered that he had a <_:fexp-1/> who was "
+"a serious baseball <_:fexp-2/>."
+msgstr ""
+"Tout commença alors que Zebulon découvrit qu'il avait un <_:fexp-1/> qui "
+"était un <_:fexp-2/> sérieux de baseball."
diff --git a/tests/Translate5.ll.po b/tests/Translate5.ll.po
index d223418..e2dfa0a 100644
--- a/tests/Translate5.ll.po
+++ b/tests/Translate5.ll.po
@@ -1,19 +1,25 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-31 21:45+0200\n"
+"POT-Creation-Date: 2012-05-04 11:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tests/Translate5.xml:9(info/item)
+#. (itstool) path: info/item
+#: tests/Translate5.xml:9
 msgid "The Life of a <_:b-1/>"
 msgstr "La vie d'un <_:b-1/>"
 
-#: tests/Translate5.xml:15(content/p)
-msgid "Everything started when Zebulon discovered that he had a <_:span-1/> who was a serious baseball <_:span-2/>."
-msgstr "Tout commença alors que Zebulon découvrit qu'il avait un <_:span-1/> qui était un <_:span-2/> sérieux de baseball."
-
+#. (itstool) path: content/p
+#: tests/Translate5.xml:15
+msgid ""
+"Everything started when Zebulon discovered that he had a <_:span-1/> who was "
+"a serious baseball <_:span-2/>."
+msgstr ""
+"Tout commença alors que Zebulon découvrit qu'il avait un <_:span-1/> qui "
+"était un <_:span-2/> sérieux de baseball."
diff --git a/tests/Translate6.ll.po b/tests/Translate6.ll.po
index b589916..e15cdff 100644
--- a/tests/Translate6.ll.po
+++ b/tests/Translate6.ll.po
@@ -1,31 +1,40 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-31 21:48+0200\n"
+"POT-Creation-Date: 2012-05-04 11:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tests/Translate6.xml:9(item/b)
+#. (itstool) path: item/b
+#: tests/Translate6.xml:9
 msgid "Simple Man"
 msgstr "simple homme"
 
-#: tests/Translate6.xml:9(info/item)
+#. (itstool) path: info/item
+#: tests/Translate6.xml:9
 msgid "The Life of a <_:b-1/>"
 msgstr "La vie d'un <_:b-1/>"
 
-#: tests/Translate6.xml:16(p/span)
+#. (itstool) path: p/span
+#: tests/Translate6.xml:16
 msgid "doppelgänger"
 msgstr "double"
 
-#: tests/Translate6.xml:17(p/span)
+#. (itstool) path: p/span
+#: tests/Translate6.xml:17
 msgid "aficionado"
 msgstr "passionné"
 
-#: tests/Translate6.xml:15(content/p)
-msgid "Everything started when Zebulon discovered that he had a <_:span-1/> who was a serious baseball <_:span-2/>."
-msgstr "Tout commença alors que Zebulon découvrit qu'il avait un <_:span-1/> qui était un <_:span-2/> sérieux de baseball."
-
+#. (itstool) path: content/p
+#: tests/Translate6.xml:15
+msgid ""
+"Everything started when Zebulon discovered that he had a <_:span-1/> who was "
+"a serious baseball <_:span-2/>."
+msgstr ""
+"Tout commença alors que Zebulon découvrit qu'il avait un <_:span-1/> qui "
+"était un <_:span-2/> sérieux de baseball."
diff --git a/tests/Translate7.ll.po b/tests/Translate7.ll.po
index 16acd6c..ff82f24 100644
--- a/tests/Translate7.ll.po
+++ b/tests/Translate7.ll.po
@@ -1,19 +1,21 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-31 21:54+0200\n"
+"POT-Creation-Date: 2012-05-04 11:30-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tests/Translate7.xml:19(body/p)
+#. (itstool) path: body/p
+#: tests/Translate7.xml:19
 msgid "For the implementation of ITS, apply the rules in the order:"
 msgstr "Pour l'implémentation d'ITS, appliquez les règles dans l'ordre :"
 
-#: tests/Translate7.xml:26(body/p)
+#. (itstool) path: body/p
+#: tests/Translate7.xml:26
 msgid "<_:ph-1/> The last rule wins."
 msgstr "<_:ph-1/> La dernière règle gagne."
-
diff --git a/tests/TranslateGlobal.ll.po b/tests/TranslateGlobal.ll.po
index 17e30d3..9f86d44 100644
--- a/tests/TranslateGlobal.ll.po
+++ b/tests/TranslateGlobal.ll.po
@@ -1,23 +1,26 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-06-04 17:32+0200\n"
+"POT-Creation-Date: 2012-05-04 11:34-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tests/TranslateGlobal.xml:10(body/par@title)
+#. (itstool) path: body/par@title
+#: tests/TranslateGlobal.xml:10
 msgid "Text"
 msgstr "Texte"
 
-#: tests/TranslateGlobal.xml:10(body/par)
+#. (itstool) path: body/par
+#: tests/TranslateGlobal.xml:10
 msgid "This is the first paragraph. It has some <_:code-1/>."
 msgstr "Voici le premier paragraphe. Il contient du texte <_:code-1/>."
 
-#: tests/TranslateGlobal.xml:11(body/par)
+#. (itstool) path: body/par
+#: tests/TranslateGlobal.xml:11
 msgid "Some additional text."
 msgstr "Du texte supplémentaire."
-
diff --git a/tests/WithinText1.ll.po b/tests/WithinText1.ll.po
index 4135bf5..d77ddf2 100644
--- a/tests/WithinText1.ll.po
+++ b/tests/WithinText1.ll.po
@@ -1,23 +1,29 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-06-01 08:49+0200\n"
+"POT-Creation-Date: 2012-05-04 10:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tests/WithinText1.xml:9(body/p)
-msgid "This is a paragraph with <b>bold</b>, <i>italic</i>, and <u>underlined</u>."
-msgstr "Ceci est un paragraphe avec <b>gras</b>, <i>italique</i> et <u>souligné</u>."
+#. (itstool) path: body/p
+#: tests/WithinText1.xml:9
+msgid ""
+"This is a paragraph with <b>bold</b>, <i>italic</i>, and <u>underlined</u>."
+msgstr ""
+"Ceci est un paragraphe avec <b>gras</b>, <i>italique</i> et <u>souligné</u>."
 
-#: tests/WithinText1.xml:10(p/fn)
+#. (itstool) path: p/fn
+#: tests/WithinText1.xml:10
 msgid "This is the text of the footnote"
 msgstr "Voici le texte d'une note de pied de page"
 
-#: tests/WithinText1.xml:10(body/p)
+#. (itstool) path: body/p
+#: tests/WithinText1.xml:10
 msgid "This is a paragraph with a footnote<_:fn-1/> at the middle."
-msgstr "Voici un paragraphe avec une note de pied de page<_:fn-1/> insérée au milieu."
-
+msgstr ""
+"Voici un paragraphe avec une note de pied de page<_:fn-1/> insérée au milieu."
diff --git a/tests/WithinText2.ll.po b/tests/WithinText2.ll.po
index 865fbcc..57280da 100644
--- a/tests/WithinText2.ll.po
+++ b/tests/WithinText2.ll.po
@@ -1,51 +1,73 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-06-01 09:34+0200\n"
+"POT-Creation-Date: 2012-05-04 10:52-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tests/WithinText2.xml:9(prolog/author)
+#. (itstool) path: prolog/author
+#: tests/WithinText2.xml:9
 msgid "Zebulon Fairfield"
 msgstr "Zebulon Fairfield"
 
-#: tests/WithinText2.xml:10(prolog/version)
+#. (itstool) path: prolog/version
+#: tests/WithinText2.xml:10
 msgid "version 12, revision 2 - 2006-08-14"
 msgstr "version 12, révision 2 - 14/08/2006"
 
-#: tests/WithinText2.xml:11(keywords/kw)
+#. (itstool) path: keywords/kw
+#: tests/WithinText2.xml:11
 msgid "horse"
 msgstr "cheval"
 
-#: tests/WithinText2.xml:11(keywords/kw)
+#. (itstool) path: keywords/kw
+#: tests/WithinText2.xml:11
 msgid "appaloosa"
 msgstr "appaloosa"
 
-#: tests/WithinText2.xml:12(prolog/storageKey)
+#. (itstool) path: prolog/storageKey
+#: tests/WithinText2.xml:12
 msgid "articles-6D272BA9-3B89CAD8"
 msgstr "articles-6D272BA9-3B89CAD8"
 
-#: tests/WithinText2.xml:16(section/title)
+#. (itstool) path: section/title
+#: tests/WithinText2.xml:16
 msgid "Appaloosa"
 msgstr "Appaloosa"
 
-#: tests/WithinText2.xml:17(p/fnote)
-msgid "The name comes from \"Palouse horse\" in reference to the Palouse River in Northern Idaho."
-msgstr "Le nom provient de « cheval de Palouse » en référence à la rivière Palouse en Idaho du Nord."
+#. (itstool) path: p/fnote
+#: tests/WithinText2.xml:17
+msgid ""
+"The name comes from \"Palouse horse\" in reference to the Palouse River in "
+"Northern Idaho."
+msgstr ""
+"Le nom provient de « cheval de Palouse » en référence à la rivière Palouse "
+"en Idaho du Nord."
 
-#: tests/WithinText2.xml:17(section/p)
-msgid "The Appaloosa<_:fnote-1/> are rugged horses originally breed by the <kw>Nez-Perce</kw> tribe in the US Northwest."
-msgstr "Les appaloosas<_:fnote-1/> sont de rudes chevaux élevés initialement par la tribu des <kw>Nez-Percés</kw> dans le Nord-ouest américain."
+#. (itstool) path: section/p
+#: tests/WithinText2.xml:17
+msgid ""
+"The Appaloosa<_:fnote-1/> are rugged horses originally breed by the <kw>Nez-"
+"Perce</kw> tribe in the US Northwest."
+msgstr ""
+"Les appaloosas<_:fnote-1/> sont de rudes chevaux élevés initialement par la "
+"tribu des <kw>Nez-Percés</kw> dans le Nord-ouest américain."
 
-#: tests/WithinText2.xml:20(section/p)
-msgid "They are often characterized by their spotted coats, as shown here: <img src=\"appaloosa.png\" alt=\"Appaloosa horses\"/>"
-msgstr "Ils sont souvent caractérisés par leur robe tachetée, comme sur cette image : <img src=\"appaloosa.png\" alt=\"Chevaux appaloosas\"/>"
+#. (itstool) path: section/p
+#: tests/WithinText2.xml:20
+msgid ""
+"They are often characterized by their spotted coats, as shown here: <img src="
+"\"appaloosa.png\" alt=\"Appaloosa horses\"/>"
+msgstr ""
+"Ils sont souvent caractérisés par leur robe tachetée, comme sur cette "
+"image : <img src=\"appaloosa.png\" alt=\"Chevaux appaloosas\"/>"
 
-#: tests/WithinText2.xml:23(footer/p)
+#. (itstool) path: footer/p
+#: tests/WithinText2.xml:23
 msgid "Copyright: <em>Zebulon Inc.</em>"
 msgstr "Copyright : <em>Zebulon Inc.</em>"
-