Merge pull request #129 from TomLottermann/master

German translation

.gitignore

@@ -14,9 +14,6 @@ pip-log.txt
 .coverage
 .tox
 
-#Translations
-*.mo
-
 #Eclipse
 .project
 .pydevproject

MANIFEST

@@ -2,5 +2,5 @@ include COPYING
 include README.md
 include requirements.txt
 include model_chart_wiki.pdf
-recursive-include wiki *.html *.txt *.png *.js *.css *.gif *.less
+recursive-include wiki *.html *.txt *.png *.js *.css *.gif *.less *.mo *.po
 recursive-include django_notify *.html *.txt *.png *.js *.css *.gif

README.md

@@ -200,4 +200,4 @@ Support
 
 This project is already alive and will remain alive, because it's free software and as long as it's essential, common interest will keep it alive... we hope :) You're more than welcome to help build benjaoming's economical independency which in turn will be used to create free software.
 
-[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=benjaoming&url=https://github.com/benjaoming/django-wiki/&title=django-wiki&language=&tags=github&category=software) 
+[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=benjaoming&url=https://github.com/benjaoming/django-wiki/&title=django-wiki&language=&tags=github&category=software) 
\ No newline at end of file

wiki/models/pluginbase.py

@@ -171,7 +171,7 @@ class RevisionPlugin(ArticlePlugin):
     current_revision = models.OneToOneField('RevisionPluginRevision', 
                                             verbose_name=_(u'current revision'),
                                             blank=True, null=True, related_name='plugin_set',
-                                            help_text=_(u'The revision being displayed for this plugin.'
+                                            help_text=_(u'The revision being displayed for this plugin. '
                                                          'If you need to do a roll-back, simply change the value of this field.'),
                                             )
     

wiki/plugins/attachments/templates/wiki/plugins/attachments/replace.html

@@ -13,7 +13,10 @@
   Replacing an attachment means adding a new file that will be used in its place. All references to the file will be replaced by the one you upload and the file will be downloaded as <strong>{{ filename }}</strong>. Please note that this attachment is in use on other articles, you may distort contents. However, do not hestitate to take advantage of this and make replacements for the listed articles where necessary. This way of working is more efficient....
   {% endblocktrans %}
 </p>
-<h3>{% trans "Articles using" %} {{ attachment.current_revision.get_filename }}</h3>
+<h3>
+  {% blocktrans with attachment.current_revision.get_filename as filename %}
+  Articles using {{ filename }}
+  {% endblocktrans %}</h3>
 <ul>
   {% for a in attachment.articles.all %}<li>{{ a.current_revision.title }}</li>{% endfor %}
 </ul>

wiki/plugins/notifications/util.py

@@ -7,7 +7,7 @@ def get_title(article):
 def truncate_title(title):
     """Truncate a title (of an article, file, image etc) to be displayed in notifications messages."""
     if not title:
-        return _(u"(None)")
+        return _(u"(none)")
     if len(title) > 25:
         return "%s..." % title[:22]
     return title

wiki/templates/wiki/includes/anonymous_blocked.html

@@ -8,6 +8,6 @@
   You need to <a href="{{ login_url }}">log in</a> or <a href="{{ signup_url }}">sign up</a> to use this function.
   {% endblocktrans %}
 {% else %}
-  {% trans "You need to log in og sign up to use this function." %}
+  {% trans "You need to log in or sign up to use this function." %}
 {% endif %}
 </em>

wiki/views/article.py

@@ -672,7 +672,7 @@ def merge(request, article, revision_id, urlpath=None, template_file="wiki/previ
         new_revision.locked = False
         new_revision.title=article.current_revision.title
         new_revision.content=content
-        new_revision.automatic_log = (_(u'Merge between Revision #%(r1)d and Revision #%(r2)d') % 
+        new_revision.automatic_log = (_(u'Merge between revision #%(r1)d and revision #%(r2)d') % 
                                       {'r1': revision.revision_number, 
                                        'r2': old_revision.revision_number})
         article.add_revision(new_revision, save=True)
@@ -680,7 +680,7 @@ def merge(request, article, revision_id, urlpath=None, template_file="wiki/previ
         old_revision.simpleplugin_set.all().update(article_revision=new_revision)
         revision.simpleplugin_set.all().update(article_revision=new_revision)
         
-        messages.success(request, _(u'A new revision was created: Merge between Revision #%(r1)d and Revision #%(r2)d') % 
+        messages.success(request, _(u'A new revision was created: Merge between revision #%(r1)d and revision #%(r2)d') % 
                          {'r1': revision.revision_number,
                           'r2': old_revision.revision_number})
         if urlpath: