diff --git a/po/de.po b/po/de.po
index 48c8c30..2383bc1 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,283 +6,354 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zathura\n"
 "Report-Msgid-Bugs-To: http://bt.pwmt.org/\n"
-"POT-Creation-Date: 2012-04-03 17:14+0200\n"
+"POT-Creation-Date: 2012-05-08 19:21+0200\n"
+"PO-Revision-Date: 2012-04-03 15:25+0000\n"
 "Last-Translator: Sebastian Ramacher <s.ramacher@gmx.at>\n"
 "Language-Team: pwmt.org <mail@pwmt.org>\n"
-"PO-Revision-Date: 2012-04-03 15:25+0000\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ../callbacks.c:156
-msgid "Failed to run xdg-open."
-msgstr "Konnte xdg-open nicht ausführen."
-
-#: ../callbacks.c:182
+#: ../callbacks.c:175
 #, c-format
 msgid "Invalid input '%s' given."
 msgstr "Ungültige Eingabe '%s' angegeben."
 
-#: ../callbacks.c:220
+#: ../callbacks.c:203
 #, c-format
 msgid "Invalid index '%s' given."
 msgstr "Ungültiger Index '%s' angegeben."
 
-#: ../commands.c:30 ../commands.c:65 ../commands.c:92 ../commands.c:134
-#: ../commands.c:234 ../commands.c:251 ../commands.c:277 ../commands.c:357
-#: ../commands.c:392 ../shortcuts.c:863
+#: ../commands.c:33 ../commands.c:68 ../commands.c:95 ../commands.c:137
+#: ../commands.c:251 ../commands.c:281 ../commands.c:307 ../commands.c:396
+#: ../commands.c:496 ../shortcuts.c:440 ../shortcuts.c:891
 msgid "No document opened."
 msgstr "Kein Dokument geöffnet."
 
-#: ../commands.c:36 ../commands.c:71 ../commands.c:98 ../commands.c:362
+#: ../commands.c:39 ../commands.c:74 ../commands.c:101 ../commands.c:401
 msgid "Invalid number of arguments given."
 msgstr "Ungültige Anzahl an Argumenten angegeben."
 
-#: ../commands.c:44
+#: ../commands.c:47
 #, c-format
 msgid "Bookmark successfuly updated: %s"
 msgstr "Lesezeichen erfolgreich aktualisiert: %s."
 
-#: ../commands.c:50
+#: ../commands.c:53
 #, c-format
 msgid "Could not create bookmark: %s"
 msgstr "Konnte Lesezeichen nicht erstellen: %s"
 
-#: ../commands.c:54
+#: ../commands.c:57
 #, c-format
 msgid "Bookmark successfuly created: %s"
 msgstr "Lesezeichen erfolgreich erstellt: %s"
 
-#: ../commands.c:77
+#: ../commands.c:80
 #, c-format
 msgid "Removed bookmark: %s"
 msgstr "Lesezeichen entfernt: %s"
 
-#: ../commands.c:79
+#: ../commands.c:82
 #, c-format
 msgid "Failed to remove bookmark: %s"
 msgstr "Konnte Lesezeichen nicht entfernen: %s"
 
-#: ../commands.c:105
+#: ../commands.c:108
 #, c-format
 msgid "No such bookmark: %s"
 msgstr "Lesezeichen existiert nicht: %s"
 
-#: ../commands.c:156 ../commands.c:178
+#: ../commands.c:159 ../commands.c:181
 msgid "No information available."
 msgstr "Keine Information verfügbar."
 
-#: ../commands.c:202
+#: ../commands.c:219
 msgid "Too many arguments."
 msgstr "Zu viele Argumente angegeben."
 
-#: ../commands.c:211
+#: ../commands.c:228
 msgid "No arguments given."
 msgstr "Keine Argumente angegeben."
 
-#: ../commands.c:257 ../commands.c:283
+#: ../commands.c:287 ../commands.c:313
 msgid "Document saved."
 msgstr "Dokument gespeichert."
 
-#: ../commands.c:259 ../commands.c:285
+#: ../commands.c:289 ../commands.c:315
 msgid "Failed to save document."
 msgstr "Konnte Dokument nicht speichern."
 
-#: ../commands.c:262 ../commands.c:288
+#: ../commands.c:292 ../commands.c:318
 msgid "Invalid number of arguments."
 msgstr "Ungültige Anzahl an Argumenten."
 
-#: ../commands.c:375
+#: ../commands.c:420
 #, c-format
 msgid "Couldn't write attachment '%s' to '%s'."
 msgstr "Konnte Anhang '%s' nicht nach '%s' schreiben."
 
