Merge branch 'release/0.3.4'

6218ee88 · Moritz Lipp · d9e74bb1 · ae20f729 · 6218ee88 · 6218ee88
Commit 6218ee88 authored Dec 21, 2015 by Moritz Lipp
--- a/.gitignore
+++ b/.gitignore
@@ -24,13 +24,10 @@ zathura-*.tar.gz
 # build dirs
 .depend
 .tx
+build/
 gcov/
 doc/_build

-# binaries
-zathura
-zathura-debug
-
 # version file
 version.h
 .version-checks/

--- a/Makefile
+++ b/Makefile
@@ -21,20 +21,10 @@ LIBS     += $(MAGIC_LIB)
 CPPFLAGS += -DWITH_MAGIC
 endif

-ifneq ($(WITH_SYSTEM_SYNCTEX),0)
-INCS   += $(SYNCTEX_INC)
-LIBS   += $(SYNCTEX_LIB)
-else
-INCS   += $(ZLIB_INC)
-LIBS   += $(ZLIB_LIB)
-SOURCE += $(wildcard ${PROJECT}/synctex/*.c)
-
-ifeq (,$(findstring -Isynctex,${CPPFLAGS}))
-CPPFLAGS += -I${PROJECT}/synctex
-endif
-ifeq (,$(findstring -DSYNCTEX_VERBOSE=0,${CPPFLAGS}))
-CPPFLAGS += -DSYNCTEX_VERBOSE=0
-endif
+ifneq ($(WITH_SYNCTEX),0)
+INCS     += $(SYNCTEX_INC)
+LIBS     += $(SYNCTEX_LIB)
+CPPFLAGS += -DWITH_SYNCTEX
 endif

 ifneq ($(wildcard ${VALGRIND_SUPPRESSION_FILE}),)
@@ -111,9 +101,9 @@ ${OBJECTS}: config.mk ${PROJECT}/version.h \

 ${BUILDDIR_RELEASE}/%.o: %.c
 	$(call colorecho,CC,$<)
-	@mkdir -p ${DEPENDDIR}/$(dir $(abspath $@))
+	@mkdir -p ${DEPENDDIR}/$(dir $@)
 	@mkdir -p $(dir $(abspath $@))
-	$(QUIET)${CC} -c ${CPPFLAGS} ${CFLAGS} -o $@ $< -MMD -MF ${DEPENDDIR}/$(abspath $@).dep
+	$(QUIET)${CC} -c ${CPPFLAGS} ${CFLAGS} -o $@ $< -MMD -MF ${DEPENDDIR}/$@.dep

 ${BUILDDIR_RELEASE}/${BINDIR}/${PROJECT}: ${OBJECTS}
 	$(call colorecho,CC,$@)
@@ -135,10 +125,10 @@ ${OBJECTS_DEBUG}: config.mk ${PROJECT}/version.h \

 ${BUILDDIR_DEBUG}/%.o: %.c
 	$(call colorecho,CC,$<)
-	@mkdir -p ${DEPENDDIR}/$(dir $(abspath $@))
+	@mkdir -p ${DEPENDDIR}/$(dir $@)
 	@mkdir -p $(dir $(abspath $@))
 	$(QUIET)${CC} -c ${CPPFLAGS} ${CFLAGS} ${DFLAGS} \
-		-o $@ $< -MMD -MF ${DEPENDDIR}/$(abspath $@).dep
+		-o $@ $< -MMD -MF ${DEPENDDIR}/$@.dep

 ${BUILDDIR_DEBUG}/${BINDIR}/${PROJECT}: ${OBJECTS_DEBUG}
 	$(call colorecho,CC,$@)
@@ -158,10 +148,10 @@ ${OBJECTS_GCOV}: config.mk ${PROJECT}/version.h \

 ${BUILDDIR_GCOV}/%.o: %.c
 	$(call colorecho,CC,$<)
-	@mkdir -p ${DEPENDDIR}/$(dir $(abspath $@))
+	@mkdir -p ${DEPENDDIR}/$(dir $@)
 	@mkdir -p $(dir $(abspath $@))
 	$(QUIET)${CC} -c ${CPPFLAGS} ${CFLAGS} ${GCOV_CFLAGS} \
-		-o $@ $< -MMD -MF ${DEPENDDIR}/$(abspath $@).dep
+		-o $@ $< -MMD -MF ${DEPENDDIR}/$@.dep

 ${BUILDDIR_GCOV}/${BINDIR}/${PROJECT}: ${OBJECTS_GCOV}
 	$(call colorecho,CC,$@)
@@ -298,7 +288,8 @@ uninstall: uninstall-headers
 	$(QUIET)rm -f $(DESTDIR)$(APPDATAPREFIX)/$(PROJECT).appdata.xml
 	$(MAKE) -C po uninstall

-include $(wildcard ${DEPENDDIR}/*.dep)
+DEPENDS = ${DEPENDDIRS:^=${DEPENDDIR}/}$(addprefix ${DEPENDDIR}/,${OBJECTS:.o=.o.dep})
+-include ${DEPENDS}

 .PHONY: all options clean doc debug valgrind gdb dist doc install uninstall \
 	test po install-headers uninstall-headers update-po install-manpages \

--- a/README
+++ b/README
@@ -5,13 +5,14 @@ girara user interface library and several document libraries.

 Requirements
 ------------
-gtk3
-glib (>= 2.28)
+gtk3 (>= 3.6)
+glib (>= 2.32)
 girara (>= 0.2.4)
 sqlite3 (optional, >= 3.5.9)
 check (for tests)
 intltool
 libmagic from file(1) (optional, for mime-type detection)
+libsynctex from TeXLive (option, for SyncTeX support)
 Sphinx (optional, for manpages and HTML documentation)
 doxygen (optional, for HTML documentation)
 breathe (optional, for HTML documentation)
@@ -24,7 +25,7 @@ SQLITE_INC and SQLITE_LIB variables accordingly.

 Also note that Sphinx is needed to build the manpages.  If it is not
 installed, the man pages won't be built. For the HTML documentation, doxygen,
-breathe and sphinx_rtd_theme are needed in additioan to Sphinx.
+breathe and sphinx_rtd_theme are needed in addition to Sphinx.

 If you don't want to build with support for sqlite databases, you can set
 WITH_SQLITE=0 and sqlite support won't be available.
@@ -35,7 +36,7 @@ WITH_MAGIC=0.
 If you pass these flags as a command line argument to make, you have to ensure
 to pass the same flags when executing the install target.

-If you want to build zathuras documentation, please install all python
+If you want to build zathura's documentation, please install all python
 dependencies from the ./doc/requirements.txt file.

 Installation

--- a/colors.mk
+++ b/colors.mk
 # See LICENSE file for license and copyright information
-#

+ifeq ($(COLOR),1)
+# GCC diagnostics colors
+DIAGNOSTICS_COLOR_AVAILABLE ?= $(shell ($(CC) -fdiagnostics-color=always -E - </dev/null >/dev/null 2>/dev/null && echo 1) || echo 0)
+ifeq ($(DIAGNOSTICS_COLOR_AVAILABLE),1)
+CPPFLAGS     += -fdiagnostics-color=always
+endif
+
+# colorful output
 TPUT ?= /usr/bin/tput
 TPUT_AVAILABLE ?= $(shell ${TPUT} -V 2>/dev/null)

 ifdef TPUT_AVAILABLE
-ifeq ($(COLOR),1)
 COLOR_NORMAL  = `$(TPUT) sgr0`
 COLOR_ACTION  = `$(TPUT) bold``$(TPUT) setaf 3`
 COLOR_COMMENT = `$(TPUT) bold``$(TPUT) setaf 2`
 COLOR_BRACKET = `$(TPUT) setaf 4`
-CC           += -fdiagnostics-color=always
 define colorecho
 	@echo $(COLOR_BRACKET)" ["$(COLOR_ACTION)$1$(COLOR_BRACKET)"] "$(COLOR_COMMENT)$2$(COLOR_BRACKET) $(COLOR_NORMAL)
 endef

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

 ZATHURA_VERSION_MAJOR = 0
 ZATHURA_VERSION_MINOR = 3
-ZATHURA_VERSION_REV = 3
+ZATHURA_VERSION_REV = 4
 # 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.
@@ -18,15 +18,15 @@ VERSION = ${ZATHURA_VERSION_MAJOR}.${ZATHURA_VERSION_MINOR}.${ZATHURA_VERSION_RE

 # girara
 GIRARA_VERSION_CHECK ?= 1
-GIRARA_MIN_VERSION = 0.2.4
+GIRARA_MIN_VERSION = 0.2.5
 GIRARA_PKG_CONFIG_NAME = girara-gtk3
 # glib
 GLIB_VERSION_CHECK ?= 1
-GLIB_MIN_VERSION = 2.28
+GLIB_MIN_VERSION = 2.32
 GLIB_PKG_CONFIG_NAME = glib-2.0
 # GTK
 GTK_VERSION_CHECK ?= 1
-GTK_MIN_VERSION = 3.0
+GTK_MIN_VERSION = 3.6
 GTK_PKG_CONFIG_NAME = gtk+-3.0

 # pkg-config binary
@@ -37,8 +37,8 @@ PKG_CONFIG ?= pkg-config
 WITH_SQLITE ?= $(shell (${PKG_CONFIG} --atleast-version=3.5.9 sqlite3 && echo 1) || echo 0)

 # synctex
-# To use the embedded copy of the syntex parser set WITH_SYSTEM_SYNCTEX to 0.
-WITH_SYSTEM_SYNCTEX ?= $(shell (${PKG_CONFIG} synctex && echo 1) || echo 0)
+# To disable support for synctex with libsynctex set WITH_SYNCTEX to 0.
+WITH_SYNCTEX ?= $(shell (${PKG_CONFIG} synctex && echo 1) || echo 0)

 # mimetype detection
 # To disable support for mimetype detction with libmagic set WITH_MAGIC to 0.
@@ -91,24 +91,24 @@ MAGIC_INC ?=
 MAGIC_LIB ?= -lmagic
 endif

-ifneq ($(WITH_SYSTEM_SYNCTEX),0)
+ifneq ($(WITH_SYNCTEX),0)
 SYNCTEX_INC ?= $(shell ${PKG_CONFIG} --cflags synctex)
 SYNCTEX_LIB ?= $(shell ${PKG_CONFIG} --libs synctex)
-else
-ZLIB_INC ?= $(shell ${PKG_CONFIG} --cflags zlib)
-ZLIB_LIB ?= $(shell ${PKG_CONFIG} --libs zlib)
 endif

 INCS = ${GIRARA_INC} ${GTK_INC} ${GTHREAD_INC} ${GMODULE_INC} ${GLIB_INC}
 LIBS = ${GIRARA_LIB} ${GTK_LIB} ${GTHREAD_LIB} ${GMODULE_LIB} ${GLIB_LIB} -lpthread -lm

-# flags
-CFLAGS += -std=c99 -pedantic -Wall -Wno-format-zero-length -Wextra $(INCS)
+# pre-processor flags
+CPPFLAGS += -D_FILE_OFFSET_BITS=64
+
+# compiler flags
+CFLAGS += -std=c11 -pedantic -Wall -Wno-format-zero-length -Wextra $(INCS)

 # debug
 DFLAGS ?= -g

-# ld
+# linker flags
 LDFLAGS += -rdynamic

 # compiler
@@ -139,6 +139,9 @@ VALGRIND_SUPPRESSION_FILE = zathura.suppression
 # set to something != 0 if you want verbose build output
 VERBOSE ?= 0

+# gettext package name
+GETTEXT_PACKAGE ?= ${PROJECT}
+
 # colors
 COLOR ?= 1


--- a/data/zathura.appdata.xml
+++ b/data/zathura.appdata.xml
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 pwmt.org -->
+<!-- Copyright 2014-2015 pwmt.org -->

-<application>
-  <id type="desktop">zathura.desktop</id>
+<component type="desktop">
+  <id>zathura.desktop</id>
  <metadata_license>CC0-1.0</metadata_license>
  <project_license>Zlib</project_license>
  <description>
@@ -22,12 +22,21 @@
      </ul>
    </p>
  </description>
-  <url type="homepage">http://pwmt.org/projects/zathura</url>
+  <url type="homepage">https://pwmt.org/projects/zathura</url>
+  <url type="bugtracker">https://bugs.pwmt.org/project/zathura</url>
  <screenshots>
-    <screenshot type="default">http://pwmt.org/projects/zathura/img/zathura-cover.png</screenshot>
-    <screenshot>http://pwmt.org/projects/zathura/img/zathura-completion.png</screenshot>
-    <screenshot>http://pwmt.org/projects/zathura/img/zathura-follow.png</screenshot>
-    <screenshot>http://pwmt.org/projects/zathura/img/zathura-bookmarks.png</screenshot>
+    <screenshot type="default">
+      <image>https://pwmt.org/projects/zathura/img/zathura-cover.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://pwmt.org/projects/zathura/img/zathura-completion.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://pwmt.org/projects/zathura/img/zathura-follow.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://pwmt.org/projects/zathura/img/zathura-bookmarks.png</image>
+    </screenshot>
  </screenshots>
-  <updatecontact>zathura@lists.pwmt.org</updatecontact>
-</application>
+  <update_contact>zathura@lists.pwmt.org</update_contact>
+</component>
--- a/doc/man/conf.py
+++ b/doc/man/conf.py
@@ -2,11 +2,25 @@
 #
 # See LICENSE file for license and copyright information

+import os.path
+import glob
+import time
+
+dirname = os.path.dirname(__file__)
+files = glob.glob(os.path.join(dirname, '*.rst'))
+files.extend(glob.glob(os.path.join(dirname, '*.txt')))
+
+maxdate = 0
+for path in files:
+    s = os.stat(path)
+    maxdate = max(maxdate, s.st_mtime)
+
 # -- General configuration ------------------------------------------------

 source_suffix  = '.rst'
 master_doc     = 'zathura.1'
 templates_path = ['_templates']
+today          = time.strftime('%Y-%m-%d', time.gmtime(maxdate))

 # -- Project configuration ------------------------------------------------


--- a/doc/man/zathurarc.5.rst
+++ b/doc/man/zathurarc.5.rst
@@ -74,9 +74,9 @@ the *zathurarc* file to make those changes permanent:

 include - Including another config file
 ---------------------------------------
-This commands allows to include other configuration files. If a relative path is
-given, the path will be resolved relative to the configuration file that is
-currently processed.
+This commands allows one to include other configuration files. If a relative
+path is given, the path will be resolved relative to the configuration file that
+is currently processed.

 ::

@@ -731,9 +731,12 @@ Defines the number of pages that are rendered next to each other in a row.
 first-page-column
 ^^^^^^^^^^^^^^^^^
 Defines the column in which the first page will be displayed.
+This setting is stored separately for every value of pages-per-row according to
+the following pattern <1 page per row>:[<2 pages per row>[: ...]]. Per default,
+the first column is set to 2 for double-page layout.

-* Value type: Integer
-* Default value: 1
+* Value type: String
+* Default value: 1:2

 recolor
 ^^^^^^^
@@ -820,6 +823,30 @@ Defines if the last/first page should be wrapped
 * Value type: Boolean
 * Default value: false

+
+show-directories
+^^^^^^^^^^^^^^^^
+Defines if the directories should be displayed in completion.
+
+* Value type: Boolean
+* Default value: true
+
+show-hidden
+^^^^^^^^^^^
+Defines if hidden files and directories should be displayed in completion.
+
+* Value type: Boolean
+* Default value: false
+
+show-recent
+^^^^^^^^^^^
+Defines the number of recent files that should be displayed in completion.
+If the value is negative, no upper bounds are applied. If the value is 0, no
+recent files are shown.
+
+* Value type: Integer
+* Default value: 10
+
 scroll-page-aware
 ^^^^^^^^^^^^^^^^^
 Defines if scrolling by half or full pages stops at page boundaries.
@@ -863,6 +890,13 @@ Use basename of the file in the window title.
 * Value type: Boolean
 * Default value: false

+window-title-home-tilde
+^^^^^^^^^^^^^^^^^^^^^^^
+Display a short version of the file path, which replaces $HOME with ~, in the window title.
+
+* Value type: Boolean
+* Default value: false
+
 window-title-page
 ^^^^^^^^^^^^^^^^^
 Display the page number in the window title.
@@ -877,6 +911,13 @@ Use basename of the file in the statusbar.
 * Value type: Boolean
 * Default value: false

+statusbar-home-tilde
+^^^^^^^^^^^^^^^^^^^^
+Display a short version of the file path, which replaces $HOME with ~, in the statusbar.
+
+* Value type: Boolean
+* Default value: false
+
 zoom-center
 ^^^^^^^^^^^
 En/Disables horizontally centered zooming.

--- a/po/Makefile
+++ b/po/Makefile
 # See LICENSE file for license and copyright information

-PROJECT = zathura
-GETTEXT_PACKAGE = $(PROJECT)
-CATALOGS  = $(wildcard *.po)
-LINGUAS  ?= $(patsubst %.po, %, $(CATALOGS))
+include ../config.mk
+include ../common.mk
+include ../colors.mk
+
+PROJECT  = zathura
+CATALOGS = $(sort $(wildcard *.po))
+LINGUAS ?= $(patsubst %.po, %, $(CATALOGS))
 ifeq ($(LINGUAS),)
 ALINGUAS =
 else
 ALINGUAS = $(shell find $(patsubst %, %.po, $(LINGUAS)) 2>/dev/null)
 endif
-MOS = $(patsubst %, %/LC_MESSAGES/${GETTEXT_PACKAGE}.mo, $(patsubst %.po, %, $(ALINGUAS)))
-
-include ../config.mk
-include ../common.mk
+MOS      = $(patsubst %, %/LC_MESSAGES/${GETTEXT_PACKAGE}.mo, $(patsubst %.po, %, $(ALINGUAS)))

 all: ${MOS}

 clean:
 	$(QUIET)rm -rf POTFILES.in POTFILES.in.tmp $(patsubst %.po, %, $(CATALOGS)) ${PROJECT}.pot

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

-${PROJECT}.pot: POTFILES.in
-	$(ECHO) regenerate ${PROJECT}.pot
-	$(QUIET)intltool-update --pot --gettext-package=${PROJECT}
+${GETTEXT_PACKAGE}.pot: POTFILES.in
+	$(ECHO) regenerate $@
+	$(QUIET)intltool-update --pot --gettext-package=${GETTEXT_PACKAGE}

-update-po: ${PROJECT}.pot
-	$(ECHO) updating po: files ${CATALOGS}
+update-po: ${GETTEXT_PACKAGE}.pot
+	$(call colorecho,PO,"Updating po files ${CATALOGS}")
 	$(QUIET)set -e && for f in ${CATALOGS} ; do \
-		intltool-update --dist --gettext-package=${PROJECT} `echo $$f | sed 's/\.po//'` ; \
+		intltool-update --dist --gettext-package=${GETTEXT_PACKAGE} `echo $$f | sed 's/\.po//'` ; \
 		sed -i 's/Report-Msgid-Bugs-To: \\n/Report-Msgid-Bugs-To: http:\/\/bugs.pwmt.org\\n/'  "$$f" ; \
 	done

-%/LC_MESSAGES/${PROJECT}.mo: %.po
+%/LC_MESSAGES/${GETTEXT_PACKAGE}.mo: %.po
 	@mkdir -p $(@D)
-	$(ECHO) msgfmt $(shell echo $< | sed 's/\.po//')
+	$(call colorecho,MSGFMT,$(shell echo $< | sed 's/\.po//'))
 	$(QUIET)${MSGFMT} ${MSGFMTFLAGS} -c $< -o $@

 install: ${MOS}
-	$(ECHO) installing translations
+	$(call colorecho,INSTALL,"Install translations")
 	$(QUIET)set -e && for f in $^ ; do \
 		mkdir -p -m 755 $(DESTDIR)$(LOCALEDIR)/`dirname $$f`; \
 		install -m 644 $$f $(DESTDIR)$(LOCALEDIR)/`dirname $$f` ; \
 	done

 uninstall: ${MOS}
-	$(ECHO) removing translations
+	$(call colorecho,UNINSTALL,"Uninstall translations")
 	$(QUIET)set -e && for f in $^ ; do \
-		rm -f $(DESTDIR)$(LOCALEDIR)/$$f; \
+		rm -f $(LOCALEDIR)/$$f; \
 	done

-.PHONY: all clean update-po install uninstall
+.PHONY: all clean install uninstall update-po
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zathura\n"
 "Report-Msgid-Bugs-To: http://bugs.pwmt.org\n"
-"POT-Creation-Date: 2015-04-13 19:42+0200\n"
-"PO-Revision-Date: 2015-04-13 19:45+0200\n"
+"POT-Creation-Date: 2015-12-14 22:03+0100\n"
+"PO-Revision-Date: 2015-10-15 23:09+0200\n"
 "Last-Translator: Sebastian Ramacher <sebastian+dev@ramacher.at>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/zathura/language/"
 "ca/)\n"
@@ -18,28 +18,181 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.8.5\n"

 #: ../zathura/callbacks.c:233
 #, c-format
 msgid "'%s' must not be 0. Set to 1."
 msgstr ""

-#: ../zathura/callbacks.c:310
+#: ../zathura/callbacks.c:315
 #, c-format
 msgid "Invalid input '%s' given."
 msgstr "Entrada invàlida '%s'."

-#: ../zathura/callbacks.c:346
+#: ../zathura/callbacks.c:351
 #, c-format
 msgid "Invalid index '%s' given."
 msgstr "Índex invàlid '%s'."

-#: ../zathura/callbacks.c:588
+#: ../zathura/callbacks.c:594
 #, c-format
 msgid "Copied selected text to selection %s: %s"
 msgstr ""

+#: ../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:423 ../zathura/commands.c:550
+#: ../zathura/shortcuts.c:406 ../zathura/shortcuts.c:1216
+#: ../zathura/shortcuts.c:1245 ../zathura/shortcuts.c:1272
+msgid "No document opened."
+msgstr "No s'ha obert cap document."
+
+#: ../zathura/commands.c:42 ../zathura/commands.c:82 ../zathura/commands.c:109
+#: ../zathura/commands.c:428
+msgid "Invalid number of arguments given."
+msgstr "Nombre d'arguments invàlids."
+
+#: ../zathura/commands.c:53
+#, c-format
+msgid "Could not update bookmark: %s"
+msgstr "No s'ha pogut crear el marcador: %s"
+
+#: ../zathura/commands.c:55
+#, c-format
+msgid "Could not create bookmark: %s"
+msgstr "No s'ha pogut crear el marcador: %s"
+
+#: ../zathura/commands.c:60
+#, c-format
+msgid "Bookmark successfully updated: %s"
+msgstr "Marcador actualitzat correctament: %s"
+
+#: ../zathura/commands.c:62
+#, c-format
+msgid "Bookmark successfully created: %s"
+msgstr "Marcador creat correctament: %s"
+
+#: ../zathura/commands.c:88
+#, c-format
+msgid "Removed bookmark: %s"
+msgstr "Esborrat el marcador: %s"
+
+#: ../zathura/commands.c:90
+#, c-format
+msgid "Failed to remove bookmark: %s"
+msgstr "No s'ha pogut esborrar el marcador: %s"
+
+#: ../zathura/commands.c:116
+#, c-format
+msgid "No such bookmark: %s"
+msgstr "Marcador no existent: %s"
+
+#: ../zathura/commands.c:162
+msgid "Title"
+msgstr ""
+
+#: ../zathura/commands.c:163
+msgid "Author"
+msgstr ""
+
+#: ../zathura/commands.c:164
+msgid "Subject"
+msgstr ""
+
+#: ../zathura/commands.c:165
+msgid "Keywords"
+msgstr ""
+
+#: ../zathura/commands.c:166
+msgid "Creator"
+msgstr ""
+
+#: ../zathura/commands.c:167
+msgid "Producer"
+msgstr ""
+
+#: ../zathura/commands.c:168
+msgid "Creation date"
+msgstr ""
+
+#: ../zathura/commands.c:169
+msgid "Modification date"
+msgstr ""
+
+#: ../zathura/commands.c:174 ../zathura/commands.c:196
+msgid "No information available."
+msgstr "Cap informació disponible."
+
+#: ../zathura/commands.c:234
+msgid "Too many arguments."
+msgstr "Massa arguments."
+
+#: ../zathura/commands.c:245
+msgid "No arguments given."
+msgstr "Cap argument subministrat."
+
+#: ../zathura/commands.c:304 ../zathura/commands.c:330
+msgid "Document saved."
+msgstr "Document desat."
+
+#: ../zathura/commands.c:306 ../zathura/commands.c:332
+msgid "Failed to save document."
+msgstr "No s'ha pogut desar el document."
+
+#: ../zathura/commands.c:309 ../zathura/commands.c:335
+msgid "Invalid number of arguments."
+msgstr "Nombre d'arguments invàlids."
+
+#: ../zathura/commands.c:447
+#, c-format
+msgid "Couldn't write attachment '%s' to '%s'."
+msgstr "No s'ha pogut escriure el fitxer adjunt '%s' a '%s'."
+
+#: ../zathura/commands.c:449
+#, c-format
+msgid "Wrote attachment '%s' to '%s'."
+msgstr "S'ha escrit el fitxer adjunt '%s' a '%s'."
+
+#: ../zathura/commands.c:493
+#, c-format
+msgid "Wrote image '%s' to '%s'."
+msgstr "S'ha escrit la imatge '%s' a '%s'."
+
+#: ../zathura/commands.c:495
+#, c-format
+msgid "Couldn't write image '%s' to '%s'."
+msgstr "No s'ha pogut escriure la imatge '%s' a '%s'."
+
+#: ../zathura/commands.c:502
+#, c-format
+msgid "Unknown image '%s'."
+msgstr "Imatge desconeguda '%s'."
+
+#: ../zathura/commands.c:506
+#, c-format
+msgid "Unknown attachment or image '%s'."
+msgstr "Imatge o fitxer adjunt desconegut '%s'."
+
+#: ../zathura/commands.c:563
+msgid "Argument must be a number."
+msgstr "L'argument ha de ser un nombre."
+
+#: ../zathura/completion.c:285
+#, c-format
+msgid "Page %d"
+msgstr "Pàgina %d"
+
+#: ../zathura/completion.c:328
+msgid "Attachments"
+msgstr "Fitxers adjunts"
+
+#. add images
+#: ../zathura/completion.c:359