diff --git a/po/es.po b/po/es.po
index 3d2ac79..3570d88 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,283 +6,355 @@ 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: Moritz Lipp <mlq@pwmt.org>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/zathura/language/es/)\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
+"zathura/language/es/)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ../callbacks.c:156
-msgid "Failed to run xdg-open."
-msgstr "Error al tratar de ejecutar xdg-open"
-
-#: ../callbacks.c:182
+#: ../callbacks.c:175
 #, c-format
 msgid "Invalid input '%s' given."
 msgstr "Entrada inválida: '%s'."
 
-#: ../callbacks.c:220
+#: ../callbacks.c:203
 #, c-format
 msgid "Invalid index '%s' given."
 msgstr "Índice invalido: '%s'."
 
-#: ../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 "Ningún documento abierto."
 
-#: ../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 "Número de argumentos inválido."
 
-#: ../commands.c:44
+#: ../commands.c:47
 #, c-format
 msgid "Bookmark successfuly updated: %s"
 msgstr "Favorito actualizado con éxitosamente: %s"
 
-#: ../commands.c:50
+#: ../commands.c:53
 #, c-format
 msgid "Could not create bookmark: %s"
 msgstr "Error al crear favorito: %s"
 
-#: ../commands.c:54
+#: ../commands.c:57
 #, c-format
 msgid "Bookmark successfuly created: %s"
 msgstr "Favorito creado con éxitosamente: %s"
 
-#: ../commands.c:77
+#: ../commands.c:80
 #, c-format
 msgid "Removed bookmark: %s"
 msgstr "Favorito eliminado: %s"
 
-#: ../commands.c:79
+#: ../commands.c:82
 #, c-format
 msgid "Failed to remove bookmark: %s"
 msgstr "Error al eliminar el favorito: %s"
 
-#: ../commands.c:105
+#: ../commands.c:108
 #, c-format
 msgid "No such bookmark: %s"
 msgstr "No existe el favorito: %s"
 
-#: ../commands.c:156 ../commands.c:178
+#: ../commands.c:159 ../commands.c:181
 msgid "No information available."
 msgstr "No hay información disponible."
 
-#: ../commands.c:202
+#: ../commands.c:219
 msgid "Too many arguments."
 msgstr "Demasiados argumentos."
 
-#: ../commands.c:211
+#: ../commands.c:228
 msgid "No arguments given."
 msgstr "Ningún argumento recibido."
 
-#: ../commands.c:257 ../commands.c:283
+#: ../commands.c:287 ../commands.c:313
 msgid "Document saved."
 msgstr "Documento guardado."
 
-#: ../commands.c:259 ../commands.c:285
+#: ../commands.c:289 ../commands.c:315
 msgid "Failed to save document."
 msgstr "Error al guardar el documento."
 
-#: ../commands.c:262 ../commands.c:288
+#: ../commands.c:292 ../commands.c:318
 msgid "Invalid number of arguments."
 msgstr "Número de argumentos inválido."
 
-#: ../commands.c:375
+#: ../commands.c:420
 #, c-format
 msgid "Couldn't write attachment '%s' to '%s'."
 msgstr "No se pudo escribir el fichero adjunto '%s' a '%s'."
 
-#: ../commands.c:377
+#: ../commands.c:422
 #, c-format
 msgid "Wrote attachment '%s' to '%s'."
 msgstr "Escrito fichero adjunto '%s' a '%s'."
 
-#: ../commands.c:405
+#: ../commands.c:466
+#, c-format
+msgid "Wrote image '%s' to '%s'."
+msgstr "Escrito fichero adjunto '%s' a '%s'."
+
+#: ../commands.c:468
+#, c-format
+msgid "Couldn't write image '%s' to '%s'."
+msgstr "No se pudo escribir el fichero adjunto '%s' a '%s'."
+
+#: ../commands.c:475
+#, c-format
+msgid "Unknown image '%s'."
+msgstr ""
+
+#: ../commands.c:479
+#, c-format
+msgid "Unknown attachment or image '%s'."
+msgstr ""
+
+#: ../commands.c:509
 msgid "Argument must be a number."
 msgstr "El argumento ha de ser un número."
 
+#: ../completion.c:250
+#, c-format
+msgid "Page %d"
+msgstr ""
+
+#: ../completion.c:293
+msgid "Attachments"
+msgstr "Guardar ficheros adjuntos"
+
+#. add images
+#: ../completion.c:324
+msgid "Images"
+msgstr ""
+
 #. zathura settings
-#: ../config.c:83
+#: ../config.c:98
 msgid "Database backend"
 msgstr "Base de datos"
 
-#: ../config.c:85
+#: ../config.c:100
 msgid "Zoom step"
 msgstr "Unidad de zoom"
 
-#: ../config.c:87
+#: ../config.c:102
 msgid "Padding between pages"
 msgstr "Separación entre páginas"
 
-#: ../config.c:89
+#: ../config.c:104
 msgid "Number of pages per row"
 msgstr "Número de páginas por fila"
 
-#: ../config.c:91
+#: ../config.c:106
 msgid "Scroll step"
 msgstr "Unidad de desplazamiento"
 
-#: ../config.c:93
+#: ../config.c:108
 msgid "Zoom minimum"
 msgstr "Zoom mínimo"
 
-#: ../config.c:95
+#: ../config.c:110
 msgid "Zoom maximum"
 msgstr "Zoom máximo"
 
-#: ../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 "Cantidad de segundos entre las comprobaciones de las páginas invisibles"
+msgstr ""
+"Cantidad de segundos entre las comprobaciones de las páginas invisibles"
 
-#: ../config.c:100
+#: ../config.c:115
 msgid "Recoloring (dark color)"
 msgstr "Recoloreado (color oscuro)"
 
-#: ../config.c:102
+#: ../config.c:117
 msgid "Recoloring (light color)"
 msgstr "Recoloreado (color claro)"
 
-#: ../config.c:104
+#: ../config.c:119
 msgid "Color for highlighting"
 msgstr "Color para destacar"
 
-#: ../config.c:106
+#: ../config.c:121
 msgid "Color for highlighting (active)"
 msgstr "Color para destacar (activo)"
 
-#: ../config.c:110
+#: ../config.c:125
 msgid "Recolor pages"
 msgstr "Recolorear páginas"
 
-#: ../config.c:112
+#: ../config.c:127
 msgid "Wrap scrolling"
 msgstr "Navegación/Scroll cíclica/o"
 
-#: ../config.c:114
+#: ../config.c:129
+msgid "Advance number of pages per row"
+msgstr ""
+
+#: ../config.c:131
 msgid "Transparency for highlighting"
 msgstr "Transparencia para el destacado"
 
-#: ../config.c:116
+#: ../config.c:133
 msgid "Render 'Loading ...'"
 msgstr "Renderizado 'Cargando ...'"
 
-#: ../config.c:117
+#: ../config.c:134
 msgid "Adjust to when opening file"
 msgstr "Ajustarse al abrir un fichero"
 
-#: ../config.c:119
+#: ../config.c:136
 msgid "Show hidden files and directories"
 msgstr "Mostrar directorios y ficheros ocultos"
 
-#: ../config.c:121
+#: ../config.c:138
 msgid "Show directories"
 msgstr "Mostrar directorios"
 
-#: ../config.c:123
+#: ../config.c:140
 msgid "Always open on first page"
 msgstr "Abrir siempre la primera página"
 
+#: ../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 "Añadir Favorito"
 
-#: ../config.c:244
+#: ../config.c:267
 msgid "Delete a bookmark"
 msgstr "Eliminar Favorito"
 
-#: ../config.c:245
+#: ../config.c:268
 msgid "List all bookmarks"
 msgstr "Listar favoritos"
 
-#: ../config.c:246
+#: ../config.c:269
 msgid "Close current file"
 msgstr "Cerrar fichero actual"
 
-#: ../config.c:247
+#: ../config.c:270
 msgid "Show file information"
 msgstr "Mostrar información del fichero"
 
-#: ../config.c:248
+#: ../config.c:271
 msgid "Show help"
 msgstr "Mostrar ayuda"
 
-#: ../config.c:249
+#: ../config.c:272
 msgid "Open document"
 msgstr "Abrir documento"
 
-#: ../config.c:250
+#: ../config.c:273
 msgid "Close zathura"
 msgstr "Salir de zathura"
 
-#: ../config.c:251
+#: ../config.c:274
 msgid "Print document"
 msgstr "Imprimir documento"
 
-#: ../config.c:252
+#: ../config.c:275
 msgid "Save document"
 msgstr "Guardar documento"
 
-#: ../config.c:253
+#: ../config.c:276
 msgid "Save document (and force overwriting)"
 msgstr "Guardar documento (y sobreescribir)"
 
-#: ../config.c:254
+#: ../config.c:277
 msgid "Save attachments"
 msgstr "Guardar ficheros adjuntos"
 
-#: ../config.c:255
+#: ../config.c:278
 msgid "Set page offset"
 msgstr "Asignar el desplazamiento de página"
 
-#: ../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 "Se ha copiado el texto seleccionado al portapapeles: %s"
 
-#: ../page-widget.c:680
+#: ../page-widget.c:708
 msgid "Copy image"
 msgstr "Copiar imagen"
 
-#: ../shortcuts.c:766
+#: ../page-widget.c:709
+msgid "Save image as"
+msgstr ""
+
+#: ../shortcuts.c:797
 msgid "This document does not contain any index"
 msgstr "Este documento no contiene ningún índice"
 
-#: ../zathura.c:59
+#: ../utils.c:346
+msgid "Failed to run xdg-open."
+msgstr "Error al tratar de ejecutar xdg-open"
+
+#: ../zathura.c:73
 msgid "Reparents to window specified by xid"
 msgstr "Reasignar a la ventana especificada por xid"
 
