From 626ad0411446ffc9c39e9cdee04111a8fad7f54a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 18 Jul 2010 18:35:10 -0400
Subject: merge updated translations from l10n

This includes an (almost) up-to-date French basewiki translation.
---
 po/underlays/basewiki/templates/note.es.po | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'po/underlays/basewiki/templates/note.es.po')

diff --git a/po/underlays/basewiki/templates/note.es.po b/po/underlays/basewiki/templates/note.es.po
index de2c53f5f..186ae48dd 100644
--- a/po/underlays/basewiki/templates/note.es.po
+++ b/po/underlays/basewiki/templates/note.es.po
@@ -6,22 +6,35 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-17 13:48+0200\n"
 "Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"notebox\">\n"
+#| "<TMPL_VAR text>\n"
+#| "</div>\n"
+#| "<TMPL_UNLESS NAME=\"text\">\n"
+#| "Use this template to insert a note into a page. The note will be styled to\n"
+#| "float to the right of other text on the page. This template has one\n"
+#| "parameter:\n"
+#| "<ul>\n"
+#| "<li>`text` - the text to display in the note\n"
+#| "</ul>\n"
+#| "</TMPL_UNLESS>\n"
 msgid ""
 "<div class=\"notebox\">\n"
 "<TMPL_VAR text>\n"
 "</div>\n"
-"<TMPL_UNLESS NAME=\"text\">\n"
+"<TMPL_UNLESS text>\n"
 "Use this template to insert a note into a page. The note will be styled to\n"
 "float to the right of other text on the page. This template has one\n"
 "parameter:\n"
@@ -41,4 +54,3 @@ msgstr ""
 "<li>`text` - el texto que aparecerá en la nota\n"
 "</ul>\n"
 "</TMPL_UNLESS>\n"
-
-- 
cgit v1.2.3