diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-07-19 17:20:27 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-19 17:20:27 +0200 |
| commit | 5b9702f32e0d8df28bd7019443a2aea56132049f (patch) | |
| tree | 6475f22f77f882e37f3c5d009ec00f0629b68868 /po/smiley.da.po | |
| parent | 86b629053ff7f0dbf984aa2236b63dba0616957d (diff) | |
| parent | 077f4b7319c36f2c8bc243b462a992f10e896573 (diff) | |
Merge branch 'master' into nonedit
Conflicts (manually resolved: merge old and new parts):
.gitmodules
Diffstat (limited to 'po/smiley.da.po')
| -rw-r--r-- | po/smiley.da.po | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/po/smiley.da.po b/po/smiley.da.po index 59cadea..a6886a4 100644 --- a/po/smiley.da.po +++ b/po/smiley.da.po @@ -5,12 +5,13 @@ # msgid "" msgstr "" -"Project-Id-Version: ikiwiki smiley 2.56\n" +"Project-Id-Version: ikiwiki smiley 3.20100704\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-25 23:02+0300\n" -"PO-Revision-Date: 2008-08-04 00:20+0300\n" +"POT-Creation-Date: 2010-07-16 13:43+0300\n" +"PO-Revision-Date: 2010-07-17 02:24+0300\n" "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n" "Language-Team: None\n" +"Language: Danish\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -233,12 +234,6 @@ msgid "For example: {x} B) {x}" msgstr "Eksempel: {x} B) {x}" #. type: Plain text -#: smileys.mdwn:47 -#, no-wrap -msgid "----\n" -msgstr "----\n" - -#. type: Plain text #: smileys.mdwn:53 msgid "" "To change the supported smileys, just edit the lists on this page. Note " |