-#: ../zathura.c:60
+#: ../zathura.c:74
 msgid "Path to the config directory"
 msgstr "Ruta al directorio de configuración"
 
-#: ../zathura.c:61
+#: ../zathura.c:75
 msgid "Path to the data directory"
 msgstr "Ruta para el directorio de datos"
 
-#: ../zathura.c:62
+#: ../zathura.c:76
 msgid "Path to the directories containing plugins"
 msgstr "Ruta a los directorios que contienen los plugins"
 
-#: ../zathura.c:63
+#: ../zathura.c:77
 msgid "Fork into the background"
 msgstr "Fork, ejecutándose en background"
 
-#: ../zathura.c:64
+#: ../zathura.c:78
+msgid "Document password"
+msgstr ""
+
+#: ../zathura.c:79
 msgid "Log level (debug, info, warning, error)"
 msgstr "Nivel de log (debug, info, warning, error)"
 
-#: ../zathura.c:234 ../zathura.c:715
+#: ../zathura.c:251 ../zathura.c:799
 msgid "[No name]"
 msgstr "[Sin nombre]"
diff --git a/po/es_CL.po b/po/es_CL.po
index f76c36c..fc16889 100644
--- a/po/es_CL.po
+++ b/po/es_CL.po
@@ -7,283 +7,355 @@ 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:26+0000\n"
 "Last-Translator: watsh1ken <wat.sh1ken@gmail.com>\n"
-"Language-Team: Spanish (Chile) (http://www.transifex.net/projects/p/zathura/language/es_CL/)\n"
+"Language-Team: Spanish (Chile) (http://www.transifex.net/projects/p/zathura/"
+"language/es_CL/)\n"
+"Language: es_CL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es_CL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ../callbacks.c:156
-msgid "Failed to run xdg-open."
-msgstr "Error al ejecutar xdg-open."
-
-#: ../callbacks.c:182
+#: ../callbacks.c:175
 #, c-format
 msgid "Invalid input '%s' given."
 msgstr "Entrada inválida: '%s'."
 
-#: ../callbacks.c:220
+#: ../callbacks.c:203
 #, c-format
 msgid "Invalid index '%s' given."
 msgstr "Índice invalido: '%s'."
 
-#: ../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 "Ningún documento abierto."
 
-#: ../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 "Número de argumentos inválido."
 
-#: ../commands.c:44
+#: ../commands.c:47
 #, c-format
 msgid "Bookmark successfuly updated: %s"
 msgstr "Marcador actualizado exitosamente: %s"
 
-#: ../commands.c:50
+#: ../commands.c:53
 #, c-format
 msgid "Could not create bookmark: %s"
 msgstr "No se pudo crear marcador: %s"
 
-#: ../commands.c:54
+#: ../commands.c:57
 #, c-format
 msgid "Bookmark successfuly created: %s"
 msgstr "Marcador creado exitosamente: %s"
 
-#: ../commands.c:77
+#: ../commands.c:80
 #, c-format
 msgid "Removed bookmark: %s"
 msgstr "Marcador eliminado: %s"
 
-#: ../commands.c:79
+#: ../commands.c:82
 #, c-format
 msgid "Failed to remove bookmark: %s"
 msgstr "Error al eliminar marcador: %s"
 
-#: ../commands.c:105
+#: ../commands.c:108
 #, c-format
 msgid "No such bookmark: %s"
 msgstr "No existe marcador: %s"
 
-#: ../commands.c:156 ../commands.c:178
+#: ../commands.c:159 ../commands.c:181
 msgid "No information available."
 msgstr "No hay información disponible."
 
-#: ../commands.c:202
+#: ../commands.c:219
 msgid "Too many arguments."
 msgstr "Demasiados argumentos."
 
-#: ../commands.c:211
+#: ../commands.c:228
 msgid "No arguments given."
 msgstr "Ningún argumento recibido."
 
-#: ../commands.c:257 ../commands.c:283
+#: ../commands.c:287 ../commands.c:313
 msgid "Document saved."
 msgstr "Documento guardado."
 
-#: ../commands.c:259 ../commands.c:285
+#: ../commands.c:289 ../commands.c:315
 msgid "Failed to save document."
 msgstr "Error al guardar el documento."
 
-#: ../commands.c:262 ../commands.c:288
+#: ../commands.c:292 ../commands.c:318
 msgid "Invalid number of arguments."
 msgstr "Número de argumentos inválido."
 
-#: ../commands.c:375
+#: ../commands.c:420
 #, c-format
 msgid "Couldn't write attachment '%s' to '%s'."
 msgstr "No se pudo escribir el fichero adjunto '%s' a '%s'."
 
-#: ../commands.c:377
+#: ../commands.c:422
 #, c-format
 msgid "Wrote attachment '%s' to '%s'."
 msgstr "Fichero adjunto escrito '%s' a '%s'."
 
-#: ../commands.c:405
+#: ../commands.c:466
+#, c-format
+msgid "Wrote image '%s' to '%s'."
+msgstr "Fichero adjunto escrito '%s' a '%s'."
+
+#: ../commands.c:468
+#, c-format
+msgid "Couldn't write image '%s' to '%s'."
+msgstr "No se pudo escribir el fichero adjunto '%s' a '%s'."
+
+#: ../commands.c:475
+#, c-format
+msgid "Unknown image '%s'."
+msgstr ""
+
+#: ../commands.c:479
+#, c-format
+msgid "Unknown attachment or image '%s'."
+msgstr ""
+
+#: ../commands.c:509
 msgid "Argument must be a number."
 msgstr "El argumento debe ser un número."
 
+#: ../completion.c:250
+#, c-format
+msgid "Page %d"
+msgstr ""
+
+#: ../completion.c:293
+msgid "Attachments"
+msgstr "Guardar archivos adjuntos"
+
+#. add images
+#: ../completion.c:324
+msgid "Images"
+msgstr ""
+
 #. zathura settings
-#: ../config.c:83
+#: ../config.c:98
 msgid "Database backend"
 msgstr "Fin de la base de datos."
 
-#: ../config.c:85
+#: ../config.c:100
 msgid "Zoom step"
 msgstr "Unidad de zoom"
 
-#: ../config.c:87
+#: ../config.c:102
 msgid "Padding between pages"
 msgstr "Separación entre páginas"
 
-#: ../config.c:89
+#: ../config.c:104
 msgid "Number of pages per row"
 msgstr "Numero de páginas por fila"
 
-#: ../config.c:91
+#: ../config.c:106
 msgid "Scroll step"
 msgstr "Unidad de desplazamiento"
 
-#: ../config.c:93
+#: ../config.c:108
 msgid "Zoom minimum"
 msgstr "Zoom mínimo"
 
-#: ../config.c:95
+#: ../config.c:110
 msgid "Zoom maximum"
 msgstr "Zoom máximo"
 
-#: ../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 "Cantidad de segundos entre las comprobaciones de las páginas invisibles"
+msgstr ""
+"Cantidad de segundos entre las comprobaciones de las páginas invisibles"
 
-#: ../config.c:100
+#: ../config.c:115
 msgid "Recoloring (dark color)"
 msgstr "Recolorando (color oscuro)"
 
-#: ../config.c:102
+#: ../config.c:117
 msgid "Recoloring (light color)"
 msgstr "Recolorando (color claro)"
 
-#: ../config.c:104
+#: ../config.c:119
 msgid "Color for highlighting"
 msgstr "Color para destacar"
 
-#: ../config.c:106
+#: ../config.c:121
 msgid "Color for highlighting (active)"
 msgstr "Color para destacar (activo)"
 
-#: ../config.c:110
+#: ../config.c:125
 msgid "Recolor pages"
 msgstr "Recolorar páginas"
 
-#: ../config.c:112
+#: ../config.c:127
 msgid "Wrap scrolling"
 msgstr "Scroll cíclico"
 
-#: ../config.c:114
+#: ../config.c:129
+msgid "Advance number of pages per row"
+msgstr ""
+
+#: ../config.c:131
 msgid "Transparency for highlighting"
 msgstr "Transparencia para lo destacado"
 
-#: ../config.c:116
+#: ../config.c:133
 msgid "Render 'Loading ...'"
 msgstr "Renderizando 'Cargando...'"
 
-#: ../config.c:117
+#: ../config.c:134
 msgid "Adjust to when opening file"
 msgstr "Ajustar al abrirse un archivo"
 
-#: ../config.c:119
+#: ../config.c:136
 msgid "Show hidden files and directories"
 msgstr "Mostrar archivos ocultos y directorios"
 
-#: ../config.c:121
+#: ../config.c:138
 msgid "Show directories"
 msgstr "Mostrar directorios"
 
-#: ../config.c:123
+#: ../config.c:140
 msgid "Always open on first page"
 msgstr "Siempre abrir en primera página"
 
+#: ../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 "Agregar un marcador"
 
-#: ../config.c:244
+#: ../config.c:267
 msgid "Delete a bookmark"
 msgstr "Eliminar un marcador"
 
-#: ../config.c:245
+#: ../config.c:268
 msgid "List all bookmarks"
 msgstr "Listar todos los marcadores"
 
-#: ../config.c:246
+#: ../config.c:269
 msgid "Close current file"
 msgstr "Cerrar archivo actual"
 
-#: ../config.c:247
+#: ../config.c:270
 msgid "Show file information"
 msgstr "Mostrar información del archivo"
 
-#: ../config.c:248
+#: ../config.c:271
 msgid "Show help"
 msgstr "Mostrar ayuda"
 
-#: ../config.c:249
+#: ../config.c:272
 msgid "Open document"
 msgstr "Abrir documento"
 
