Merge branch 'release/0.3.2'

722c219f · Moritz Lipp · 00f90abb · d2c44a14 · 722c219f · 722c219f
Commit 722c219f authored Nov 09, 2014 by Moritz Lipp
--- a/.gitignore
+++ b/.gitignore
+# build files
 *.o
 *.do
-*~
-*.rej
-*.swp
+*.gcda
+*.gcno
+*.info
+*.pc
+*.sw[a-z]
+*.pyc
+
+# generated files
+dbus-interface-definitions.c
+css-definitions.c
+zathura.1
+zathurarc.5
+
+# dist files
+zathura-*.tar.gz
+
+# patch files
+*.diff
+*.patch
+
+# build dirs
 .depend
+.tx
+gcov/
+doc/_build
+
+# binaries
 zathura
 zathura-debug
-zathura.pc
-*.info
-*.gcno
-*.gcda
-gcov/
-*.swp
+
+# version file
 version.h
-./doc/_build
-*.tmp
-zathura.1
-zathurarc.5
 .version-checks/
-dbus-interface-definitions.c
-css-definitions.c
-.ycm_extra_conf.py
+
+# development files
+.clang_complete
+.lvimrc
 .ropeproject
+.frama-c
 compile_commands.json
-zathura-*.tar.gz
+*.log
--- a/AUTHORS
+++ b/AUTHORS
@@ -27,3 +27,4 @@ Kamil Smardzewski <roderyk197@gmail.com>
 oblique
 Maxime Chéramy <maxime.cheramy@gmail.com>
 Alexander Shabalin <shabalyn.a@gmail.com>
+Lingzhu Xiang <lingzhu@lingzhuxiang.com>
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,7 @@ include config.mk
 include colors.mk
 include common.mk

