summaryrefslogtreecommitdiff
path: root/po/smiley.pot
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-07-19 17:23:13 +0200
committerJonas Smedegaard <dr@jones.dk>2010-07-19 17:23:13 +0200
commit866905908c179b30553aa448dc04f2092bdd951c (patch)
tree935c01d73238245c8db40cc1f0114f2d00185918 /po/smiley.pot
parentc4a53e9b62f5f912038b8148e010d37b44a0a3ad (diff)
parent0195f9d307c7c184f3e056a816124d24ae272531 (diff)
Merge branch '_multilang' into allinone-multilang
Conflicts (manually resolved: merge old and new parts): .gitmodules
Diffstat (limited to 'po/smiley.pot')
-rw-r--r--po/smiley.pot10
1 files changed, 2 insertions, 8 deletions
diff --git a/po/smiley.pot b/po/smiley.pot
index 622416d..dd5fa22 100644
--- a/po/smiley.pot
+++ b/po/smiley.pot
@@ -6,8 +6,8 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: ikiwiki smiley 2.62.1\n"
-"POT-Creation-Date: 2009-05-25 23:07+0300\n"
+"Project-Id-Version: ikiwiki smiley 3.20100704\n"
+"POT-Creation-Date: 2010-07-16 13:42+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"
@@ -228,12 +228,6 @@ msgid "For example: {x} B) {x}"
msgstr ""
#. type: Plain text
-#: smileys.mdwn:47
-#, no-wrap
-msgid "----\n"
-msgstr ""
-
-#. type: Plain text
#: smileys.mdwn:53
msgid ""
"To change the supported smileys, just edit the lists on this page. Note "