Merge pull request #203 from TomLottermann/master

Updated translation. Fixed some minor issues.

wiki/plugins/macros/mdx/macro.py

@@ -86,7 +86,7 @@ class MacroPreprocessor(markdown.preprocessors.Preprocessor):
 
     def wikilink(self):
         return ""
-    toc.meta = dict(
+    wikilink.meta = dict(
         short_description = _(u'WikiLinks'),
         help_text = _(u'Insert a link to another wiki page with a short notation.'),
         example_code = _(u'[[WikiLink]]'),

wiki/templates/wiki/root_missing.html

@@ -8,7 +8,7 @@
     {% trans "You have django-wiki installed... but there are no articles. So it's time to create the first one, the root article." %}
   </p>
   <p class="lead">
-    {% trans "In can be created and/or edited only by administrators, but you can define permissions after." %}
+    {% trans "It can be created and/or edited only by administrators, but you can define permissions after." %}
   </p>
 
 {% endblock %}