-#: ../config.c:250
+#: ../config.c:273
 msgid "Close zathura"
 msgstr "Cerrar zathura"
 
-#: ../config.c:251
+#: ../config.c:274
 msgid "Print document"
 msgstr "Imprimir documento"
 
-#: ../config.c:252
+#: ../config.c:275
 msgid "Save document"
 msgstr "Guardar documento"
 
-#: ../config.c:253
+#: ../config.c:276
 msgid "Save document (and force overwriting)"
 msgstr "Guardar documento (y forzar sobreescritura)"
 
-#: ../config.c:254
+#: ../config.c:277
 msgid "Save attachments"
 msgstr "Guardar archivos adjuntos"
 
-#: ../config.c:255
+#: ../config.c:278
 msgid "Set page offset"
 msgstr "Asignar desplazamiento de la página"
 
-#: ../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 "Texto seleccionado copiado al portapapeles: %s"
 
-#: ../page-widget.c:680
+#: ../page-widget.c:708
 msgid "Copy image"
 msgstr "Copiar imagen"
 
-#: ../shortcuts.c:766
+#: ../page-widget.c:709
+msgid "Save image as"
+msgstr ""
+
+#: ../shortcuts.c:797
 msgid "This document does not contain any index"
 msgstr "Este document no contiene índice"
 
-#: ../zathura.c:59
+#: ../utils.c:346
+msgid "Failed to run xdg-open."
+msgstr "Error al ejecutar xdg-open."
+
+#: ../zathura.c:73
 msgid "Reparents to window specified by xid"
 msgstr "Reasignar a la ventana especificada por xid"
 
-#: ../zathura.c:60
+#: ../zathura.c:74
 msgid "Path to the config directory"
 msgstr "Ruta al directorio de configuración"
 
-#: ../zathura.c:61
+#: ../zathura.c:75
 msgid "Path to the data directory"
 msgstr "Ruta al directorio de datos"
 
-#: ../zathura.c:62
+#: ../zathura.c:76
 msgid "Path to the directories containing plugins"
 msgstr "Ruta al directorio que contiene plugins"
 
-#: ../zathura.c:63
+#: ../zathura.c:77
 msgid "Fork into the background"
 msgstr "Ejecución en background"
 
-#: ../zathura.c:64
+#: ../zathura.c:78
+msgid "Document password"
+msgstr ""
+
+#: ../zathura.c:79
 msgid "Log level (debug, info, warning, error)"
 msgstr "Nivel de log (debug, info, warning, error)"
 
-#: ../zathura.c:234 ../zathura.c:715
+#: ../zathura.c:251 ../zathura.c:799
 msgid "[No name]"
 msgstr "[Sin nombre]"
diff --git a/po/et.po b/po/et.po
index dc0fd65..3e66bb7 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,283 +7,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"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2012-05-08 19:21+0200\n"
 "PO-Revision-Date: 2012-04-03 15:25+0000\n"