-OSOURCE    = $(filter-out css-definitions.c, $(filter-out dbus-interface-definitions.c, $(wildcard *.c)))
-HEADER     = $(wildcard *.h) $(wildcard synctex/*.h)
-HEADERINST = version.h document.h macros.h page.h types.h plugin-api.h links.h
+OSOURCE    = $(filter-out ${PROJECT}/css-definitions.c, $(filter-out ${PROJECT}/dbus-interface-definitions.c, $(wildcard ${PROJECT}/*.c)))

 ifneq (${WITH_SQLITE},0)
 INCS     += $(SQLITE_INC)
@@ -29,10 +27,10 @@ LIBS   += $(SYNCTEX_LIB)
 else
 INCS   += $(ZLIB_INC)
 LIBS   += $(ZLIB_LIB)
-SOURCE += $(wildcard synctex/*.c)
+SOURCE += $(wildcard ${PROJECT}/synctex/*.c)

 ifeq (,$(findstring -Isynctex,${CPPFLAGS}))
-CPPFLAGS += -Isynctex
+CPPFLAGS += -I${PROJECT}/synctex
 endif
 ifeq (,$(findstring -DSYNCTEX_VERBOSE=0,${CPPFLAGS}))
 CPPFLAGS += -DSYNCTEX_VERBOSE=0
@@ -53,8 +51,17 @@ ifeq (,$(findstring -DLOCALEDIR,${CPPFLAGS}))
 CPPFLAGS += -DLOCALEDIR=\"${LOCALEDIR}\"
 endif

-OBJECTS  = $(patsubst %.c, %.o,  $(SOURCE)) dbus-interface-definitions.o css-definitions.o
-DOBJECTS = $(patsubst %.o, %.do, $(OBJECTS))
+OBJECTS       = $(addprefix ${BUILDDIR_RELEASE}/,${SOURCE:.c=.o}) \
+	${BUILDDIR_RELEASE}/${PROJECT}/css-definitions.o \
+	${BUILDDIR_RELEASE}/${PROJECT}/dbus-interface-definitions.o
+OBJECTS_DEBUG = $(addprefix ${BUILDDIR_DEBUG}/,${SOURCE:.c=.o}) \
+	${BUILDDIR_DEBUG}/${PROJECT}/css-definitions.o \
+	${BUILDDIR_DEBUG}/${PROJECT}/dbus-interface-definitions.o
+OBJECTS_GCOV  = $(addprefix ${BUILDDIR_GCOV}/,${SOURCE:.c=.o}) \
+	${BUILDDIR_GCOV}/${PROJECT}/css-definitions.o \
+	${BUILDDIR_GCOV}/${PROJECT}/dbus-interface-definitions.o
+HEADER        = $(wildcard ${PROJECT}/*.h) $(wildcard synctex/*.h)
+HEADERINST    = $(addprefix ${PROJECT}/,version.h document.h macros.h page.h types.h plugin-api.h links.h)

 all: options ${PROJECT} po build-manpages

@@ -75,72 +82,125 @@ options:
 	@echo "DFLAGS  = ${DFLAGS}"
 	@echo "CC      = ${CC}"

-version.h: version.h.in config.mk
+${PROJECT}/version.h: ${PROJECT}/version.h.in config.mk
 	$(QUIET)sed -e 's/ZVMAJOR/${ZATHURA_VERSION_MAJOR}/' \
 		-e 's/ZVMINOR/${ZATHURA_VERSION_MINOR}/' \
 		-e 's/ZVREV/${ZATHURA_VERSION_REV}/' \
 		-e 's/ZVAPI/${ZATHURA_API_VERSION}/' \
-		-e 's/ZVABI/${ZATHURA_ABI_VERSION}/' version.h.in > version.h.tmp
-	$(QUIET)mv version.h.tmp version.h
+		-e 's/ZVABI/${ZATHURA_ABI_VERSION}/' ${PROJECT}/version.h.in > version.h.tmp
+	$(QUIET)mv version.h.tmp ${PROJECT}/version.h

-dbus-interface-definitions.c: data/org.pwmt.zathura.xml
+${PROJECT}/dbus-interface-definitions.c: data/org.pwmt.zathura.xml
 	$(QUIET)echo '#include "dbus-interface-definitions.h"' > $@.tmp
 	$(QUIET)echo 'const char* DBUS_INTERFACE_XML =' >> $@.tmp
 	$(QUIET)sed 's/^\(.*\)$$/"\1\\n"/' data/org.pwmt.zathura.xml >> $@.tmp
 	$(QUIET)echo ';' >> $@.tmp
 	$(QUIET)mv $@.tmp $@

-css-definitions.c: data/zathura.css_t
+${PROJECT}/css-definitions.c: data/zathura.css_t
 	$(QUIET)echo '#include "css-definitions.h"' > $@.tmp
 	$(QUIET)echo 'const char* CSS_TEMPLATE_INDEX =' >> $@.tmp
 	$(QUIET)sed 's/^\(.*\)$$/"\1\\n"/' $< >> $@.tmp
 	$(QUIET)echo ';' >> $@.tmp
 	$(QUIET)mv $@.tmp $@

-%.o: %.c
+# release build
+
+${OBJECTS}: config.mk ${PROJECT}/version.h \
+	.version-checks/GIRARA .version-checks/GLIB .version-checks/GTK
+
+${BUILDDIR_RELEASE}/%.o: %.c
 	$(call colorecho,CC,$<)
-	$(QUIET) mkdir -p $(shell dirname .depend/$@.dep)
-	$(QUIET)${CC} -c ${CPPFLAGS} ${CFLAGS} -o $@ $< -MMD -MF .depend/$@.dep
+	@mkdir -p ${DEPENDDIR}/$(dir $(abspath $@))
+	@mkdir -p $(dir $(abspath $@))
+	$(QUIET)${CC} -c ${CPPFLAGS} ${CFLAGS} -o $@ $< -MMD -MF ${DEPENDDIR}/$(abspath $@).dep
+
+${BUILDDIR_RELEASE}/${BINDIR}/${PROJECT}: ${OBJECTS}
+	$(call colorecho,CC,$@)
+	@mkdir -p ${BUILDDIR_RELEASE}/${BINDIR}
+	$(QUIET)${CC} ${SFLAGS} ${LDFLAGS} \
+		-o ${BUILDDIR_RELEASE}/${BINDIR}/${PROJECT} ${OBJECTS} ${LIBS}
+
+${PROJECT}: ${BUILDDIR_RELEASE}/${BINDIR}/${PROJECT}
+
+release: ${PROJECT}

-%.do: %.c
+run: release
+	$(QUIET)./${BUILDDIR_RELEASE}/${BINDIR}/${PROJECT}
+
+# debug build
+
+${OBJECTS_DEBUG}: config.mk ${PROJECT}/version.h \
+	.version-checks/GIRARA .version-checks/GLIB .version-checks/GTK
+
+${BUILDDIR_DEBUG}/%.o: %.c
 	$(call colorecho,CC,$<)
-	$(QUIET) mkdir -p $(shell dirname .depend/$@.dep)
-	$(QUIET)${CC} -c ${CPPFLAGS} ${CFLAGS} ${DFLAGS} -o $@ $< -MMD -MF .depend/$@.dep
+	@mkdir -p ${DEPENDDIR}/$(dir $(abspath $@))
+	@mkdir -p $(dir $(abspath $@))
+	$(QUIET)${CC} -c ${CPPFLAGS} ${CFLAGS} ${DFLAGS} \
+		-o $@ $< -MMD -MF ${DEPENDDIR}/$(abspath $@).dep
+
+${BUILDDIR_DEBUG}/${BINDIR}/${PROJECT}: ${OBJECTS_DEBUG}
+	$(call colorecho,CC,$@)
+	@mkdir -p ${BUILDDIR_DEBUG}/${BINDIR}
+	$(QUIET)${CC} ${SFLAGS} ${LDFLAGS} \
+		-o ${BUILDDIR_DEBUG}/${BINDIR}/${PROJECT} ${OBJECTS} ${LIBS}

-${OBJECTS} ${DOBJECTS}: config.mk version.h \
+debug: ${BUILDDIR_DEBUG}/${BINDIR}/${PROJECT}
+
+run-debug: debug
+	$(QUIET)./${BUILDDIR_DEBUG}/${BINDIR}/${PROJECT}
+
+# gcov build
+
+${OBJECTS_GCOV}: config.mk ${PROJECT}/version.h \
 	.version-checks/GIRARA .version-checks/GLIB .version-checks/GTK

-${PROJECT}: ${OBJECTS}
+${BUILDDIR_GCOV}/%.o: %.c
+	$(call colorecho,CC,$<)
+	@mkdir -p ${DEPENDDIR}/$(dir $(abspath $@))
+	@mkdir -p $(dir $(abspath $@))
+	$(QUIET)${CC} -c ${CPPFLAGS} ${CFLAGS} ${GCOV_CFLAGS} \
+		-o $@ $< -MMD -MF ${DEPENDDIR}/$(abspath $@).dep
+
+${BUILDDIR_GCOV}/${BINDIR}/${PROJECT}: ${OBJECTS_GCOV}
 	$(call colorecho,CC,$@)
-	$(QUIET)${CC} ${SFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${LIBS}
+	@mkdir -p ${BUILDDIR_GCOV}/${BINDIR}
+	$(QUIET)${CC} ${SFLAGS} ${LDFLAGS} ${GCOV_CFLAGS} ${GCOV_LDFLAGS} \
+		-o ${BUILDDIR_GCOV}/${BINDIR}/${PROJECT} ${OBJECTS} ${LIBS}
+
+gcov: options ${BUILDDIR_GCOV}/${BINDIR}/${PROJECT}
+	$(QUIET)${MAKE} -C tests run-gcov
+	$(call colorecho,LCOV,"Analyse data")
+	$(QUIET)${LCOV_EXEC} ${LCOV_FLAGS}
+	$(call colorecho,LCOV,"Generate report")
+	$(QUIET)${GENHTML_EXEC} ${GENHTML_FLAGS}
+
+run-gcov: ${BUILDDIR_GCOV}/${BINDIR}/${PROJECT}
+	$(QUIET)./${BUILDDIR_GCOV}/${BINDIR}/${PROJECT}
+
+# clean

 clean:
-	$(QUIET)rm -rf ${PROJECT} \
-		${OBJECTS} \
+	$(QUIET)rm -rf \
+		${BUILDDIR} \
+		${DEPENDDIR} \
 		${TARFILE} \
 		${TARDIR} \
-		${DOBJECTS} \
-		${PROJECT}-debug \
-		.depend \
 		${PROJECT}.pc \
 		version.h \
 		version.h.tmp \
-		dbus-interface-definitions.c \
-		dbus-interface-definitions.c.tmp \
-		css-definitions.c \
-		css-definitions.c.tmp \
-		*gcda *gcno $(PROJECT).info gcov *.tmp \
+		${PROJECT}/dbus-interface-definitions.c \
+		${PROJECT}/dbus-interface-definitions.c.tmp \
+		${PROJECT}/css-definitions.c \
+		${PROJECT}/css-definitions.c.tmp \
+		$(PROJECT).info \
+		gcov \
 		.version-checks
 	$(QUIET)$(MAKE) -C tests clean
 	$(QUIET)$(MAKE) -C po clean
 	$(QUIET)$(MAKE) -C doc clean

-${PROJECT}-debug: ${DOBJECTS}
-	$(call colorecho,CC,$@)
-	$(QUIET)${CC} ${LDFLAGS} -o $@ ${DOBJECTS} ${LIBS}
-
-debug: ${PROJECT}-debug
-
 ${PROJECT}.pc: ${PROJECT}.pc.in config.mk
 	$(QUIET)echo project=${PROJECT} > ${PROJECT}.pc
 	$(QUIET)echo version=${VERSION} >> ${PROJECT}.pc
@@ -170,12 +230,6 @@ dist: clean build-manpages
 doc:
 	$(QUIET)make -C doc

-gcov: clean
-	$(QUIET)CFLAGS="${CFLAGS} -fprofile-arcs -ftest-coverage" LDFLAGS="${LDFLAGS} -fprofile-arcs" ${MAKE} $(PROJECT)
-	$(QUIET)CFLAGS="${CFLAGS} -fprofile-arcs -ftest-coverage" LDFLAGS="${LDFLAGS} -fprofile-arcs" ${MAKE} -C tests run
-	$(QUIET)lcov --directory . --capture --output-file $(PROJECT).info
-	$(QUIET)genhtml --output-directory gcov $(PROJECT).info
-
 po:
 	$(QUIET)${MAKE} -C po

@@ -217,7 +271,7 @@ install-appdata:
 install: all install-headers install-manpages install-dbus install-appdata
 	$(call colorecho,INSTALL,"executeable file")
 	$(QUIET)mkdir -m 755 -p ${DESTDIR}${PREFIX}/bin
-	$(QUIET)install -m 755 ${PROJECT} ${DESTDIR}${PREFIX}/bin
+	$(QUIET)install -m 755 ${BUILDDIR_RELEASE}/${BINDIR}/${PROJECT} ${DESTDIR}${PREFIX}/bin
 	$(QUIET)mkdir -m 755 -p ${DESTDIR}${DESKTOPPREFIX}
 	$(call colorecho,INSTALL,"desktop file")
 	$(QUIET)install -m 644 ${PROJECT}.desktop ${DESTDIR}${DESKTOPPREFIX}

--- a/config.mk
+++ b/config.mk
@@ -6,7 +6,7 @@ PROJECT = zathura

 ZATHURA_VERSION_MAJOR = 0
 ZATHURA_VERSION_MINOR = 3
-ZATHURA_VERSION_REV = 1
+ZATHURA_VERSION_REV = 2
 # If the API changes, the API version and the ABI version have to be bumped.
 ZATHURA_API_VERSION = 2
 # If the ABI breaks for any reason, this has to be bumped.
@@ -50,6 +50,12 @@ LIBDIR ?= ${PREFIX}/lib
 INCLUDEDIR ?= ${PREFIX}/include
 DBUSINTERFACEDIR ?= ${PREFIX}/share/dbus-1/interfaces
 VIMFTPLUGINDIR ?= ${PREFIX}/share/vim/addons/ftplugin
+DEPENDDIR ?= .depend
+BUILDDIR ?= build
+BUILDDIR_RELEASE ?= ${BUILDDIR}/release
+BUILDDIR_DEBUG ?= ${BUILDDIR}/debug
+BUILDDIR_GCOV ?= ${BUILDDIR}/gcov
+BINDIR ?= bin

 # plugin directory
 PLUGINDIR ?= ${LIBDIR}/zathura
@@ -111,6 +117,16 @@ SFLAGS ?= -s
 # msgfmt
 MSGFMT ?= msgfmt

+# gcov & lcov
+GCOV_CFLAGS=-fprofile-arcs -ftest-coverage
+GCOV_LDFLAGS=-fprofile-arcs
+LCOV_OUTPUT=gcov
+LCOV_EXEC=lcov
+LCOV_FLAGS=--base-directory . --directory ${BUILDDIR_GCOV} --capture --rc \
+					 lcov_branch_coverage=1 --output-file ${BUILDDIR_GCOV}/$(PROJECT).info
+GENHTML_EXEC=genhtml
+GENHTML_FLAGS=--rc lcov_branch_coverage=1 --output-directory ${LCOV_OUTPUT} ${BUILDDIR_GCOV}/$(PROJECT).info
+
 # valgrind
 VALGRIND = valgrind
 VALGRIND_ARGUMENTS = --tool=memcheck --leak-check=yes --leak-resolution=high \

--- a/doc/Makefile
+++ b/doc/Makefile
@@ -7,7 +7,7 @@ include config.mk

 MAN_SOURCES=$(wildcard man/*.rst) $(wildcard man/*.txt) man/conf.py
 DOXYGEN_SOURCES=$(wildcard ../*.h) Doxyfile
-HTML_SORUCES=$(wildcard *.rst api/*.rst configuration/*.rst installation/*.rst usage/*.rst) conf.py
+HTML_SOURCES=$(wildcard *.rst api/*.rst configuration/*.rst installation/*.rst usage/*.rst) conf.py

 SPHINX_OPTS+=-d $(SPHINX_BUILDDIR)/doctrees


--- a/doc/man/_options.txt
+++ b/doc/man/_options.txt
-x, --reparent=xid
+-e, --reparent=xid
  Reparents to window specified by xid

 -c, --config-dir=path

--- a/doc/man/_synopsis.txt
+++ b/doc/man/_synopsis.txt
-zathura [-e XID] [-c PATH] [-d PATH] [-p PATH] [-w PASSWORD] [-p NUMBER]
+zathura [-e XID] [-c PATH] [-d PATH] [-p PATH] [-w PASSWORD] [-P NUMBER]
 [--fork] [-l LEVEL] [-s] [-x CMD] [--synctex-forward INPUT] <files>
--- a/doc/man/zathurarc.5.rst
+++ b/doc/man/zathurarc.5.rst
@@ -699,6 +699,18 @@ consuming a significant portion of the system memory.
 * Value type: Integer
 * Default value: 15

+page-thumbnail-size
+^^^^^^^^^^^^^^^^^^^
+Defines the maximum size in pixels of the thumbnail that could be kept in the
+thumbnail cache per page. The thumbnail is scaled for a quick preview during
+zooming before the page is rendered. When the page is rendered, the result is
+saved as the thumbnail only if the size is no more than this value. A larger
+value increases quality but introduces longer delay in zooming and uses more
+system memory.
+
+* Value type: Integer
+* Default value: 4194304 (4M)
+
 pages-per-row
 ^^^^^^^^^^^^^
 Defines the number of pages that are rendered next to each other in a row.

--- a/doc/usage/index.rst
+++ b/doc/usage/index.rst
-.. zathura documentation master file, created by
-   sphinx-quickstart on Tue Apr  8 18:33:05 2014.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-Welcome to zathura's documentation!
-===================================
+Usage
+======

 .. toctree::
   :maxdepth: 2
   :numbered:

-   installation/index
-   usage/index
-   configuration/index
-   api/index
-   faq
-
-.. toctree::
-   :hidden:
-
-  man/zathura.1
-  man/zathurarc.5
+    commands
--- a/po/Makefile
+++ b/po/Makefile
@@ -19,10 +19,10 @@ all: ${MOS}
 clean:
 	$(QUIET)rm -rf POTFILES.in POTFILES.in.tmp $(patsubst %.po, %, $(CATALOGS)) ${PROJECT}.pot

-POTFILES.in: $(wildcard ../*.c)
+POTFILES.in: $(wildcard ../zathura/*.c)
 	$(QUIET) set -e && rm -f $@.tmp && touch $@.tmp && \
 	for f in $(^F) ; do \
-		echo $$f >> $@.tmp ; \
+		echo zathura/$$f >> $@.tmp ; \
 	done && \
 	mv $@.tmp $@


--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zathura\n"
 "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n"
-"POT-Creation-Date: 2014-10-08 15:33+0200\n"
+"POT-Creation-Date: 2014-11-08 12:31+0100\n"
 "PO-Revision-Date: 2014-10-08 15:39+0100\n"
 "Last-Translator: Sebastian Ramacher <sebastian+dev@ramacher.at>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/zathura/language/"
@@ -20,558 +20,565 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.5.4\n"

-#: ../print.c:64 ../print.c:211
+#: ../zathura/print.c:64 ../zathura/print.c:211
 #, c-format
 msgid "Printing failed: %s"
 msgstr ""

-#: ../shortcuts.c:414 ../shortcuts.c:1221 ../shortcuts.c:1250
-#: ../shortcuts.c:1277 ../commands.c:36 ../commands.c:76 ../commands.c:103
-#: ../commands.c:152 ../commands.c:268 ../commands.c:298 ../commands.c:324
-#: ../commands.c:422 ../commands.c:549
+#: ../zathura/callbacks.c:232
+#, c-format
+msgid "'%s' must not be 0. Set to 1."
+msgstr ""
+
+#: ../zathura/callbacks.c:309
+#, c-format
+msgid "Invalid input '%s' given."
+msgstr "Entrada invàlida '%s'."
+
+#: ../zathura/callbacks.c:345
+#, c-format
+msgid "Invalid index '%s' given."
+msgstr "Índex invàlid '%s'."
+
+#: ../zathura/callbacks.c:584
+#, c-format
+msgid "Copied selected text to clipboard: %s"
+msgstr "Copiat el text seleccionat al porta-retalls: %s"
+
+#: ../zathura/commands.c:36 ../zathura/commands.c:76 ../zathura/commands.c:103
+#: ../zathura/commands.c:152 ../zathura/commands.c:268
+#: ../zathura/commands.c:298 ../zathura/commands.c:324
+#: ../zathura/commands.c:422 ../zathura/commands.c:549
+#: ../zathura/shortcuts.c:415 ../zathura/shortcuts.c:1222
+#: ../zathura/shortcuts.c:1251 ../zathura/shortcuts.c:1278
 msgid "No document opened."
 msgstr "No s'ha obert cap document."

-#: ../shortcuts.c:1131
-msgid "This document does not contain any index"
-msgstr "Aquest document no conté cap índex"
-
-#: ../commands.c:42 ../commands.c:82 ../commands.c:109 ../commands.c:427
+#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109
+#: ../zathura/commands.c:427
 msgid "Invalid number of arguments given."
 msgstr "Nombre d'arguments invàlids."

-#: ../commands.c:53
+#: ../zathura/commands.c:53
 #, c-format
 msgid "Could not update bookmark: %s"
 msgstr "No s'ha pogut crear el marcador: %s"

-#: ../commands.c:55
+#: ../zathura/commands.c:55
 #, c-format
 msgid "Could not create bookmark: %s"
 msgstr "No s'ha pogut crear el marcador: %s"

-#: ../commands.c:60
+#: ../zathura/commands.c:60
 #, c-format
 msgid "Bookmark successfully updated: %s"
 msgstr "Marcador actualitzat correctament: %s"

-#: ../commands.c:62
+#: ../zathura/commands.c:62
 #, c-format
 msgid "Bookmark successfully created: %s"
 msgstr "Marcador creat correctament: %s"

-#: ../commands.c:88
+#: ../zathura/commands.c:88
 #, c-format
 msgid "Removed bookmark: %s"
 msgstr "Esborrat el marcador: %s"

-#: ../commands.c:90
+#: ../zathura/commands.c:90
 #, c-format
 msgid "Failed to remove bookmark: %s"
 msgstr "No s'ha pogut esborrar el marcador: %s"

-#: ../commands.c:116
+#: ../zathura/commands.c:116
 #, c-format
 msgid "No such bookmark: %s"
 msgstr "Marcador no existent: %s"

-#: ../commands.c:162
+#: ../zathura/commands.c:162
 msgid "Title"
 msgstr ""

-#: ../commands.c:163
+#: ../zathura/commands.c:163
 msgid "Author"
 msgstr ""

-#: ../commands.c:164
+#: ../zathura/commands.c:164
 msgid "Subject"
 msgstr ""

-#: ../commands.c:165
+#: ../zathura/commands.c:165
 msgid "Keywords"
 msgstr ""

-#: ../commands.c:166
+#: ../zathura/commands.c:166
 msgid "Creator"
 msgstr ""

-#: ../commands.c:167
+#: ../zathura/commands.c:167
 msgid "Producer"
 msgstr ""

-#: ../commands.c:168
+#: ../zathura/commands.c:168
 msgid "Creation date"
 msgstr ""

-#: ../commands.c:169
+#: ../zathura/commands.c:169
 msgid "Modification date"
 msgstr ""

-#: ../commands.c:174 ../commands.c:196
+#: ../zathura/commands.c:174 ../zathura/commands.c:196
 msgid "No information available."
 msgstr "Cap informació disponible."

-#: ../commands.c:234
+#: ../zathura/commands.c:234
 msgid "Too many arguments."
 msgstr "Massa arguments."

-#: ../commands.c:245
+#: ../zathura/commands.c:245
 msgid "No arguments given."
 msgstr "Cap argument subministrat."

-#: ../commands.c:304 ../commands.c:330
+#: ../zathura/commands.c:304 ../zathura/commands.c:330
 msgid "Document saved."
 msgstr "Document desat."

-#: ../commands.c:306 ../commands.c:332
+#: ../zathura/commands.c:306 ../zathura/commands.c:332
 msgid "Failed to save document."
 msgstr "No s'ha pogut desar el document."

-#: ../commands.c:309 ../commands.c:335
+#: ../zathura/commands.c:309 ../zathura/commands.c:335
 msgid "Invalid number of arguments."
 msgstr "Nombre d'arguments invàlids."

-#: ../commands.c:446
+#: ../zathura/commands.c:446
 #, c-format
 msgid "Couldn't write attachment '%s' to '%s'."
 msgstr "No s'ha pogut escriure el fitxer adjunt '%s' a '%s'."

-#: ../commands.c:448
+#: ../zathura/commands.c:448
 #, c-format
 msgid "Wrote attachment '%s' to '%s'."
 msgstr "S'ha escrit el fitxer adjunt '%s' a '%s'."

-#: ../commands.c:492
+#: ../zathura/commands.c:492
 #, c-format
 msgid "Wrote image '%s' to '%s'."
 msgstr "S'ha escrit la imatge '%s' a '%s'."

-#: ../commands.c:494
+#: ../zathura/commands.c:494
 #, c-format
 msgid "Couldn't write image '%s' to '%s'."
 msgstr "No s'ha pogut escriure la imatge '%s' a '%s'."

-#: ../commands.c:501
+#: ../zathura/commands.c:501
 #, c-format
 msgid "Unknown image '%s'."
 msgstr "Imatge desconeguda '%s'."

-#: ../commands.c:505
+#: ../zathura/commands.c:505
 #, c-format
 msgid "Unknown attachment or image '%s'."
 msgstr "Imatge o fitxer adjunt desconegut '%s'."

-#: ../commands.c:562
+#: ../zathura/commands.c:562
 msgid "Argument must be a number."
 msgstr "L'argument ha de ser un nombre."

-#: ../page-widget.c:529
+#: ../zathura/page-widget.c:561
 msgid "Loading..."
 msgstr "Carregant..."

-#: ../page-widget.c:891
+#: ../zathura/page-widget.c:1006
 msgid "Copy image"
 msgstr "Copia la imatge"

-#: ../page-widget.c:892
+#: ../zathura/page-widget.c:1007
 msgid "Save image as"
 msgstr "Desa imatge com a"

-#: ../links.c:202 ../links.c:281
+#: ../zathura/main.c:56
+msgid "Reparents to window specified by xid"
+msgstr "Reassigna a la finestra especificada per xid"
+
+#: ../zathura/main.c:58
+msgid "Path to the config directory"
+msgstr "Ruta al directori de configuració"
+
+#: ../zathura/main.c:59
+msgid "Path to the data directory"
+msgstr "Camí al directori de dades"
+
+#: ../zathura/main.c:60