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

diff --git a/debian/changelog b/debian/changelog
index 40d18368d842fe7321f410eec379eb879df9c95f..0cb094a8d160afff8808f3dc3d98fd45775261fe 100644 (file)
--- 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 3e4d1ad3007896b8a313fa19d63e7aae284afaf9..798b78f544e5d726857e371afdd5c39ed2c92ef0 100644 (file)
--- 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 ""