-#: ../commands.c:377
+#: ../commands.c:422
 #, c-format
 msgid "Wrote attachment '%s' to '%s'."
 msgstr "Anhang '%s' nach '%s' geschrieben."
 
-#: ../commands.c:405
+#: ../commands.c:466
+#, c-format
+msgid "Wrote image '%s' to '%s'."
+msgstr "Anhang '%s' nach '%s' geschrieben."
+
+#: ../commands.c:468
+#, c-format
+msgid "Couldn't write image '%s' to '%s'."
+msgstr "Konnte Anhang '%s' nicht nach '%s' schreiben."
+
+#: ../commands.c:475
+#, c-format
+msgid "Unknown image '%s'."
+msgstr ""
+
+#: ../commands.c:479
+#, c-format
+msgid "Unknown attachment or image '%s'."
+msgstr "Unbekannter Anhanng oder Bild '%s'."
+
+#: ../commands.c:509
 msgid "Argument must be a number."
 msgstr "Das Argument ist keine Zahl."
 
+#: ../completion.c:250
+#, c-format
+msgid "Page %d"
+msgstr "Seite %d"
+
+#: ../completion.c:293
+msgid "Attachments"
+msgstr "Speichere Anhänge"
+
+#. add images
+#: ../completion.c:324
+msgid "Images"
+msgstr "Bilder"
+
 #. zathura settings
-#: ../config.c:83
+#: ../config.c:98
 msgid "Database backend"
 msgstr "Datenbank Backend"
 
-#: ../config.c:85
+#: ../config.c:100
 msgid "Zoom step"
 msgstr "Vergrößerungsstufe"
 
-#: ../config.c:87
+#: ../config.c:102
 msgid "Padding between pages"
 msgstr "Abstand zwischen den Seiten"
 
-#: ../config.c:89
+#: ../config.c:104
 msgid "Number of pages per row"
 msgstr "Anzahl der Seiten in einer Reihe"
 
-#: ../config.c:91
+#: ../config.c:106
 msgid "Scroll step"
 msgstr "Schrittgröße beim Scrollen"
 
-#: ../config.c:93
+#: ../config.c:108
 msgid "Zoom minimum"
 msgstr "Minimale Vergrößerungsstufe"
 
-#: ../config.c:95
+#: ../config.c:110
 msgid "Zoom maximum"
 msgstr "Maximale Vergrößerungsstufe"
 
-#: ../config.c:97
+#: ../config.c:112
 msgid "Life time (in seconds) of a hidden page"
 msgstr ""
 
-#: ../config.c:98
+#: ../config.c:113
 msgid "Amount of seconds between each cache purge"
-msgstr "Anzahl der Sekunden zwischen jeder Prüfung von nicht angezeigten Seiten"
+msgstr ""
+"Anzahl der Sekunden zwischen jeder Prüfung von nicht angezeigten Seiten"
 
-#: ../config.c:100
+#: ../config.c:115
 msgid "Recoloring (dark color)"
 msgstr "Neufärben (Dunkle Farbe)"
 
-#: ../config.c:102
+#: ../config.c:117
 msgid "Recoloring (light color)"
 msgstr "Neufärben (Helle Farbe)"
 
-#: ../config.c:104
+#: ../config.c:119
 msgid "Color for highlighting"
 msgstr "Farbe für eine Markierung"
 
-#: ../config.c:106
+#: ../config.c:121
 msgid "Color for highlighting (active)"
 msgstr "Farbe für die aktuelle Markierung"
 
-#: ../config.c:110
+#: ../config.c:125
 msgid "Recolor pages"
 msgstr "Färbe die Seiten ein"
 
-#: ../config.c:112
+#: ../config.c:127
 msgid "Wrap scrolling"
 msgstr "Scroll-Umbruch"
 
-#: ../config.c:114
+#: ../config.c:129
+msgid "Advance number of pages per row"
+msgstr "Gehe Anzahl der Seiten in einer Reihe weiter"
+
+#: ../config.c:131
 msgid "Transparency for highlighting"
 msgstr "Transparenz einer Markierung"
 
-#: ../config.c:116
+#: ../config.c:133
 msgid "Render 'Loading ...'"
 msgstr "Zeige 'Lädt...'-Text beim Zeichnen einer Seite"
 
-#: ../config.c:117
+#: ../config.c:134
 msgid "Adjust to when opening file"
 msgstr "Seite einpassen"
 
-#: ../config.c:119
+#: ../config.c:136
 msgid "Show hidden files and directories"
 msgstr "Zeige versteckte Dateien und Ordner an"
 
-#: ../config.c:121
+#: ../config.c:138
 msgid "Show directories"
 msgstr "Zeige Ordner an"
 