-"Language-Team: Estonian (http://www.transifex.net/projects/p/zathura/language/et/)\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"Language-Team: Estonian (http://www.transifex.net/projects/p/zathura/"
+"language/et/)\n"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ../callbacks.c:156
-msgid "Failed to run xdg-open."
-msgstr ""
-
-#: ../callbacks.c:182
+#: ../callbacks.c:175
 #, c-format
 msgid "Invalid input '%s' given."
 msgstr ""
 
-#: ../callbacks.c:220
+#: ../callbacks.c:203
 #, c-format
 msgid "Invalid index '%s' given."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../commands.c:44
+#: ../commands.c:47
 #, c-format
 msgid "Bookmark successfuly updated: %s"
 msgstr ""
 
-#: ../commands.c:50
+#: ../commands.c:53
 #, c-format
 msgid "Could not create bookmark: %s"
 msgstr ""
 
-#: ../commands.c:54
+#: ../commands.c:57
 #, c-format
 msgid "Bookmark successfuly created: %s"
 msgstr ""
 
-#: ../commands.c:77
+#: ../commands.c:80
 #, c-format
 msgid "Removed bookmark: %s"
 msgstr ""
 
-#: ../commands.c:79
+#: ../commands.c:82
 #, c-format
 msgid "Failed to remove bookmark: %s"
 msgstr ""
 
-#: ../commands.c:105
+#: ../commands.c:108
 #, c-format
 msgid "No such bookmark: %s"
 msgstr ""
 
-#: ../commands.c:156 ../commands.c:178
+#: ../commands.c:159 ../commands.c:181
 msgid "No information available."
 msgstr ""
 
-#: ../commands.c:202
+#: ../commands.c:219
 msgid "Too many arguments."
 msgstr ""
 
-#: ../commands.c:211
+#: ../commands.c:228
 msgid "No arguments given."
 msgstr ""
 
-#: ../commands.c:257 ../commands.c:283
+#: ../commands.c:287 ../commands.c:313
 msgid "Document saved."
 msgstr ""
 
-#: ../commands.c:259 ../commands.c:285
+#: ../commands.c:289 ../commands.c:315
 msgid "Failed to save document."
 msgstr ""
 
-#: ../commands.c:262 ../commands.c:288
+#: ../commands.c:292 ../commands.c:318
 msgid "Invalid number of arguments."
 msgstr ""
 
-#: ../commands.c:375
+#: ../commands.c:420
 #, c-format
 msgid "Couldn't write attachment '%s' to '%s'."
 msgstr ""
 
-#: ../commands.c:377
+#: ../commands.c:422
 #, c-format
 msgid "Wrote attachment '%s' to '%s'."
 msgstr ""
 
-#: ../commands.c:405
+#: ../commands.c:466
+#, c-format
+msgid "Wrote image '%s' to '%s'."
+msgstr ""
+
+#: ../commands.c:468
+#, c-format
+msgid "Couldn't write image '%s' to '%s'."
+msgstr ""
+
+#: ../commands.c:475
+#, c-format
+msgid "Unknown image '%s'."
+msgstr ""
+
+#: ../commands.c:479
+#, c-format
+msgid "Unknown attachment or image '%s'."
+msgstr ""
+
+#: ../commands.c:509
 msgid "Argument must be a number."
 msgstr ""
 
+#: ../completion.c:250
+#, c-format
+msgid "Page %d"
+msgstr ""
+
+#: ../completion.c:293
+msgid "Attachments"
+msgstr "Salvesta manused"
+
+#. add images
+#: ../completion.c:324
+msgid "Images"
+msgstr ""
+
 #. zathura settings
-#: ../config.c:83
+#: ../config.c:98
 msgid "Database backend"
 msgstr ""
 
-#: ../config.c:85
+#: ../config.c:100
 msgid "Zoom step"
 msgstr ""
 
-#: ../config.c:87
+#: ../config.c:102
 msgid "Padding between pages"
 msgstr ""
 
-#: ../config.c:89
+#: ../config.c:104
 msgid "Number of pages per row"
 msgstr ""
 
-#: ../config.c:91
+#: ../config.c:106
 msgid "Scroll step"
 msgstr ""
 
-#: ../config.c:93
+#: ../config.c:108
 msgid "Zoom minimum"
 msgstr ""
 
-#: ../config.c:95
+#: ../config.c:110
 msgid "Zoom maximum"
 msgstr ""
 
-#: ../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 ""
 
-#: ../config.c:100
+#: ../config.c:115
 msgid "Recoloring (dark color)"
 msgstr ""
 
-#: ../config.c:102
+#: ../config.c:117
 msgid "Recoloring (light color)"
 msgstr ""
 
-#: ../config.c:104
+#: ../config.c:119
 msgid "Color for highlighting"
 msgstr "Esiletõstmise värv"
 
-#: ../config.c:106
+#: ../config.c:121
 msgid "Color for highlighting (active)"
 msgstr "Esiletõstmise värv (aktiivne)"
 
-#: ../config.c:110
+#: ../config.c:125
 msgid "Recolor pages"
 msgstr ""
 
-#: ../config.c:112
+#: ../config.c:127
 msgid "Wrap scrolling"
 msgstr ""
 
-#: ../config.c:114
+#: ../config.c:129
+msgid "Advance number of pages per row"
+msgstr ""
+
+#: ../config.c:131
 msgid "Transparency for highlighting"
 msgstr ""
 
-#: ../config.c:116
+#: ../config.c:133
 msgid "Render 'Loading ...'"
 msgstr ""
 
-#: ../config.c:117
+#: ../config.c:134
 msgid "Adjust to when opening file"
 msgstr ""
 
-#: ../config.c:119
+#: ../config.c:136
 msgid "Show hidden files and directories"
 msgstr ""
 
-#: ../config.c:121
+#: ../config.c:138
 msgid "Show directories"
 msgstr "Näita kaustasid"
 
-#: ../config.c:123
+#: ../config.c:140
 msgid "Always open on first page"
 msgstr "Ava alati esimene leht"
 
+#: ../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 "Lisa järjehoidja"
 
-#: ../config.c:244
+#: ../config.c:267
 msgid "Delete a bookmark"
 msgstr "Kustuta järjehoidja"
 
-#: ../config.c:245
+#: ../config.c:268
 msgid "List all bookmarks"
 msgstr "Näita kõiki järjehoidjaid"
 
-#: ../config.c:246
+#: ../config.c:269
 msgid "Close current file"
 msgstr "Sulge praegune fail"
 
-#: ../config.c:247
+#: ../config.c:270
 msgid "Show file information"
 msgstr "Näita faili infot"
 
-#: ../config.c:248
+#: ../config.c:271
 msgid "Show help"
 msgstr "Näita abiinfot"
 
-#: ../config.c:249
+#: ../config.c:272
 msgid "Open document"
 msgstr "Ava dokument"
 
-#: ../config.c:250
+#: ../config.c:273
 msgid "Close zathura"
 msgstr "Sule zathura"
 
-#: ../config.c:251
+#: ../config.c:274
 msgid "Print document"
 msgstr "Prindi dokument"
 
-#: ../config.c:252
+#: ../config.c:275
 msgid "Save document"
 msgstr "Salvesta dokument"
 
-#: ../config.c:253
+#: ../config.c:276
 msgid "Save document (and force overwriting)"
 msgstr ""
 
-#: ../config.c:254
+#: ../config.c:277
 msgid "Save attachments"
 msgstr "Salvesta manused"
 
-#: ../config.c:255
+#: ../config.c:278
 msgid "Set page offset"
 msgstr ""
 
-#: ../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 ""
 
-#: ../page-widget.c:680
+#: ../page-widget.c:708
 msgid "Copy image"
 msgstr "Kopeeri pilt"
 
-#: ../shortcuts.c:766
+#: ../page-widget.c:709
+msgid "Save image as"
+msgstr ""
+
+#: ../shortcuts.c:797
 msgid "This document does not contain any index"
 msgstr ""
 
-#: ../zathura.c:59
+#: ../utils.c:346
+msgid "Failed to run xdg-open."
+msgstr ""
+
+#: ../zathura.c:73
 msgid "Reparents to window specified by xid"
 msgstr ""
 
-#: ../zathura.c:60
+#: ../zathura.c:74
 msgid "Path to the config directory"
 msgstr ""
 
-#: ../zathura.c:61
+#: ../zathura.c:75
 msgid "Path to the data directory"
 msgstr ""
 
-#: ../zathura.c:62
+#: ../zathura.c:76
 msgid "Path to the directories containing plugins"
 msgstr ""
 
-#: ../zathura.c:63
+#: ../zathura.c:77
 msgid "Fork into the background"
 msgstr ""
 
-#: ../zathura.c:64
+#: ../zathura.c:78
+msgid "Document password"
+msgstr ""
+
+#: ../zathura.c:79
 msgid "Log level (debug, info, warning, error)"
 msgstr ""
 
-#: ../zathura.c:234 ../zathura.c:715
+#: ../zathura.c:251 ../zathura.c:799
 msgid "[No name]"
 msgstr "[Nime pole]"
diff --git a/po/fr.po b/po/fr.po
index 97a1be8..029dbbd 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,283 +7,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-13 07:26+0000\n"
 "Last-Translator: Quentin Stiévenart <quentin.stievenart@gmail.com>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/zathura/language/fr/)\n"
+"Language-Team: French (http://www.transifex.net/projects/p/zathura/language/"
+"fr/)\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: ../callbacks.c:156
-msgid "Failed to run xdg-open."
-msgstr "Échec lors du lancement de xdg-open"
-
-#: ../callbacks.c:182
+#: ../callbacks.c:175
 #, c-format
 msgid "Invalid input '%s' given."
 msgstr "Entrée invalide: '%s'"
 
-#: ../callbacks.c:220
+#: ../callbacks.c:203
 #, c-format
 msgid "Invalid index '%s' given."
 msgstr "Index invalide: '%s'"
 
-#: ../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 "Pas de document ouvert."
 
-#: ../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 "Nombre d'argument invalide."
 
-#: ../commands.c:44
+#: ../commands.c:47
 #, c-format
 msgid "Bookmark successfuly updated: %s"
 msgstr "Marque page mis à jour avec succès: %s"
 
-#: ../commands.c:50
+#: ../commands.c:53
 #, c-format
 msgid "Could not create bookmark: %s"
 msgstr "Impossible de créer le marque page: %s"
 
-#: ../commands.c:54
+#: ../commands.c:57
 #, c-format
 msgid "Bookmark successfuly created: %s"
 msgstr "Marque page créé avec succès: %s"
 
-#: ../commands.c:77
+#: ../commands.c:80
 #, c-format
 msgid "Removed bookmark: %s"
 msgstr "Marque page supprimé: %s"
 
-#: ../commands.c:79
+#: ../commands.c:82
 #, c-format
 msgid "Failed to remove bookmark: %s"
 msgstr "Échec lors de la suppression du marque page: %s"
 
-#: ../commands.c:105
+#: ../commands.c:108
 #, c-format
 msgid "No such bookmark: %s"
 msgstr "Pas de marque page: %s"
 
-#: ../commands.c:156 ../commands.c:178
+#: ../commands.c:159 ../commands.c:181
 msgid "No information available."
 msgstr "Aucune information disponible."
 
-#: ../commands.c:202
+#: ../commands.c:219
 msgid "Too many arguments."
 msgstr "Trop d'arguments."
 
-#: ../commands.c:211
+#: ../commands.c:228
 msgid "No arguments given."
 msgstr "Aucun argument donné."
 
-#: ../commands.c:257 ../commands.c:283
+#: ../commands.c:287 ../commands.c:313
 msgid "Document saved."
 msgstr "Document enregistré."
 
-#: ../commands.c:259 ../commands.c:285
+#: ../commands.c:289 ../commands.c:315
 msgid "Failed to save document."
 msgstr "Échec lors de l'enregistrement du document."
 
-#: ../commands.c:262 ../commands.c:288
+#: ../commands.c:292 ../commands.c:318
 msgid "Invalid number of arguments."
 msgstr "Nombre d'arguments invalide."
 
-#: ../commands.c:375
+#: ../commands.c:420
 #, c-format
 msgid "Couldn't write attachment '%s' to '%s'."
 msgstr ""
 
-#: ../commands.c:377
+#: ../commands.c:422
 #, c-format
 msgid "Wrote attachment '%s' to '%s'."
 msgstr ""
 
-#: ../commands.c:405
+#: ../commands.c:466
+#, c-format
+msgid "Wrote image '%s' to '%s'."
+msgstr ""
+
+#: ../commands.c:468
+#, c-format
+msgid "Couldn't write image '%s' to '%s'."
+msgstr ""
+
+#: ../commands.c:475
+#, c-format
+msgid "Unknown image '%s'."
+msgstr ""
+
+#: ../commands.c:479
+#, c-format
+msgid "Unknown attachment or image '%s'."
+msgstr ""
+
+#: ../commands.c:509
 msgid "Argument must be a number."
 msgstr "L'argument doit être un nombre."
 
+#: ../completion.c:250
+#, c-format
+msgid "Page %d"
+msgstr ""
+
+#: ../completion.c:293
+msgid "Attachments"
+msgstr ""
+
+#. add images
+#: ../completion.c:324
+msgid "Images"
+msgstr ""
+
 #. zathura settings
-#: ../config.c:83
+#: ../config.c:98
 msgid "Database backend"
 msgstr ""
 
-#: ../config.c:85
+#: ../config.c:100
 msgid "Zoom step"
 msgstr ""
 
-#: ../config.c:87
+#: ../config.c:102
 msgid "Padding between pages"
 msgstr "Espacement entre les pages"
 
-#: ../config.c:89
+#: ../config.c:104
 msgid "Number of pages per row"
 msgstr "Nombre de page par rangée"
 
-#: ../config.c:91
+#: ../config.c:106
 msgid "Scroll step"
 msgstr ""
 
-#: ../config.c:93
+#: ../config.c:108
 msgid "Zoom minimum"
 msgstr "Zoom minimum"
 
-#: ../config.c:95
+#: ../config.c:110
 msgid "Zoom maximum"
 msgstr "Zoom maximum"
 
-#: ../config.c:97
+#: ../config.c:112
 msgid "Life time (in seconds) of a hidden page"
 msgstr "Temps de vie (en seconde) d'une page cachée"
 
-#: ../config.c:98
+#: ../config.c:113
 msgid "Amount of seconds between each cache purge"
 msgstr "Temps (en seconde) avant de vider le cache."
 
-#: ../config.c:100
+#: ../config.c:115
 msgid "Recoloring (dark color)"
 msgstr ""
 
-#: ../config.c:102
+#: ../config.c:117
 msgid "Recoloring (light color)"
 msgstr ""
 
-#: ../config.c:104
+#: ../config.c:119
 msgid "Color for highlighting"
 msgstr ""
 
-#: ../config.c:106
+#: ../config.c:121
 msgid "Color for highlighting (active)"
 msgstr ""
 
-#: ../config.c:110
+#: ../config.c:125
 msgid "Recolor pages"
 msgstr ""
 
-#: ../config.c:112
+#: ../config.c:127
 msgid "Wrap scrolling"
 msgstr ""
 
-#: ../config.c:114
+#: ../config.c:129
+msgid "Advance number of pages per row"
+msgstr ""
+
+#: ../config.c:131
 msgid "Transparency for highlighting"
 msgstr ""
 
-#: ../config.c:116
+#: ../config.c:133
 msgid "Render 'Loading ...'"
 msgstr ""
 
-#: ../config.c:117
+#: ../config.c:134
 msgid "Adjust to when opening file"
 msgstr ""
 
-#: ../config.c:119
+#: ../config.c:136
 msgid "Show hidden files and directories"
 msgstr "Montre les fichiers et dossiers cachés"
 
-#: ../config.c:121
+#: ../config.c:138
 msgid "Show directories"
 msgstr "Montre les dossiers"
 
-#: ../config.c:123
+#: ../config.c:140
 msgid "Always open on first page"
 msgstr "Toujours ouvrir à la première page"
 
+#: ../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 "Ajoute un marque-page"
 
-#: ../config.c:244
+#: ../config.c:267
 msgid "Delete a bookmark"
 msgstr "Supprime un marque-page"
 
-#: ../config.c:245
+#: ../config.c:268
 msgid "List all bookmarks"
 msgstr "Liste tous les marque-pages"
 
-#: ../config.c:246
+#: ../config.c:269
 msgid "Close current file"
 msgstr "Ferme le fichier actuel"
 
-#: ../config.c:247
+#: ../config.c:270
 msgid "Show file information"
 msgstr "Montre les informations sur le fichier"
 
-#: ../config.c:248
+#: ../config.c:271
 msgid "Show help"
 msgstr "Montre l'aide"
 
-#: ../config.c:249
+#: ../config.c:272
 msgid "Open document"
 msgstr "Ouvre un document"
 
-#: ../config.c:250
+#: ../config.c:273
 msgid "Close zathura"
 msgstr "Quitte zathura"
 
-#: ../config.c:251
+#: ../config.c:274
 msgid "Print document"
 msgstr "Imprime un document"
 
-#: ../config.c:252
+#: ../config.c:275
 msgid "Save document"
 msgstr "Sauve un document"
 
-#: ../config.c:253
+#: ../config.c:276
 msgid "Save document (and force overwriting)"
 msgstr "Sauve un document (et force l'écrasement)"
 
-#: ../config.c:254
+#: ../config.c:277
 msgid "Save attachments"
 msgstr ""
 
-#: ../config.c:255
+#: ../config.c:278
 msgid "Set page offset"
 msgstr ""
 
-#: ../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 "Sélection copiée dans le presse-papiers: %s"
 
-#: ../page-widget.c:680
+#: ../page-widget.c:708
 msgid "Copy image"
 msgstr "Copie une image"
 
-#: ../shortcuts.c:766
+#: ../page-widget.c:709
+msgid "Save image as"
+msgstr ""
+
+#: ../shortcuts.c:797
 msgid "This document does not contain any index"
 msgstr "Ce document ne contient pas d'index"
 
-#: ../zathura.c:59
+#: ../utils.c:346
+msgid "Failed to run xdg-open."
+msgstr "Échec lors du lancement de xdg-open"
+
+#: ../zathura.c:73
 msgid "Reparents to window specified by xid"
 msgstr ""
 
-#: ../zathura.c:60
+#: ../zathura.c:74
 msgid "Path to the config directory"
 msgstr "Chemin vers le dossier de configuration"
 
-#: ../zathura.c:61
+#: ../zathura.c:75
 msgid "Path to the data directory"
 msgstr "Chemin vers le dossier de données"
 
-#: ../zathura.c:62
+#: ../zathura.c:76
 msgid "Path to the directories containing plugins"
 msgstr "Chemin vers le dossier de plugins"
 
-#: ../zathura.c:63
+#: ../zathura.c:77
 msgid "Fork into the background"
 msgstr ""
 
-#: ../zathura.c:64
+#: ../zathura.c:78
+msgid "Document password"
+msgstr ""
+
+#: ../zathura.c:79
 msgid "Log level (debug, info, warning, error)"
 msgstr "Niveau d'affichage (debug, info, warning, error)"
 
-#: ../zathura.c:234 ../zathura.c:715
+#: ../zathura.c:251 ../zathura.c:799
 msgid "[No name]"
 msgstr "[Pas de nom]"
diff --git a/po/pl.po b/po/pl.po
index 4876db5..831029e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,283 +7,355 @@ 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 16:07+0000\n"
 "Last-Translator: p <poczciwiec@gmail.com>\n"
-"Language-Team: Polish (http://www.transifex.net/projects/p/zathura/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.net/projects/p/zathura/language/"
+"pl/)\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2)\n"
 
-#: ../callbacks.c:156
-msgid "Failed to run xdg-open."
-msgstr "Wystąpił problem z uruchomieniem xdg-open"
-
-#: ../callbacks.c:182
+#: ../callbacks.c:175
 #, c-format
 msgid "Invalid input '%s' given."
 msgstr "Nieprawidłowy argument: %s"
 
-#: ../callbacks.c:220
+#: ../callbacks.c:203
 #, c-format
 msgid "Invalid index '%s' given."
 msgstr "Nieprawidłowy indeks: %s"
 
-#: ../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 "Nie otwarto żadnego pliku"
 
-#: ../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 "Nieprawidłowa liczba parametrów polecenia"
 
-#: ../commands.c:44
+#: ../commands.c:47
 #, c-format
 msgid "Bookmark successfuly updated: %s"
 msgstr "Zaktualizowano zakładkę: %s"
 
-#: ../commands.c:50
+#: ../commands.c:53
 #, c-format
 msgid "Could not create bookmark: %s"
 msgstr "Nie można stworzyć zakładki: %s"
 
-#: ../commands.c:54
+#: ../commands.c:57
 #, c-format
 msgid "Bookmark successfuly created: %s"
 msgstr "Utworzono zakładkę: %s"
 
-#: ../commands.c:77
+#: ../commands.c:80
 #, c-format
 msgid "Removed bookmark: %s"
 msgstr "Usunięto zakładkę: %s"
 
-#: ../commands.c:79
+#: ../commands.c:82
 #, c-format
 msgid "Failed to remove bookmark: %s"
 msgstr "Nie można usunąć zakładki: %s"
 
-#: ../commands.c:105
+#: ../commands.c:108
 #, c-format
 msgid "No such bookmark: %s"
 msgstr "Nie znaleziono zakładki: %s"
 
-#: ../commands.c:156 ../commands.c:178
+#: ../commands.c:159 ../commands.c:181
 msgid "No information available."
 msgstr "Brak informacji o pliku"
 
-#: ../commands.c:202
+#: ../commands.c:219
 msgid "Too many arguments."
 msgstr "Za dużo parametrów polecenia"
 
-#: ../commands.c:211
+#: ../commands.c:228
 msgid "No arguments given."
 msgstr "Nie podano parametrów polecenia"
 
-#: ../commands.c:257 ../commands.c:283
+#: ../commands.c:287 ../commands.c:313
 msgid "Document saved."
 msgstr "Zapisano dokument"
 
-#: ../commands.c:259 ../commands.c:285
+#: ../commands.c:289 ../commands.c:315
 msgid "Failed to save document."
 msgstr "Błąd zapisu"
 
-#: ../commands.c:262 ../commands.c:288
+#: ../commands.c:292 ../commands.c:318
 msgid "Invalid number of arguments."
 msgstr "Niewłaściwa liczba parametrów polecenia"
 
-#: ../commands.c:375
+#: ../commands.c:420
 #, c-format
 msgid "Couldn't write attachment '%s' to '%s'."
 msgstr "Nie można dodać załącznika %s do pliku %s"
 
-#: ../commands.c:377
+#: ../commands.c:422
 #, c-format
 msgid "Wrote attachment '%s' to '%s'."
 msgstr "Zapisano załącznik %s do pliku %s"
 
-#: ../commands.c:405
+#: ../commands.c:466
+#, c-format
+msgid "Wrote image '%s' to '%s'."
+msgstr "Zapisano załącznik %s do pliku %s"
+
+#: ../commands.c:468
+#, c-format
+msgid "Couldn't write image '%s' to '%s'."
+msgstr "Nie można dodać załącznika %s do pliku %s"
+
+#: ../commands.c:475
+#, c-format
+msgid "Unknown image '%s'."
+msgstr ""
+
+#: ../commands.c:479
+#, c-format
+msgid "Unknown attachment or image '%s'."
+msgstr ""
+
+#: ../commands.c:509
 msgid "Argument must be a number."
 msgstr "Parametr polecenia musi być liczbą"
 
+#: ../completion.c:250
+#, c-format
+msgid "Page %d"
+msgstr ""
+
+#: ../completion.c:293
+msgid "Attachments"
+msgstr "Zapisz załączniki"
+
+#. add images
+#: ../completion.c:324
+msgid "Images"
+msgstr ""
+
 #. zathura settings
-#: ../config.c:83
+#: ../config.c:98
 msgid "Database backend"
 msgstr "Baza danych"
 
-#: ../config.c:85
+#: ../config.c:100
 msgid "Zoom step"
 msgstr "Skok powiększenia"
 
-#: ../config.c:87
+#: ../config.c:102
 msgid "Padding between pages"
 msgstr "Odstęp pomiędzy stronami"
 
-#: ../config.c:89
+#: ../config.c:104
 msgid "Number of pages per row"
 msgstr "Liczba stron w wierszu"
 
-#: ../config.c:91
+#: ../config.c:106
 msgid "Scroll step"
 msgstr "Skok przewijania"
 
-#: ../config.c:93
+#: ../config.c:108
 msgid "Zoom minimum"
 msgstr "Minimalne powiększenie"
 
-#: ../config.c:95
+#: ../config.c:110
 msgid "Zoom maximum"
 msgstr "Maksymalne powiększenie"
 
-#: ../config.c:97
+#: ../config.c:112
 msgid "Life time (in seconds) of a hidden page"
 msgstr "Czas życia niewidocznej strony (w sekundach)"
 
-#: ../config.c:98
+#: ../config.c:113
 msgid "Amount of seconds between each cache purge"
 msgstr "Okres sprawdzania widoczności stron (w sekundach)"
 
-#: ../config.c:100
+#: ../config.c:115
 msgid "Recoloring (dark color)"
 msgstr "Ciemny kolor negatywu"
 
-#: ../config.c:102
+#: ../config.c:117
 msgid "Recoloring (light color)"
 msgstr "Jasny kolor negatywu"
 
-#: ../config.c:104
+#: ../config.c:119
 msgid "Color for highlighting"
 msgstr "Kolor wyróżnienia"
 
-#: ../config.c:106
+#: ../config.c:121
 msgid "Color for highlighting (active)"
 msgstr "Kolor wyróżnienia bieżącego elementu"
 
-#: ../config.c:110
+#: ../config.c:125
 msgid "Recolor pages"
 msgstr "Negatyw"
 
-#: ../config.c:112
+#: ../config.c:127
 msgid "Wrap scrolling"
 msgstr "Zawijanie dokumentu"
 
-#: ../config.c:114
+#: ../config.c:129
+msgid "Advance number of pages per row"
+msgstr ""
+
+#: ../config.c:131
 msgid "Transparency for highlighting"
 msgstr "Przezroczystość wyróżnienia"
 
-#: ../config.c:116
+#: ../config.c:133
 msgid "Render 'Loading ...'"
 msgstr "Wyświetlaj: „Wczytywanie pliku...”"
 
-#: ../config.c:117
+#: ../config.c:134
 msgid "Adjust to when opening file"
 msgstr "Dopasowanie widoku pliku"
 
-#: ../config.c:119
+#: ../config.c:136
 msgid "Show hidden files and directories"
 msgstr "Wyświetl ukryte pliki i katalogi"
 
-#: ../config.c:121
+#: ../config.c:138
 msgid "Show directories"
 msgstr "Wyświetl katalogi"
 
-#: ../config.c:123
+#: ../config.c:140
 msgid "Always open on first page"
 msgstr "Zawsze otwieraj na pierwszej stronie"
 
+#: ../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 "Dodaj zakładkę"
 
-#: ../config.c:244
+#: ../config.c:267
 msgid "Delete a bookmark"
 msgstr "Usuń zakładkę"
 
-#: ../config.c:245
+#: ../config.c:268
 msgid "List all bookmarks"
 msgstr "Wyświetl zakładki"
 
-#: ../config.c:246
+#: ../config.c:269
 msgid "Close current file"
 msgstr "Zamknij plik"
 
-#: ../config.c:247
+#: ../config.c:270
 msgid "Show file information"
 msgstr "Wyświetl informacje o pliku"
 
-#: ../config.c:248
+#: ../config.c:271
 msgid "Show help"
 msgstr "Wyświetl pomoc"
 
-#: ../config.c:249
+#: ../config.c:272
 msgid "Open document"
 msgstr "Otwórz plik"
 
-#: ../config.c:250
+#: ../config.c:273
 msgid "Close zathura"
 msgstr "Zakończ"
 
-#: ../config.c:251
+#: ../config.c:274
 msgid "Print document"
 msgstr "Wydrukuj"
 
-#: ../config.c:252
+#: ../config.c:275
 msgid "Save document"
 msgstr "Zapisz"
 
-#: ../config.c:253
+#: ../config.c:276
 msgid "Save document (and force overwriting)"
 msgstr "Zapisz (nadpisując istniejący plik)"
 
-#: ../config.c:254
+#: ../config.c:277
 msgid "Save attachments"
 msgstr "Zapisz załączniki"
 
-#: ../config.c:255
+#: ../config.c:278
 msgid "Set page offset"
 msgstr "Ustaw przesunięcie numerów stron"
 
-#: ../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 "Zaznaczony tekst skopiowano do schowka: %s"
 
-#: ../page-widget.c:680
+#: ../page-widget.c:708
 msgid "Copy image"
 msgstr "Skopiuj obrazek"
 
-#: ../shortcuts.c:766
+#: ../page-widget.c:709
+msgid "Save image as"
+msgstr ""
+
+#: ../shortcuts.c:797
 msgid "This document does not contain any index"
 msgstr "Dokument nie zawiera indeksu"
 
-#: ../zathura.c:59
+#: ../utils.c:346
+msgid "Failed to run xdg-open."
+msgstr "Wystąpił problem z uruchomieniem xdg-open"
+
+#: ../zathura.c:73
 msgid "Reparents to window specified by xid"
 msgstr "Przypisz proces do rodzica o danym xid"
 
-#: ../zathura.c:60
+#: ../zathura.c:74
 msgid "Path to the config directory"
 msgstr "Ścieżka do katalogu konfiguracyjnego"
 
-#: ../zathura.c:61
+#: ../zathura.c:75
 msgid "Path to the data directory"
 msgstr "Ścieżka do katalogu danych"
 
-#: ../zathura.c:62
+#: ../zathura.c:76
 msgid "Path to the directories containing plugins"
 msgstr "Ścieżka do katalogu wtyczek"
 
-#: ../zathura.c:63
+#: ../zathura.c:77
 msgid "Fork into the background"
 msgstr "Forkuj w tle"
 
-#: ../zathura.c:64
+#: ../zathura.c:78
+msgid "Document password"
+msgstr ""
+
+#: ../zathura.c:79
 msgid "Log level (debug, info, warning, error)"
 msgstr "Szczegółowość komunikatów (debug, info, warning, error)"
 
-#: ../zathura.c:234 ../zathura.c:715
+#: ../zathura.c:251 ../zathura.c:799
 msgid "[No name]"
 msgstr "[bez nazwy]"
diff --git a/po/ta_IN.po b/po/ta_IN.po
index 7353772..2c31acd 100644
--- a/po/ta_IN.po
+++ b/po/ta_IN.po
@@ -7,283 +7,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"
-"Last-Translator: mankand007 <mankand007@gmail.com>\n"
+"POT-Creation-Date: 2012-05-08 19:21+0200\n"
 "PO-Revision-Date: 2012-04-03 15:25+0000\n"
-"Language-Team: Tamil (India) (http://www.transifex.net/projects/p/zathura/language/ta_IN/)\n"
+"Last-Translator: mankand007 <mankand007@gmail.com>\n"
+"Language-Team: Tamil (India) (http://www.transifex.net/projects/p/zathura/"
+"language/ta_IN/)\n"
+"Language: ta_IN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ta_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ../callbacks.c:156
-msgid "Failed to run xdg-open."
-msgstr "xdg-open-ஐ இயக்க முடியவில்லை"
-
-#: ../callbacks.c:182
+#: ../callbacks.c:175
 #, c-format
 msgid "Invalid input '%s' given."
 msgstr "கொடுக்கப்பட்ட உள்ளீடு(input) '%s' தவறு"
 
-#: ../callbacks.c:220
+#: ../callbacks.c:203
 #, c-format
 msgid "Invalid index '%s' given."
 msgstr "கொடுக்கப்பட்ட index '%s' தவறு"
 
-#: ../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 "எந்தக் ஆவணமும் திறக்கப்படவில்லை"
 
-#: ../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 "கொடுக்கப்பட்ட arguments-களின் எண்ணிக்கை தவறு"
 
-#: ../commands.c:44
+#: ../commands.c:47
 #, c-format
 msgid "Bookmark successfuly updated: %s"
 msgstr "Bookmark வெற்றிகரமாக நிகழ்நிலை(update) படுத்தப்பட்டது: %s"
 
-#: ../commands.c:50
+#: ../commands.c:53
 #, c-format
 msgid "Could not create bookmark: %s"
 msgstr "Bookmark-ஐ உருவாக்க முடியவில்லை: %s"
 
-#: ../commands.c:54
+#: ../commands.c:57
 #, c-format
 msgid "Bookmark successfuly created: %s"
 msgstr "Bookmark வெற்றிகரமாக உருவாக்கப்பட்டது: %s"
 
-#: ../commands.c:77
+#: ../commands.c:80
 #, c-format
 msgid "Removed bookmark: %s"
 msgstr "Bookmark அழிக்கப்பட்டது: %s"
 
-#: ../commands.c:79
+#: ../commands.c:82
 #, c-format
 msgid "Failed to remove bookmark: %s"
 msgstr "Bookmark-ஐ அழிக்க இயலவில்லை: %s"
 
-#: ../commands.c:105
+#: ../commands.c:108
 #, c-format
 msgid "No such bookmark: %s"
 msgstr "அந்தப் பெயரில் எந்த bookmark-ம் இல்லை: %s"
 
-#: ../commands.c:156 ../commands.c:178
+#: ../commands.c:159 ../commands.c:181
 msgid "No information available."
 msgstr "எந்தத் தகவலும் இல்லை"
 
-#: ../commands.c:202
+#: ../commands.c:219
 msgid "Too many arguments."
 msgstr "Argumentகளின் எண்ணிக்கை மிகவும் அதிகம்"
 
-#: ../commands.c:211
+#: ../commands.c:228
 msgid "No arguments given."
 msgstr "எந்த argument-ம் தரப்படவில்லை"
 
-#: ../commands.c:257 ../commands.c:283
+#: ../commands.c:287 ../commands.c:313
 msgid "Document saved."
 msgstr "கோப்பு சேமிக்கப்பட்டது"
 
-#: ../commands.c:259 ../commands.c:285
+#: ../commands.c:289 ../commands.c:315
 msgid "Failed to save document."
 msgstr "ஆவணத்தை சேமிக்க இயலவில்லை"
 
-#: ../commands.c:262 ../commands.c:288
+#: ../commands.c:292 ../commands.c:318
 msgid "Invalid number of arguments."
 msgstr "கொடுக்கப்பட்ட argument-களின் எண்ணிக்கை தவறு"
 
-#: ../commands.c:375
+#: ../commands.c:420
 #, c-format
 msgid "Couldn't write attachment '%s' to '%s'."
 msgstr ""
 
-#: ../commands.c:377
+#: ../commands.c:422
 #, c-format
 msgid "Wrote attachment '%s' to '%s'."
 msgstr ""
 
-#: ../commands.c:405
+#: ../commands.c:466
+#, c-format
+msgid "Wrote image '%s' to '%s'."
+msgstr ""
+
+#: ../commands.c:468
+#, c-format
+msgid "Couldn't write image '%s' to '%s'."
+msgstr ""
+
+#: ../commands.c:475
+#, c-format
+msgid "Unknown image '%s'."
+msgstr ""
+
+#: ../commands.c:479
+#, c-format
+msgid "Unknown attachment or image '%s'."
+msgstr ""
+
+#: ../commands.c:509
 msgid "Argument must be a number."
 msgstr "Argument ஒரு எண்ணாக இருக்க வேண்டும்"
 
+#: ../completion.c:250
+#, c-format
+msgid "Page %d"
+msgstr ""
+
+#: ../completion.c:293
+msgid "Attachments"
+msgstr "இணைப்புகளைச் சேமிக்கவும்"
+
+#. add images
+#: ../completion.c:324
+msgid "Images"
+msgstr ""
+
 #. zathura settings
-#: ../config.c:83
+#: ../config.c:98
 msgid "Database backend"
 msgstr ""
 
-#: ../config.c:85
+#: ../config.c:100
 msgid "Zoom step"
 msgstr "Zoom அமைப்பு"
 
-#: ../config.c:87
+#: ../config.c:102
 msgid "Padding between pages"
 msgstr "இரு பக்கங்களுக்கிடையில் உள்ள நிரப்பல்(padding)"
 
-#: ../config.c:89
+#: ../config.c:104
 msgid "Number of pages per row"
 msgstr "ஒரு வரிசையில் எத்தனை பக்கங்களைக் காட்ட வேண்டும்"
 
-#: ../config.c:91
+#: ../config.c:106
 msgid "Scroll step"
 msgstr "திரை உருளல்(scroll) அளவு"
 
-#: ../config.c:93
+#: ../config.c:108
 msgid "Zoom minimum"
 msgstr "முடிந்தவரை சிறியதாகக் காட்டு"
 
-#: ../config.c:95
+#: ../config.c:110
 msgid "Zoom maximum"
 msgstr "முடிந்தவரை பெரிதாகக் காட்டு"
 
-#: ../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 ""
 
-#: ../config.c:100
+#: ../config.c:115
 msgid "Recoloring (dark color)"
 msgstr ""
 
-#: ../config.c:102
+#: ../config.c:117
 msgid "Recoloring (light color)"
 msgstr ""
 
-#: ../config.c:104
+#: ../config.c:119
 msgid "Color for highlighting"
 msgstr ""
 
-#: ../config.c:106
+#: ../config.c:121
 msgid "Color for highlighting (active)"
 msgstr ""
 
-#: ../config.c:110
+#: ../config.c:125
 msgid "Recolor pages"
 msgstr ""
 
-#: ../config.c:112
+#: ../config.c:127
 msgid "Wrap scrolling"
 msgstr ""
 
-#: ../config.c:114
+#: ../config.c:129
+msgid "Advance number of pages per row"
+msgstr ""
+
+#: ../config.c:131
 msgid "Transparency for highlighting"
 msgstr ""
 
-#: ../config.c:116
+#: ../config.c:133
 msgid "Render 'Loading ...'"
 msgstr ""
 
-#: ../config.c:117
+#: ../config.c:134
 msgid "Adjust to when opening file"
 msgstr ""
 
-#: ../config.c:119
+#: ../config.c:136
 msgid "Show hidden files and directories"
 msgstr ""
 
-#: ../config.c:121
+#: ../config.c:138
 msgid "Show directories"
 msgstr ""
 
-#: ../config.c:123
+#: ../config.c:140
 msgid "Always open on first page"
 msgstr ""
 
+#: ../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 "புதிய bookmark உருவாக்கு"
 
-#: ../config.c:244
+#: ../config.c:267
 msgid "Delete a bookmark"
 msgstr "Bookmark-ஐ அழித்துவிடு"
 
-#: ../config.c:245
+#: ../config.c:268
 msgid "List all bookmarks"
 msgstr "அனைத்து bookmark-களையும் பட்டியலிடு"
 
-#: ../config.c:246
+#: ../config.c:269
 msgid "Close current file"
 msgstr ""
 
-#: ../config.c:247
+#: ../config.c:270
 msgid "Show file information"
 msgstr "ஆவணம் பற்றிய தகவல்களைக் காட்டு"
 
-#: ../config.c:248
+#: ../config.c:271
 msgid "Show help"
 msgstr "உதவியைக் காட்டு"
 
-#: ../config.c:249
+#: ../config.c:272
 msgid "Open document"
 msgstr "ஒரு ஆவணத்தைத் திற"
 
-#: ../config.c:250
+#: ../config.c:273
 msgid "Close zathura"
 msgstr "zathura-வை விட்டு வெளியேறு"
 
-#: ../config.c:251
+#: ../config.c:274
 msgid "Print document"
 msgstr "ஆவணத்தை அச்சிடு"
 
-#: ../config.c:252
+#: ../config.c:275
 msgid "Save document"
 msgstr "ஆவணத்தை சேமிக்கவும்"
 
-#: ../config.c:253
+#: ../config.c:276
 msgid "Save document (and force overwriting)"
 msgstr ""
 
-#: ../config.c:254
+#: ../config.c:277
 msgid "Save attachments"
 msgstr "இணைப்புகளைச் சேமிக்கவும்"
 
-#: ../config.c:255
+#: ../config.c:278
 msgid "Set page offset"
 msgstr ""
 
-#: ../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 ""
 
-#: ../page-widget.c:680
+#: ../page-widget.c:708
 msgid "Copy image"
 msgstr "படத்தை ஒரு பிரதியெடு"
 
-#: ../shortcuts.c:766
+#: ../page-widget.c:709
+msgid "Save image as"
+msgstr ""
+
+#: ../shortcuts.c:797
 msgid "This document does not contain any index"
 msgstr "இந்த ஆவணத்தில் எந்த index-ம் இல்லை"
 
-#: ../zathura.c:59
+#: ../utils.c:346
+msgid "Failed to run xdg-open."
+msgstr "xdg-open-ஐ இயக்க முடியவில்லை"
+
+#: ../zathura.c:73
 msgid "Reparents to window specified by xid"
 msgstr ""
 
-#: ../zathura.c:60
+#: ../zathura.c:74
 msgid "Path to the config directory"
 msgstr ""
 
-#: ../zathura.c:61
+#: ../zathura.c:75
 msgid "Path to the data directory"
 msgstr ""
 
-#: ../zathura.c:62
+#: ../zathura.c:76
 msgid "Path to the directories containing plugins"
 msgstr ""
 
-#: ../zathura.c:63
+#: ../zathura.c:77
 msgid "Fork into the background"
 msgstr ""
 
-#: ../zathura.c:64
+#: ../zathura.c:78
+msgid "Document password"
+msgstr ""
+
+#: ../zathura.c:79
 msgid "Log level (debug, info, warning, error)"
 msgstr ""
 
-#: ../zathura.c:234 ../zathura.c:715
+#: ../zathura.c:251 ../zathura.c:799
 msgid "[No name]"
 msgstr "பெயரற்ற ஆவணம்"
diff --git a/po/tr.po b/po/tr.po
index 7e05279..d5f33f3 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,6 +1,6 @@
 # zathura - language file (Turkish)
 # See LICENSE file for license and copyright information
-# 
+#
 # Translators:
 #   <dead-bodies-everywhere@hotmail.com>, 2012.
 #   <femnad@gmail.com>, 2012.
@@ -8,271 +8,326 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zathura\n"
 "Report-Msgid-Bugs-To: http://bt.pwmt.org/\n"
-"POT-Creation-Date: 2012-04-21 15:53+0200\n"
+"POT-Creation-Date: 2012-05-08 19:21+0200\n"
 "PO-Revision-Date: 2012-05-01 20:38+0000\n"
 "Last-Translator: hsngrms <dead-bodies-everywhere@hotmail.com>\n"
-"Language-Team: Turkish (http://www.transifex.net/projects/p/zathura/language/tr/)\n"
+"Language-Team: Turkish (http://www.transifex.net/projects/p/zathura/language/"
+"tr/)\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ../callbacks.c:156
-msgid "Failed to run xdg-open."
-msgstr "xdg-open çalıştırılamadı"
-
-#: ../callbacks.c:182
+#: ../callbacks.c:175
 #, c-format
 msgid "Invalid input '%s' given."
 msgstr "Hatalı girdi '%s'"
 
-#: ../callbacks.c:220
+#: ../callbacks.c:203
 #, c-format
 msgid "Invalid index '%s' given."
 msgstr "Hatalı dizin '%s'"
 
-#: ../commands.c:31 ../commands.c:66 ../commands.c:93 ../commands.c:135
-#: ../commands.c:235 ../commands.c:252 ../commands.c:278 ../commands.c:358
-#: ../commands.c:393 ../shortcuts.c:854
+#: ../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 "Açık belge yok."
 
-#: ../commands.c:37 ../commands.c:72 ../commands.c:99 ../commands.c:363
+#: ../commands.c:39 ../commands.c:74 ../commands.c:101 ../commands.c:401
 msgid "Invalid number of arguments given."
 msgstr "Yanlış sayıda argüman"
 
-#: ../commands.c:45
+#: ../commands.c:47
 #, c-format
 msgid "Bookmark successfuly updated: %s"
 msgstr "Yer imi başarıyla güncellendi: %s"
 
-#: ../commands.c:51
+#: ../commands.c:53
 #, c-format
 msgid "Could not create bookmark: %s"
 msgstr "Yer imi yaratılamadı: %s"
 
-#: ../commands.c:55
+#: ../commands.c:57
 #, c-format
 msgid "Bookmark successfuly created: %s"
 msgstr "Yer imi yaratıldı: %s"
 
-#: ../commands.c:78
+#: ../commands.c:80
 #, c-format
 msgid "Removed bookmark: %s"
 msgstr "Yer imi silindi: %s"
 
-#: ../commands.c:80
+#: ../commands.c:82
 #, c-format
 msgid "Failed to remove bookmark: %s"
 msgstr "Yer imi silinemedi: %s"
 
-#: ../commands.c:106
+#: ../commands.c:108
 #, c-format
 msgid "No such bookmark: %s"
 msgstr "Böyle bir yer imi yok: %s"
 
-#: ../commands.c:157 ../commands.c:179
+#: ../commands.c:159 ../commands.c:181
 msgid "No information available."
 msgstr "Bilgi mevcut değil."
 
-#: ../commands.c:203
+#: ../commands.c:219
 msgid "Too many arguments."
 msgstr "Çok fazla sayıda argüman."
 
-#: ../commands.c:212
+#: ../commands.c:228
 msgid "No arguments given."
 msgstr "Argüman verilmedi."
 
-#: ../commands.c:258 ../commands.c:284
+#: ../commands.c:287 ../commands.c:313
 msgid "Document saved."
 msgstr "Belge kaydedildi."
 
-#: ../commands.c:260 ../commands.c:286
+#: ../commands.c:289 ../commands.c:315
 msgid "Failed to save document."
 msgstr "Belge kaydedilemedi."
 
-#: ../commands.c:263 ../commands.c:289
+#: ../commands.c:292 ../commands.c:318
 msgid "Invalid number of arguments."
 msgstr "Yanlış sayıda argüman."
 
-#: ../commands.c:376
+#: ../commands.c:420
 #, c-format
 msgid "Couldn't write attachment '%s' to '%s'."
 msgstr "'%s' eki '%s' konumuna yazılamadı."
 
-#: ../commands.c:378
+#: ../commands.c:422
 #, c-format
 msgid "Wrote attachment '%s' to '%s'."
 msgstr "'%s' eki '%s' konumuna yazıldı."
 
-#: ../commands.c:406
+#: ../commands.c:466
+#, c-format
+msgid "Wrote image '%s' to '%s'."
+msgstr "'%s' eki '%s' konumuna yazıldı."
+
+#: ../commands.c:468
+#, c-format
+msgid "Couldn't write image '%s' to '%s'."
+msgstr "'%s' eki '%s' konumuna yazılamadı."
+
+#: ../commands.c:475
+#, c-format
+msgid "Unknown image '%s'."
+msgstr ""
+
+#: ../commands.c:479
+#, c-format
+msgid "Unknown attachment or image '%s'."
+msgstr ""
+
+#: ../commands.c:509
 msgid "Argument must be a number."
 msgstr "Argüman bir sayı olmalı."
 
+#: ../completion.c:250
+#, c-format
+msgid "Page %d"
+msgstr ""
+
+#: ../completion.c:293
+msgid "Attachments"
+msgstr "Ekleri kaydet"
+
+#. add images
+#: ../completion.c:324
+msgid "Images"
+msgstr ""
+
 #. zathura settings
-#: ../config.c:84
+#: ../config.c:98
 msgid "Database backend"
 msgstr "Veritabanı arkayüzü"
 
-#: ../config.c:86
+#: ../config.c:100
 msgid "Zoom step"
 msgstr "Yakınlaşma/uzaklaşma aralığı"
 
-#: ../config.c:88
+#: ../config.c:102
 msgid "Padding between pages"
 msgstr "Sayfalar arasındaki boşluk"
 
-#: ../config.c:90
+#: ../config.c:104
 msgid "Number of pages per row"
 msgstr "Satır başına sayfa sayısı"
 
-#: ../config.c:92
+#: ../config.c:106
 msgid "Scroll step"
 msgstr "Kaydırma aralığı"
 
-#: ../config.c:94
+#: ../config.c:108
 msgid "Zoom minimum"
 msgstr "En fazla uzaklaşma"
 
-#: ../config.c:96
+#: ../config.c:110
 msgid "Zoom maximum"
 msgstr "En fazla yakınlaşma"
 
-#: ../config.c:98
+#: ../config.c:112
 msgid "Life time (in seconds) of a hidden page"
 msgstr "Gizli pencerenin açık kalma süresi (saniye)"
 
-#: ../config.c:99
+#: ../config.c:113
 msgid "Amount of seconds between each cache purge"
 msgstr "Önbellek temizliği yapılma sıklığı, saniye cinsinden"
 
-#: ../config.c:101
+#: ../config.c:115
 msgid "Recoloring (dark color)"
 msgstr "Renk değişimi (koyu renk)"
 
-#: ../config.c:103
+#: ../config.c:117
 msgid "Recoloring (light color)"
 msgstr "Renk değişimi (açık renk)"
 
-#: ../config.c:105
+#: ../config.c:119
 msgid "Color for highlighting"
 msgstr "İşaretleme rengi"
 
-#: ../config.c:107
+#: ../config.c:121
 msgid "Color for highlighting (active)"
 msgstr "İşaretleme rengi (etkin)"
 
-#: ../config.c:111
+#: ../config.c:125
 msgid "Recolor pages"
 msgstr "Sayga rengini değiştir"
 
-#: ../config.c:113
+#: ../config.c:127
 msgid "Wrap scrolling"
 msgstr "Kaydırmayı sarmala"
 
-#: ../config.c:115
+#: ../config.c:129
 msgid "Advance number of pages per row"
 msgstr "Satır başına sayfa sayısı"
 
-#: ../config.c:117
+#: ../config.c:131
 msgid "Transparency for highlighting"
 msgstr "Ön plana çıkarmak için saydamlaştır"
 
-#: ../config.c:119
+#: ../config.c:133
 msgid "Render 'Loading ...'"
 msgstr "'Yüklüyor ...' yazısını göster"
 
-#: ../config.c:120
+#: ../config.c:134
 msgid "Adjust to when opening file"
 msgstr "Dosya açarken ayarla"
 
-#: ../config.c:122
+#: ../config.c:136
 msgid "Show hidden files and directories"
 msgstr "Gizli dosyaları ve dizinleri göster"
 
-#: ../config.c:124
+#: ../config.c:138
 msgid "Show directories"
 msgstr "Dizinleri göster"
 
-#: ../config.c:126
+#: ../config.c:140
 msgid "Always open on first page"
 msgstr "Her zaman ilk sayfayı aç"
 
+#: ../config.c:142
+msgid "Highlight search results"
+msgstr ""
+
+#: ../config.c:144
+msgid "Clear search results on abort"
+msgstr ""
+
 #. define default inputbar commands
-#: ../config.c:246
+#: ../config.c:266
 msgid "Add a bookmark"
 msgstr "Yer imi ekle"
 
-#: ../config.c:247
+#: ../config.c:267
 msgid "Delete a bookmark"
 msgstr "Yer imi sil"
 
-#: ../config.c:248
+#: ../config.c:268
 msgid "List all bookmarks"
 msgstr "Yer imlerini listele"
 
-#: ../config.c:249
+#: ../config.c:269
 msgid "Close current file"
 msgstr "Geçerli dosyayı kapat"
 
-#: ../config.c:250
+#: ../config.c:270
 msgid "Show file information"
 msgstr "Dosya bilgisi göster"
 
-#: ../config.c:251
+#: ../config.c:271
 msgid "Show help"
 msgstr "Yardım bilgisi göster"
 
-#: ../config.c:252
+#: ../config.c:272
 msgid "Open document"
 msgstr "Belge aç"
 
-#: ../config.c:253
+#: ../config.c:273
 msgid "Close zathura"
 msgstr "Zathura'yı kapat"
 
-#: ../config.c:254
+#: ../config.c:274
 msgid "Print document"
 msgstr "Belge yazdır"
 
-#: ../config.c:255
+#: ../config.c:275
 msgid "Save document"
 msgstr "Belgeyi kaydet"
 
-#: ../config.c:256
+#: ../config.c:276
 msgid "Save document (and force overwriting)"
 msgstr "Belgeyi kaydet (ve sormadan üzerine yaz)"
 
-#: ../config.c:257
+#: ../config.c:277
 msgid "Save attachments"
 msgstr "Ekleri kaydet"
 
-#: ../config.c:258
+#: ../config.c:278
 msgid "Set page offset"
 msgstr "Sayfa derinliğini ayarla"
 
-#: ../config.c:259
-msgid "Delete the specified marks"
-msgstr "Seçilen işaretlemeleri sil"
-
-#: ../config.c:260
+#: ../config.c:279
 msgid "Mark current location within the document"
 msgstr "Bu belgede bu konumu işaretle"
 
-#: ../page-widget.c:584
+#: ../config.c:280
+msgid "Delete the specified marks"
+msgstr "Seçilen işaretlemeleri sil"
+
+#: ../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 "Seçili metin panoya kopyalandı: %s"
 
-#: ../page-widget.c:680
+#: ../page-widget.c:708
 msgid "Copy image"
 msgstr "Resim kopyala"
 
-#: ../shortcuts.c:757
+#: ../page-widget.c:709
+msgid "Save image as"
+msgstr ""
+
+#: ../shortcuts.c:797
 msgid "This document does not contain any index"
 msgstr "Bu belge fihrist içermiyor"
 
+#: ../utils.c:346
+msgid "Failed to run xdg-open."
+msgstr "xdg-open çalıştırılamadı"
+
 #: ../zathura.c:73
 msgid "Reparents to window specified by xid"
 msgstr "Xid tarafından belirlendiği gibi bir üst seviye pencereye bağlı"
@@ -294,9 +349,13 @@ msgid "Fork into the background"
 msgstr "Arka planda işlemden çocuk oluştur"
 
 #: ../zathura.c:78
+msgid "Document password"
+msgstr ""
+
+#: ../zathura.c:79
 msgid "Log level (debug, info, warning, error)"
 msgstr "Kayıt seviyesi (hata ayıklama, bilgi, uyarı, hata)"
 
-#: ../zathura.c:248 ../zathura.c:779
+#: ../zathura.c:251 ../zathura.c:799
 msgid "[No name]"
 msgstr "[İsimsiz]"