Merge branch '_nb' into nb

Conflicts:
	Makefile (manually resolved)

1 files changed, 46 insertions, 46 deletions

diff --git a/po/smiley.pot b/po/smiley.pot
index af1d775..622416d 100644
--- a/po/smiley.pot
+++ b/po/smiley.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki smiley 2.62.1\n"
-"POT-Creation-Date: 2008-08-30 05:01+0300\n"
+"POT-Creation-Date: 2009-05-25 23:07+0300\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"
@@ -15,225 +15,225 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit"
 
-# type: Plain text
+#. type: Plain text
 #: smileys.mdwn:3
 msgid ""
 "This page is used to control what smileys are supported by the wiki.  Just "
 "write the text of a smiley to display it."
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\:)\t[[smileys/smile.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\:-)\t[[smileys/smile.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\:D\t[[smileys/biggrin.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\:-D\t[[smileys/biggrin.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\B)\t[[smileys/smile2.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\B-)\t[[smileys/smile2.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\:))\t[[smileys/smile3.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\:-))\t[[smileys/smile3.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\;)\t[[smileys/smile4.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\;-)\t[[smileys/smile4.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\:\\\t[[smileys/ohwell.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\:-\\\t[[smileys/ohwell.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\:/\t[[smileys/ohwell.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\:-/\t[[smileys/ohwell.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\:|\t[[smileys/neutral.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\:-|\t[[smileys/neutral.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\>:>\t[[smileys/devil.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\X-(\t[[smileys/angry.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\<:(\t[[smileys/frown.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\:(\t[[smileys/sad.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\:-(\t[[smileys/sad.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\:-?\t[[smileys/tongue.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\:-P\t[[smileys/tongue.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\:o\t[[smileys/redface.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\|)\t[[smileys/tired.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\|-)\t[[smileys/tired.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\{OK}\t[[smileys/thumbs-up.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\{X}\t[[smileys/icon-error.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\{i}\t[[smileys/icon-info.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\(./)\t[[smileys/checkmark.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\(!)\t[[smileys/idea.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\[!]\t[[smileys/attention.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\/!\\\t[[smileys/alert.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\(?)\t[[smileys/question.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\{x}\t[[smileys/star_on.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\{*}\t[[smileys/star_on.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\{o}\t[[smileys/star_off.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\{1}\t[[smileys/prio1.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\{2}\t[[smileys/prio2.png]]"
 msgstr ""
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\{3}\t[[smileys/prio3.png]]"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: smileys.mdwn:46
 msgid "For example: {x} B) {x}"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: smileys.mdwn:47
 #, no-wrap
 msgid "----\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: smileys.mdwn:53
 msgid ""
 "To change the supported smileys, just edit the lists on this page.  Note "
@@ -242,7 +242,7 @@ msgid ""
 "followed by a [[ikiwiki/WikiLink]] to the image to display."
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: smileys.mdwn:56
 msgid ""
 "/!\\ Bear in mind that the link to the image needs to be written in a way "