diff --git a/manager/admin.py b/manager/admin.py
index a1c89534b..647dc24f2 100644
--- a/manager/admin.py
+++ b/manager/admin.py
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU Affero General Public License
 
 from manager.models import Exercise, ExerciseComment, ExerciseCategory, Day, TrainingSchedule, \
-                           Set, IndividualSettings, Settings
+                           Set, IndividualSetting, Setting
 
 from django.contrib import admin
 
@@ -34,6 +34,6 @@ admin.site.register(Day)
 
 admin.site.register(Exercise, ExerciseAdmin)
 admin.site.register(ExerciseCategory)
-admin.site.register(IndividualSettings)
-admin.site.register(Settings)
+admin.site.register(IndividualSetting)
+admin.site.register(Setting)
 
diff --git a/manager/locale/de/LC_MESSAGES/django.po b/manager/locale/de/LC_MESSAGES/django.po
new file mode 100644
index 000000000..579ea9de2
--- /dev/null
+++ b/manager/locale/de/LC_MESSAGES/django.po
@@ -0,0 +1,47 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-04 21:05+0200\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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: models.py:24
+msgid "Creation date"
+msgstr "Datum Erstellung"
+
+#: models.py:25 models.py:88 models.py:118 models.py:135
+msgid "Comment"
+msgstr "Kommentar"
+
+#: models.py:46
+msgid "Description"
+msgstr "Beschreibung"
+
+#: models.py:47
+msgid "Day"
+msgstr "Tag"
+
+#: models.py:59 models.py:75
+msgid "Name"
+msgstr "Name"
+
+#: models.py:62
+msgid "Exercise Categories"
+msgstr "Kategorie Übung"
+
+#: models.py:103
+msgid "Order"
+msgstr "Reihenfolge"
diff --git a/manager/models.py b/manager/models.py
index 4f4270bf1..6d753196e 100644
--- a/manager/models.py
+++ b/manager/models.py
@@ -14,13 +14,16 @@
 # along with Workout Manager.  If not, see <http://www.gnu.org/licenses/>.
 
 from django.db import models
+from django.utils.translation import ugettext as _
+
 import calendar
 
 class TrainingSchedule(models.Model):
     """Model for a training schedule
     """
-    creation_date = models.DateField('creation date', auto_now_add=True)
-    comment = models.CharField(max_length=100, blank=True)
+    creation_date = models.DateField(_('Creation date'), auto_now_add=True)
+    comment = models.CharField(_('Comment'), max_length=100, blank=True)
+
     
     def __unicode__(self):
         """Return a more human-readable representation
@@ -40,8 +43,8 @@ class Day(models.Model):
     CHOICES = DAYS_OF_WEEK_CHOICES
 
     training = models.ForeignKey(TrainingSchedule)
-    description = models.CharField(max_length=100)
-    day = models.IntegerField(max_length=1, choices=CHOICES)
+    description = models.CharField(_('Description'), max_length=100)
+    day = models.IntegerField(_('Day'), max_length=1, choices=CHOICES)
     
     def __unicode__(self):
         """Return a more human-readable representation
@@ -53,7 +56,10 @@ class Day(models.Model):
 class ExerciseCategory(models.Model):
     """Model for an exercise category
     """
-    name = models.CharField(max_length=100)
+    name = models.CharField(_('Name'), max_length=100)
+    
+    class Meta:
+        verbose_name_plural = _("Exercise Categories")
     
     def __unicode__(self):
         """Return a more human-readable representation
@@ -66,8 +72,7 @@ class Exercise(models.Model):
     """Model for an exercise
     """
     category = models.ForeignKey(ExerciseCategory)
-    
-    name = models.CharField(max_length=200)
+    name = models.CharField(_('Name'), max_length=200)
     
     def __unicode__(self):
         """Return a more human-readable representation
@@ -80,7 +85,7 @@ class ExerciseComment(models.Model):
     """Model for an exercise comment
     """
     exercise = models.ForeignKey(Exercise)
-    comment = models.CharField(max_length=200, blank=True)
+    comment = models.CharField(_('Comment'), max_length=200, blank=True)
     
     def __unicode__(self):
         """Return a more human-readable representation
@@ -94,8 +99,8 @@ class Set(models.Model):
     """
 
     excersise_day = models.ForeignKey(Day)
-    exercises = models.ManyToManyField(Exercise) #, through=Settings)
-    order = models.IntegerField(max_length=1, blank=True)
+    exercises = models.ManyToManyField(Exercise)
+    order = models.IntegerField(_('Order'), max_length=1, blank=True)
     
     def __unicode__(self):
         """Return a more human-readable representation
@@ -104,14 +109,13 @@ class Set(models.Model):
 
 
 
-class IndividualSettings(models.Model):
-    """Settings for an exercise (weight, reps, etc.)
+class IndividualSetting(models.Model):
+    """Setting for an exercise on a set (weight, reps, etc.)
     """
     
     weight = models.IntegerField()
     reps = models.IntegerField()
-    comment = models.CharField(max_length=100, blank=True)
-    
+    comment = models.CharField(_('Comment'), max_length=100, blank=True)
     
     def __unicode__(self):
         """Return a more human-readable representation
@@ -120,15 +124,15 @@ class IndividualSettings(models.Model):
 
 
 
-class Settings(models.Model):
+class Setting(models.Model):
     """Settings for an exercise (weight, reps, etc.)
     """
     
     sets = models.ForeignKey(Set)
     exercises = models.ForeignKey(Exercise)
-    individual_exercises = models.ManyToManyField(IndividualSettings)
+    individual_exercises = models.ManyToManyField(IndividualSetting)
     
-    comment = models.CharField(max_length=100, blank=True)
+    comment = models.CharField(_('Comment'), max_length=100, blank=True)
     
     
     def __unicode__(self):