diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-07-19 17:21:52 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-19 17:21:52 +0200 |
| commit | 37611b2eb4a1fb7857826b2d567a80c6d86d96f8 (patch) | |
| tree | aaa7b9fc33a47a0f3fea7d6c704dbfb45e7a4c8d /po/smiley.pot | |
| parent | 5aee58fc98f6456e7cbbe08f1e222b9ab225c652 (diff) | |
| parent | 077f4b7319c36f2c8bc243b462a992f10e896573 (diff) | |
Merge branch 'master' into allinone-da
Conflicts (manually resolved: merge old and new parts):
.gitmodules
Diffstat (limited to 'po/smiley.pot')
| -rw-r--r-- | po/smiley.pot | 10 |
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 " |