Merge branch 'master' into allinone

Conflicts:
	Makefile (resolved manually)

1 files changed, 49 insertions, 49 deletions

diff --git a/po/smiley.da.po b/po/smiley.da.po
index e847dcc..59cadea 100644
--- a/po/smiley.da.po
+++ b/po/smiley.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki smiley 2.56\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-04 00:01+0300\n"
+"POT-Creation-Date: 2009-05-25 23:02+0300\n"
 "PO-Revision-Date: 2008-08-04 00:20+0300\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Poedit-Country: DENMARK\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-# type: Plain text
+#. type: Plain text
 #: smileys.mdwn:3
 msgid ""
 "This page is used to control what smileys are supported by the wiki.  Just "
@@ -27,218 +27,218 @@ msgstr ""
 "Denne side bruges til at styre hvilke smileys denne wiki understøtter. Skriv "
 "blot smiley-teksten for at vise den."
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\:)\t[[smileys/smile.png]]"
 msgstr "\\\\:)\t[[smileys/smile.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\:-)\t[[smileys/smile.png]]"
 msgstr "\\\\:-)\t[[smileys/smile.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\:D\t[[smileys/biggrin.png]]"
 msgstr "\\\\:D\t[[smileys/biggrin.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\:-D\t[[smileys/biggrin.png]]"
 msgstr "\\\\:-D\t[[smileys/biggrin.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\B)\t[[smileys/smile2.png]]"
 msgstr "\\\\B)\t[[smileys/smile2.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\B-)\t[[smileys/smile2.png]]"
 msgstr "\\\\B-)\t[[smileys/smile2.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\:))\t[[smileys/smile3.png]]"
 msgstr "\\\\:))\t[[smileys/smile3.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\:-))\t[[smileys/smile3.png]]"
 msgstr "\\\\:-))\t[[smileys/smile3.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\;)\t[[smileys/smile4.png]]"
 msgstr "\\\\;)\t[[smileys/smile4.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\;-)\t[[smileys/smile4.png]]"
 msgstr "\\\\;-)\t[[smileys/smile4.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\:\\\t[[smileys/ohwell.png]]"
 msgstr "\\\\:\\\t[[smileys/ohwell.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\:-\\\t[[smileys/ohwell.png]]"
 msgstr "\\\\:-\\\t[[smileys/ohwell.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\:/\t[[smileys/ohwell.png]]"
 msgstr "\\\\:/\t[[smileys/ohwell.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\:-/\t[[smileys/ohwell.png]]"
 msgstr "\\\\:-/\t[[smileys/ohwell.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\:|\t[[smileys/neutral.png]]"
 msgstr "\\\\:|\t[[smileys/neutral.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\:-|\t[[smileys/neutral.png]]"
 msgstr "\\\\:-|\t[[smileys/neutral.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\>:>\t[[smileys/devil.png]]"
 msgstr "\\\\>:>\t[[smileys/devil.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\X-(\t[[smileys/angry.png]]"
 msgstr "\\\\X-(\t[[smileys/angry.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\<:(\t[[smileys/frown.png]]"
 msgstr "\\\\<:(\t[[smileys/frown.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\:(\t[[smileys/sad.png]]"
 msgstr "\\\\:(\t[[smileys/sad.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\:-(\t[[smileys/sad.png]]"
 msgstr "\\\\:-(\t[[smileys/sad.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\:-?\t[[smileys/tongue.png]]"
 msgstr "\\\\:-?\t[[smileys/tongue.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\:-P\t[[smileys/tongue.png]]"
 msgstr "\\\\:-P\t[[smileys/tongue.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\:o\t[[smileys/redface.png]]"
 msgstr "\\\\:o\t[[smileys/redface.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\|)\t[[smileys/tired.png]]"
 msgstr "\\\\|)\t[[smileys/tired.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\|-)\t[[smileys/tired.png]]"
 msgstr "\\\\|-)\t[[smileys/tired.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\{OK}\t[[smileys/thumbs-up.png]]"
 msgstr "\\\\{OK}\t[[smileys/thumbs-up.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\{X}\t[[smileys/icon-error.png]]"
 msgstr "\\\\{X}\t[[smileys/icon-error.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\{i}\t[[smileys/icon-info.png]]"
 msgstr "\\\\{i}\t[[smileys/icon-info.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\(./)\t[[smileys/checkmark.png]]"
 msgstr "\\\\(./)\t[[smileys/checkmark.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\(!)\t[[smileys/idea.png]]"
 msgstr "\\\\(!)\t[[smileys/idea.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\[!]\t[[smileys/attention.png]]"
 msgstr "\\\\[!]\t[[smileys/attention.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\/!\\\t[[smileys/alert.png]]"
 msgstr "\\\\/!\\\t[[smileys/alert.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\(?)\t[[smileys/question.png]]"
 msgstr "\\\\(?)\t[[smileys/question.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\{x}\t[[smileys/star_on.png]]"
 msgstr "\\\\{x}\t[[smileys/star_on.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\{*}\t[[smileys/star_on.png]]"
 msgstr "\\\\{*}\t[[smileys/star_on.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\{o}\t[[smileys/star_off.png]]"
 msgstr "\\\\{o}\t[[smileys/star_off.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\{1}\t[[smileys/prio1.png]]"
 msgstr "\\\\{1}\t[[smileys/prio1.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\{2}\t[[smileys/prio2.png]]"
 msgstr "\\\\{2}\t[[smileys/prio2.png]]"
 
-# type: Bullet: '* '
+#. type: Bullet: '* '
 #: smileys.mdwn:44
 msgid "\\\\{3}\t[[smileys/prio3.png]]"
 msgstr "\\\\{3}\t[[smileys/prio3.png]]"
 
-# type: Plain text
+#. type: Plain text
 #: smileys.mdwn:46
 msgid "For example: {x} B) {x}"
 msgstr "Eksempel: {x} B) {x}"
 
-# type: Plain text
+#. type: Plain text
 #: smileys.mdwn:47
 #, no-wrap
 msgid "----\n"
 msgstr "----\n"
 
-# type: Plain text
+#. type: Plain text
 #: smileys.mdwn:53
 msgid ""
 "To change the supported smileys, just edit the lists on this page.  Note "
@@ -246,12 +246,12 @@ msgid ""
 "is turned into the smiley, escaped so that users can see what produces it, "
 "followed by a [[ikiwiki/WikiLink]] to the image to display."
 msgstr ""
-"Redigér listen på denne side for at ændre understøttede smileys.  "
-"Bemærk at formatet er vigtigt: hvert listeemne skal begynde med teksten der "
-"skal omdannes til en smiley, omskrevet så brugere kan se hvordan det dannes, "
+"Redigér listen på denne side for at ændre understøttede smileys.  Bemærk at "
+"formatet er vigtigt: hvert listeemne skal begynde med teksten der skal "
+"omdannes til en smiley, omskrevet så brugere kan se hvordan det dannes, "
 "efterfulgt af en [[ikiwiki/WikiLink]] til billedet der skal vises."
 
-# 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 "