diff --git a/po/de.po b/po/de.po
index b4e5964..1beae02 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1091,7 +1091,6 @@ msgid "Edit Groups"
 msgstr "Gruppen bearbeiten"
 
 #: ../data/glade/esession_info_window.glade.h:1
-#, fuzzy
 msgid "(<b>ESession</b> info)"
 msgstr "(<b>ESession</b>-Information)"
 
@@ -2254,7 +2253,7 @@ msgstr "<b>Zweiter Vorname:</b>"
 #: ../data/glade/profile_window.glade.h:18
 #: ../data/glade/vcard_information_window.glade.h:21
 msgid "<b>Name:</b>"
-msgstr "<b>Nachname:</b>"
+msgstr "<b>Name:</b>"
 
 #: ../data/glade/profile_window.glade.h:19
 #: ../data/glade/vcard_information_window.glade.h:22
@@ -2480,7 +2479,6 @@ msgid "Show _roster"
 msgstr "_Kontaktliste anzeigen"
 
 #: ../data/glade/roster_window.glade.h:12
-#, fuzzy
 msgid "_Accounts"
 msgstr "Konten"
 
@@ -3008,18 +3006,20 @@ msgid "Unknown Source"
 msgstr "Unbekannte Quelle"
 
 #: ../src/chat_control.py:1301 ../src/tooltips.py:641
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr "<b>\"%(title)s\"</b> von <i>%(artist)s</i>\n"
+"von <i>%(source)s</i>"
 
 #: ../src/chat_control.py:1306
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "%(title)s by %(artist)s\n"
 "from %(source)s"
 msgstr "%(title)s von %(artist)s\n"
+"von %(source)s"
 
 #: ../src/chat_control.py:1430
 #, python-format
@@ -3058,13 +3058,11 @@ msgstr ""
 
 #. About encrypted chat session
 #: ../src/chat_control.py:1563
-#, fuzzy
 msgid "and authenticated"
 msgstr "und authentifiziert"
 
 #. About encrypted chat session
 #: ../src/chat_control.py:1567
-#, fuzzy
 msgid "and NOT authenticated"
 msgstr "und NICHT authentifiziert"
 
@@ -3146,9 +3144,8 @@ msgid "The following message was NOT encrypted"
 msgstr "[Die folgende Nachricht wurde nicht verschlüsselt]"
 
 #: ../src/chat_control.py:1836
-#, fuzzy
 msgid "The following message was encrypted"
-msgstr "[Die folgende Nachricht wurde nicht verschlüsselt]"
+msgstr "Die folgende Nachricht war verschlüsselt"
 
 #. %s is being replaced in the code with JID
 #: ../src/chat_control.py:2189
@@ -3169,7 +3166,7 @@ msgid "Database Error"
 msgstr "Datenbankfehler"
 
 #: ../src/chat_control.py:2342 ../src/gajim.py:171
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
@@ -5222,9 +5219,8 @@ msgid "Cooking"
 msgstr "Kochen"
 
 #: ../src/common/pep.py:69
-#, fuzzy
 msgid "Doing Maintenance"
-msgstr "Instanthaltung"
+msgstr "Instandhaltung"
 
 #: ../src/common/pep.py:70
 msgid "Doing the Dishes"
@@ -5355,12 +5351,10 @@ msgid "Hanging out"
 msgstr "Rumhängen"
 
 #: ../src/common/pep.py:104
-#, fuzzy
 msgid "On Vacation"
 msgstr "Im Urlaub"
 
 #: ../src/common/pep.py:105
-#, fuzzy
 msgid "Scheduled Holiday"
 msgstr "Geplanter Urlaub"
 
@@ -6089,7 +6083,6 @@ msgid ""
 msgstr ""
 
 #: ../src/conversation_textview.py:567
-#, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6690,7 +6683,7 @@ msgid "when I am "
 msgstr "wenn Ich bin "
 
 #: ../src/dialogs.py:3821
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Your chat session with %(jid)s is encrypted.\n"
 "\n"
@@ -6726,7 +6719,7 @@ msgid "Have you verified the remote contact's identity?"
 msgstr "Haben Sie die Identität des Kontaktes überprüft?"
 
 #: ../src/dialogs.py:3849
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "To prevent a man-in-the-middle attack, you should speak to %(jid)s directly "
 "(in person or on the phone) and verify that they see the same Short "
@@ -6888,7 +6881,6 @@ msgid "gajim-remote"
 msgstr "gajim-remote"
 
 #: ../src/features_window.py:60
-#, fuzzy
 msgid "A script to control Gajim via commandline."
 msgstr "Ein Skript, um Gajim über die Befehlszeile zu steuern."
 
@@ -8098,12 +8090,12 @@ msgstr ""
 "werden."
 
 #: ../src/gajim-remote.py:418
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
-"\t %(help)sBedienung: %(basename)s %(command)s %(arguments)s \n"
+"Bedienung: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
 #: ../src/gajim-remote.py:422
@@ -8973,7 +8965,7 @@ msgid "Invalid file URI:"
 msgstr "Ungültige Datei URI:"
 
 #: ../src/roster_window.py:3894
-#, fuzzy, python-format
+#, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Wollen Sie die Datei an %s senden:"