From: Joey Hess <joey@kitenet.net>
Date: Tue, 26 Jul 2011 15:30:17 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20110905~110
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/f8421938fbf0806eb95dafa58fc0ba97a9216301?hp=25dc43276702b7edeec27493dce976fdab5869ec

Merge branch 'master' of ssh://git.ikiwiki.info
---

diff --git a/debian/changelog b/debian/changelog
index 40d18368d..0cb094a8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ ikiwiki (3.20110716) UNRELEASED; urgency=low
   * mercurial: Make both rcs_getctime and rcs_getmtime fast. (Daniel Andersson)
   * mercurial: Implement rcs_diff. (Daniel Andersson)
   * po: Add `LANG_CODE` and `LANG_NAME` template variables. (intrigeri)
+  * Fix typo in Danish translation of shortcuts page that caused expoentional
+    regexp blowup.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 19 Jul 2011 11:22:52 -0400
 
diff --git a/po/underlays/basewiki/shortcuts.da.po b/po/underlays/basewiki/shortcuts.da.po
index 3e4d1ad30..798b78f54 100644
--- a/po/underlays/basewiki/shortcuts.da.po
+++ b/po/underlays/basewiki/shortcuts.da.po
@@ -88,6 +88,7 @@ msgid ""
 "wiki/%s\"]]"
 msgstr ""
 "[[!shortcut name=wiktionary url=\"https://secure.wikimedia.org/wiktionary/en/"
+"wiki/%s\"]]"
 
 #. type: Bullet: '* '
 msgid ""