-#: ../config.c:123
+#: ../config.c:140
 msgid "Always open on first page"
 msgstr "Öffne Dokument immer auf der ersten Seite"
 
+#: ../config.c:142
+msgid "Highlight search results"
+msgstr ""
+
+#: ../config.c:144
+msgid "Clear search results on abort"
+msgstr ""
+
 #. define default inputbar commands
-#: ../config.c:243
+#: ../config.c:266
 msgid "Add a bookmark"
 msgstr "Füge Lesezeichen hinzu"
 
-#: ../config.c:244
+#: ../config.c:267
 msgid "Delete a bookmark"
 msgstr "Lösche ein Lesezeichen"
 
-#: ../config.c:245
+#: ../config.c:268
 msgid "List all bookmarks"
 msgstr "Liste all Lesezeichen auf"
 
-#: ../config.c:246
+#: ../config.c:269
 msgid "Close current file"
 msgstr "Schließe das aktuelle Dokument"
 
-#: ../config.c:247
+#: ../config.c:270
 msgid "Show file information"
 msgstr "Zeige Dokumentinformationen an"
 
-#: ../config.c:248
+#: ../config.c:271
 msgid "Show help"
 msgstr "Zeige Hilfe an"
 
-#: ../config.c:249
+#: ../config.c:272
 msgid "Open document"
 msgstr "Öffne Dokument"
 
-#: ../config.c:250
+#: ../config.c:273
 msgid "Close zathura"
 msgstr "Beende zathura"
 
-#: ../config.c:251
+#: ../config.c:274
 msgid "Print document"
 msgstr "Drucke Dokument"
 
-#: ../config.c:252
+#: ../config.c:275
 msgid "Save document"
 msgstr "Speichere Dokument"
 
-#: ../config.c:253
+#: ../config.c:276
 msgid "Save document (and force overwriting)"
 msgstr "Speichere Dokument (und überschreibe bestehende)"
 
-#: ../config.c:254
+#: ../config.c:277
 msgid "Save attachments"
 msgstr "Speichere Anhänge"
 
-#: ../config.c:255
+#: ../config.c:278
 msgid "Set page offset"
 msgstr "Setze den Seitenabstand"
 
-#: ../page-widget.c:584
+#: ../config.c:279
+msgid "Mark current location within the document"
+msgstr ""
+
+#: ../config.c:280
+msgid "Delete the specified marks"
+msgstr ""
+
+#: ../config.c:281
+msgid "Don't highlight current search results"
+msgstr ""
+
+#: ../config.c:282
+msgid "Highlight current search results"
+msgstr ""
+
+#: ../page-widget.c:611
 #, c-format
 msgid "Copied selected text to clipboard: %s"
 msgstr "Der gewählte Text wurde in die Zwischenablage kopiert: %s"
 
-#: ../page-widget.c:680
+#: ../page-widget.c:708
 msgid "Copy image"
 msgstr "Bild kopieren"
 
-#: ../shortcuts.c:766
+#: ../page-widget.c:709
+msgid "Save image as"
+msgstr "Bild speichern als"
+
+#: ../shortcuts.c:797
 msgid "This document does not contain any index"
 msgstr "Dieses Dokument beinhaltet kein Inhaltsverzeichnis."
 
-#: ../zathura.c:59
+#: ../utils.c:346
+msgid "Failed to run xdg-open."
+msgstr "Konnte xdg-open nicht ausführen."
+
+#: ../zathura.c:73
 msgid "Reparents to window specified by xid"
 msgstr "Reparentiert zathura an das Fenster mit der xid"
 
-#: ../zathura.c:60
+#: ../zathura.c:74
 msgid "Path to the config directory"
 msgstr "Pfad zum Konfigurationsverzeichnis"
 
-#: ../zathura.c:61
+#: ../zathura.c:75
 msgid "Path to the data directory"
 msgstr "Pfad zum Datenverzeichnis"
 
-#: ../zathura.c:62
+#: ../zathura.c:76
 msgid "Path to the directories containing plugins"
 msgstr "Pfad zum Pluginverzeichnis"
 
-#: ../zathura.c:63
+#: ../zathura.c:77
 msgid "Fork into the background"
 msgstr "Forkt den Prozess in den Hintergrund"
 
-#: ../zathura.c:64
+#: ../zathura.c:78
+msgid "Document password"
+msgstr "Dokument Passwort"
+
+#: ../zathura.c:79
 msgid "Log level (debug, info, warning, error)"
 msgstr "Log-Stufe (debug, info, warning, error)"
 
-#: ../zathura.c:234 ../zathura.c:715
+#: ../zathura.c:251 ../zathura.c:799
 msgid "[No name]"
 msgstr "[Kein Name]"