summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2012-10-18 07:57:23 +0200
committerJonas Smedegaard <dr@jones.dk>2012-10-18 07:57:23 +0200
commit38556272cd0db2c0ff0f2b51b6c8c2614580f96a (patch)
tree855299fd0f823dbcc3de312a15d20ced91194489
parent985f0e392f748387cdcfa62a3d0c3aef48292177 (diff)
parent640e752aae89428616e32e54bb7f68be5133d9a0 (diff)
Merge branch 'master' of coreander.jones.dk:/srv/git/source.jones.dk/jones/content
Conflicts (resolved manually): blends/config.da.po blogl.da.po
-rw-r--r--blends/config.da.po2
-rw-r--r--blogl.da.po2
2 files changed, 2 insertions, 2 deletions
diff --git a/blends/config.da.po b/blends/config.da.po
index 5d89230..319e9f4 100644
--- a/blends/config.da.po
+++ b/blends/config.da.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-10-12 11:14+0300\n"
+"POT-Creation-Date: 2012-10-03 21:31+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"
diff --git a/blogl.da.po b/blogl.da.po
index 10fab59..1fe5004 100644
--- a/blogl.da.po
+++ b/blogl.da.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-10-12 11:14+0300\n"
+"POT-Creation-Date: 2012-10-03 21:31+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"