Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
pwmt
zathura
Commits
cd711c98
Commit
cd711c98
authored
Apr 18, 2016
by
Moritz Lipp
Browse files
Merge branch 'release/0.3.6'
parents
c124b180
eb5f4864
Pipeline
#133
skipped
Changes
40
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitignore
View file @
cd711c98
...
...
@@ -39,3 +39,5 @@ version.h
.frama-c
compile_commands.json
*.log
.ycm_extra_conf.py
_*/
config.mk
View file @
cd711c98
...
...
@@ -6,7 +6,7 @@ PROJECT = zathura
ZATHURA_VERSION_MAJOR
=
0
ZATHURA_VERSION_MINOR
=
3
ZATHURA_VERSION_REV
=
5
ZATHURA_VERSION_REV
=
6
# 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,7 +18,7 @@ VERSION = ${ZATHURA_VERSION_MAJOR}.${ZATHURA_VERSION_MINOR}.${ZATHURA_VERSION_RE
# girara
GIRARA_VERSION_CHECK
?=
1
GIRARA_MIN_VERSION
=
0.2.
5
GIRARA_MIN_VERSION
=
0.2.
6
GIRARA_PKG_CONFIG_NAME
=
girara-gtk3
# glib
GLIB_VERSION_CHECK
?=
1
...
...
doc/Makefile
View file @
cd711c98
...
...
@@ -22,11 +22,17 @@ $(SPHINX_BUILDDIR)/html/index.html: $(HTML_SOURCES) $(SPHINX_BUILDDIR)/doxygen/x
$(
call
colorecho,DOC,
"Build HTML documentation"
)
$(QUIET)$(SPHINX_BIN)
-b
html
$(SPHINX_OPTS)
.
$(SPHINX_BUILDDIR)
/html
$(SPHINX_BUILDDIR)/zathura.1
$(SPHINX_BUILDDIR)/zathurarc.5
:
$(MAN_SOURCES)
$(SPHINX_BUILDDIR)/zathura.1
:
$(MAN_SOURCES)
$(QUIET)
mkdir
-p
$(SPHINX_BUILDDIR)
$(
call
colorecho,DOC,
"Build man pages"
)
$(QUIET)$(SPHINX_BIN)
-b
man
$(SPHINX_OPTS)
man
$(SPHINX_BUILDDIR)
$(SPHINX_BUILDDIR)/zathurarc.5
:
$(SPHINX_BUILDDIR)/zathura.1
@
if
test
-f
$@
;
then
:
;
else
\
rm
-f
$(SPHINX_BUILDDIR)
/zathura.1
;
\
$(MAKE)
$(SPHINX_BUILDDIR)
/zathura.1
;
\
fi
$(SPHINX_BUILDDIR)/doxygen/xml/index.xml
:
$(DOXYGEN_SOURCES)
$(QUIET)
mkdir
-p
$(SPHINX_BUILDDIR)
/doxygen/xml
$(
call
colorecho,DOC,
"Run doxygen"
)
...
...
doc/configuration/options.rst
View file @
cd711c98
...
...
@@ -16,144 +16,144 @@ General settings
Defines which auto adjustment mode should be used if a document is
loaded. Possible options are "best-fit" and "width".
:type: String
:default: best-fit
:type: String
:default: best-fit
.. describe:: advance-ds-per-row
Defines if the number of pages per row should be honored when advancing
a page.
:type: Boolean
:default: true
:type: Boolean
:default: true
.. describe:: database
Defines the used database backend. Possible options are 'plain' and
'sqlite'
:type: String
:default: plain
:type: String
:default: plain
.. describe:: highlight-color
Defines the color that is used for highlighting parts of the document
(e.g.: show search results)
:type: String
:default: #9FBC00
:type: String
:default: #9FBC00
.. describe:: highlight-active-color
Defines the color that is used to show the current selected highlighted
element (e.g: current search result)
:type: String
:default: #00BC00
:type: String
:default: #00BC00
.. describe:: highlight-transparency
Defines the opacity of a highlighted element
:type: Float
:default: 0.5
:type: Float
:default: 0.5
.. describe:: page-padding
The page padding defines the gap in pixels between each rendered page.
:type: Integer
:default: 1
:type: Integer
:default: 1
.. describe:: page-store-threshold
Pages that are not visible get unloaded after some time. Every page that
has not been visible for page-store-treshold seconds will be unloaded.
:type: Integer
:default: 30
:type: Integer
:default: 30
.. describe:: page-store-interval
Defines the amount of seconds between the check to unload invisible
pages.
:type: Integer
:default: 30
:type: Integer
:default: 30
.. describe:: pages-per-row
Defines the number of pages that are rendered next to each other in a
row.
:type: Integer
:default: 1
:type: Integer
:default: 1
.. describe:: recolor
En/Disables recoloring
:type: Boolean
:default: false
:type: Boolean
:default: false
.. describe:: recolor-darkcolor
Defines the color value that is used to represent dark colors in
recoloring mode
:type: String
:default: #FFFFFF
:type: String
:default: #FFFFFF
.. describe:: recolor-lightcolor
Defines the color value that is used to represent light colors in
recoloring mode
:type: String
:default: #000000
:type: String
:default: #000000
.. describe:: render-loading
Defines if the "Loading..." text should be displayed if a page is
rendered.
:type: Boolean
:default: true
:type: Boolean
:default: true
.. describe:: scroll-step
Defines the step size of scrolling by calling the scroll command once
:type: Float
:default: 40
:type: Float
:default: 40
.. describe:: scroll-wrap
Defines if the last/first page should be wrapped
:type: Boolean
:default: false
:type: Boolean
:default: false
.. describe:: zoom-max
Defines the maximum percentage that the zoom level can be
:type: Integer
:default: 1000
:type: Integer
:default: 1000
.. describe:: zoom-min
Defines the minimum percentage that the zoom level can be
:type: Integer
:default: 10
:type: Integer
:default: 10
.. describe:: zoom-step
Defines the amount of percent that is zoomed in or out on each comand.
:type: Integer
:default: 10
:type: Integer
:default: 10
Girara settings
---------------
...
...
doc/man/zathurarc.5.rst
View file @
cd711c98
...
...
@@ -739,8 +739,11 @@ 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.
the following pattern <1 page per row>:[<2 pages per row>[: ...]]. The last
value in the list will be used for all other number of pages per row if not set
explicitely.
Per default, the first column is set to 2 for double-page layout.
* Value type: String
* Default value: 1:2
...
...
po/ca.po
View file @
cd711c98
...
...
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: zathura\n"
"Report-Msgid-Bugs-To: http://bugs.pwmt.org\n"
"POT-Creation-Date: 201
5-12
-1
4
2
2
:0
3
+0
1
00\n"
"PO-Revision-Date: 201
5-10
-1
5
2
3:09
+0200\n"
"POT-Creation-Date: 201
6-04
-1
8
2
1
:0
8
+0
2
00\n"
"PO-Revision-Date: 201
6-04
-1
8
2
1:11
+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,7 +18,7 @@ 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.8.
5
\n"
"X-Generator: Poedit 1.8.
7.1
\n"
#: ../zathura/callbacks.c:233
#, c-format
...
...
@@ -502,59 +502,59 @@ msgstr "Enllaç: %s"
msgid "Link: Invalid"
msgstr "Enllaç: Invàlid"
#: ../zathura/main.c:1
5
5
msgid "Reparents to window specified by xid"
msgstr "Reassigna a la finestra especificada per xid"
#: ../zathura/main.c:1
4
5
msgid "Reparents to window specified by xid
(X11)
"
msgstr "Reassigna a la finestra especificada per xid
(X11)
"
#: ../zathura/main.c:1
57
#: ../zathura/main.c:1
46
msgid "Path to the config directory"
msgstr "Ruta al directori de configuració"
#: ../zathura/main.c:1
58
#: ../zathura/main.c:1
47
msgid "Path to the data directory"
msgstr "Camí al directori de dades"
#: ../zathura/main.c:1
59
#: ../zathura/main.c:1
48
msgid "Path to the cache directory"
msgstr ""
#: ../zathura/main.c:1
60
#: ../zathura/main.c:1
49
msgid "Path to the directories containing plugins"
msgstr "Camí al directori que conté els plugins"
#: ../zathura/main.c:1
61
#: ../zathura/main.c:1
50
msgid "Fork into the background"
msgstr "Bifurca en segon pla"
#: ../zathura/main.c:1
62
#: ../zathura/main.c:1
51
msgid "Document password"
msgstr "Contrasenya del document"
#: ../zathura/main.c:1
63
#: ../zathura/main.c:1
52
msgid "Page number to go to"
msgstr ""
#: ../zathura/main.c:1
64
#: ../zathura/main.c:1
53
msgid "Log level (debug, info, warning, error)"
msgstr "Nivell de registre (depuració, informació, advertiments, errors)"
#: ../zathura/main.c:1
6
5
#: ../zathura/main.c:15
4
msgid "Print version information"
msgstr "Imprimeix informació sobre la versió"
#: ../zathura/main.c:16
7
#: ../zathura/main.c:1
5
6
msgid "Synctex editor (forwarded to the synctex command)"
msgstr "Editor synctex (reenviat a l'ordre synctex)"
#: ../zathura/main.c:1
68
#: ../zathura/main.c:1
57
msgid "Move to given synctex position"
msgstr ""
#: ../zathura/main.c:1
69
#: ../zathura/main.c:1
58
msgid "Highlight given position in the given process"
msgstr ""
#: ../zathura/main.c:1
71
#: ../zathura/main.c:1
60
msgid "Start in a non-default mode"
msgstr ""
...
...
@@ -570,7 +570,7 @@ msgstr "Copia la imatge"
msgid "Save image as"
msgstr "Desa imatge com a"
#: ../zathura/print.c:64 ../zathura/print.c:2
09
#: ../zathura/print.c:64 ../zathura/print.c:2
31
#, c-format
msgid "Printing failed: %s"
msgstr ""
...
...
@@ -579,26 +579,26 @@ msgstr ""
msgid "This document does not contain any index"
msgstr "Aquest document no conté cap índex"
#: ../zathura/zathura.c:21
8
../zathura/zathura.c:1
224
#: ../zathura/zathura.c:21
6
../zathura/zathura.c:1
301
msgid "[No name]"
msgstr "[Sense nom]"
#: ../zathura/zathura.c:
57
8
#: ../zathura/zathura.c:
64
8
msgid "Could not read file from stdin and write it to a temporary file."
msgstr ""
#: ../zathura/zathura.c:
59
4
#: ../zathura/zathura.c:
66
4
msgid "Could not read file from GIO and copy it to a temporary file."
msgstr ""
#: ../zathura/zathura.c:
68
3
#: ../zathura/zathura.c:
75
3
msgid "Enter password:"
msgstr ""
#: ../zathura/zathura.c:7
1
9
#: ../zathura/zathura.c:7
8
9
msgid "Unsupported file type. Please install the necessary plugin."
msgstr ""
#: ../zathura/zathura.c:7
31
#: ../zathura/zathura.c:7
99
msgid "Document does not contain any pages"
msgstr ""
po/cs.po
View file @
cd711c98
...
...
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: zathura\n"
"Report-Msgid-Bugs-To: http://bugs.pwmt.org\n"
"POT-Creation-Date: 201
5-12
-1
4
2
2
:0
3
+0
1
00\n"
"POT-Creation-Date: 201
6-04
-1
8
2
1
:0
8
+0
2
00\n"
"PO-Revision-Date: 2015-10-15 23:09+0200\n"
"Last-Translator: Sebastian Ramacher <sebastian+dev@ramacher.at>\n"
"Language-Team: pwmt.org <mail@pwmt.org>\n"
...
...
@@ -497,59 +497,59 @@ msgstr ""
msgid "Link: Invalid"
msgstr ""
#: ../zathura/main.c:1
5
5
msgid "Reparents to window specified by xid"
#: ../zathura/main.c:1
4
5
msgid "Reparents to window specified by xid
(X11)
"
msgstr ""
#: ../zathura/main.c:1
57
#: ../zathura/main.c:1
46
msgid "Path to the config directory"
msgstr "Cesta k souboru s nastavením"
#: ../zathura/main.c:1
58
#: ../zathura/main.c:1
47
msgid "Path to the data directory"
msgstr "Cesta k adresáři s daty"
#: ../zathura/main.c:1
59
#: ../zathura/main.c:1
48
msgid "Path to the cache directory"
msgstr ""
#: ../zathura/main.c:1
60
#: ../zathura/main.c:1
49
msgid "Path to the directories containing plugins"
msgstr "Cesta k adresářům s pluginy"
#: ../zathura/main.c:1
61
#: ../zathura/main.c:1
50
msgid "Fork into the background"
msgstr "Forknout se na pozadí"
#: ../zathura/main.c:1
62
#: ../zathura/main.c:1
51
msgid "Document password"
msgstr "Heslo"
#: ../zathura/main.c:1
63
#: ../zathura/main.c:1
52
msgid "Page number to go to"
msgstr ""
#: ../zathura/main.c:1
64
#: ../zathura/main.c:1
53
msgid "Log level (debug, info, warning, error)"
msgstr "Úroveň logování (debug, info, warning, error)"
#: ../zathura/main.c:1
6
5
#: ../zathura/main.c:15
4
msgid "Print version information"
msgstr "Zobrazit informace o souboru"
#: ../zathura/main.c:16
7
#: ../zathura/main.c:1
5
6
msgid "Synctex editor (forwarded to the synctex command)"
msgstr ""
#: ../zathura/main.c:1
68
#: ../zathura/main.c:1
57
msgid "Move to given synctex position"
msgstr ""
#: ../zathura/main.c:1
69
#: ../zathura/main.c:1
58
msgid "Highlight given position in the given process"
msgstr ""
#: ../zathura/main.c:1
71
#: ../zathura/main.c:1
60
msgid "Start in a non-default mode"
msgstr ""
...
...
@@ -565,7 +565,7 @@ msgstr "Zkopíruj obrázek"
msgid "Save image as"
msgstr "Ulož obrázek jako"
#: ../zathura/print.c:64 ../zathura/print.c:2
09
#: ../zathura/print.c:64 ../zathura/print.c:2
31
#, c-format
msgid "Printing failed: %s"
msgstr ""
...
...
@@ -574,26 +574,26 @@ msgstr ""
msgid "This document does not contain any index"
msgstr "Tenhle dokument neobsahuje žádné indexy"
#: ../zathura/zathura.c:21
8
../zathura/zathura.c:1
224
#: ../zathura/zathura.c:21
6
../zathura/zathura.c:1
301
msgid "[No name]"
msgstr "[Nepojmenovaný]"
#: ../zathura/zathura.c:
57
8
#: ../zathura/zathura.c:
64
8
msgid "Could not read file from stdin and write it to a temporary file."
msgstr ""
#: ../zathura/zathura.c:
59
4
#: ../zathura/zathura.c:
66
4
msgid "Could not read file from GIO and copy it to a temporary file."
msgstr ""
#: ../zathura/zathura.c:
68
3
#: ../zathura/zathura.c:
75
3
msgid "Enter password:"
msgstr ""
#: ../zathura/zathura.c:7
1
9
#: ../zathura/zathura.c:7
8
9
msgid "Unsupported file type. Please install the necessary plugin."
msgstr ""
#: ../zathura/zathura.c:7
31
#: ../zathura/zathura.c:7
99
msgid "Document does not contain any pages"
msgstr ""
po/de.po
View file @
cd711c98
...
...
@@ -8,17 +8,17 @@ msgid ""
msgstr ""
"Project-Id-Version: zathura\n"
"Report-Msgid-Bugs-To: http://bugs.pwmt.org\n"
"POT-Creation-Date: 201
5-12
-1
4
2
2
:0
3
+0
1
00\n"
"PO-Revision-Date: 201
5-12
-1
4
2
2
:1
5
+0
1
00\n"
"POT-Creation-Date: 201
6-04
-1
8
2
1
:0
8
+0
2
00\n"
"PO-Revision-Date: 201
6-04
-1
8
2
1
:1
1
+0
2
00\n"
"Last-Translator: Sebastian Ramacher <sebastian+dev@ramacher.at>\n"
"Language-Team: German (http://www.transifex.com/projects/p/zathura/language/"
"de/)\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.8.
6
\n"
"X-Generator: Poedit 1.8.
7.1
\n"
#: ../zathura/callbacks.c:233
#, c-format
...
...
@@ -505,59 +505,59 @@ msgstr "Verknüpfung: %s"
msgid "Link: Invalid"
msgstr "Verknüpfung: ungültig"
#: ../zathura/main.c:1
5
5
msgid "Reparents to window specified by xid"
msgstr "Reparentiert zathura an das Fenster mit der xid"
#: ../zathura/main.c:1
4
5
msgid "Reparents to window specified by xid
(X11)
"
msgstr "Reparentiert zathura an das Fenster mit der xid
(X11)
"
#: ../zathura/main.c:1
57
#: ../zathura/main.c:1
46
msgid "Path to the config directory"
msgstr "Pfad zum Konfigurationsverzeichnis"
#: ../zathura/main.c:1
58
#: ../zathura/main.c:1
47
msgid "Path to the data directory"
msgstr "Pfad zum Datenverzeichnis"
#: ../zathura/main.c:1
59
#: ../zathura/main.c:1
48
msgid "Path to the cache directory"
msgstr "Pfad zum Cacheverzeichnis"
#: ../zathura/main.c:1
60
#: ../zathura/main.c:1
49
msgid "Path to the directories containing plugins"
msgstr "Pfad zum Pluginverzeichnis"
#: ../zathura/main.c:1
61
#: ../zathura/main.c:1
50
msgid "Fork into the background"
msgstr "Forkt den Prozess in den Hintergrund"
#: ../zathura/main.c:1
62
#: ../zathura/main.c:1
51
msgid "Document password"
msgstr "Dokument Passwort"
#: ../zathura/main.c:1
63
#: ../zathura/main.c:1
52
msgid "Page number to go to"
msgstr "Zur Seite springen"
#: ../zathura/main.c:1
64
#: ../zathura/main.c:1
53
msgid "Log level (debug, info, warning, error)"
msgstr "Log-Stufe (debug, info, warning, error)"
#: ../zathura/main.c:1
6
5
#: ../zathura/main.c:15
4
msgid "Print version information"
msgstr "Zeige Versionsinformationen an"
#: ../zathura/main.c:16
7
#: ../zathura/main.c:1
5
6
msgid "Synctex editor (forwarded to the synctex command)"
msgstr "Synctex Editor (wird an synctex weitergeleitet)"
#: ../zathura/main.c:1
68
#: ../zathura/main.c:1
57
msgid "Move to given synctex position"
msgstr "Zur gewählten SyncTeX-Position springen"
#: ../zathura/main.c:1
69
#: ../zathura/main.c:1
58
msgid "Highlight given position in the given process"
msgstr "Gewählte Position im Prozess hervorheben"
#: ../zathura/main.c:1
71
#: ../zathura/main.c:1
60
msgid "Start in a non-default mode"
msgstr "In einem Nicht-Standardmodus starten"
...
...
@@ -573,7 +573,7 @@ msgstr "Bild kopieren"
msgid "Save image as"
msgstr "Bild speichern als"
#: ../zathura/print.c:64 ../zathura/print.c:2
09
#: ../zathura/print.c:64 ../zathura/print.c:2
31
#, c-format
msgid "Printing failed: %s"
msgstr "Drucken fehlgeschlagen: %s"
...
...
@@ -582,26 +582,26 @@ msgstr "Drucken fehlgeschlagen: %s"
msgid "This document does not contain any index"
msgstr "Dieses Dokument beinhaltet kein Inhaltsverzeichnis."
#: ../zathura/zathura.c:21
8
../zathura/zathura.c:1
224
#: ../zathura/zathura.c:21
6
../zathura/zathura.c:1
301
msgid "[No name]"
msgstr "[Kein Name]"
#: ../zathura/zathura.c:
57
8
#: ../zathura/zathura.c:
64
8
msgid "Could not read file from stdin and write it to a temporary file."
msgstr "Konnte Datei nicht von stdin lesen und in temporäre Datei schreiben."
#: ../zathura/zathura.c:
59
4
#: ../zathura/zathura.c:
66
4
msgid "Could not read file from GIO and copy it to a temporary file."
msgstr "Konnte Datei nicht mittels GIO in temporäre Datei kopieren."
#: ../zathura/zathura.c:
68
3
#: ../zathura/zathura.c:
75
3
msgid "Enter password:"
msgstr "Passwort:"
#: ../zathura/zathura.c:7
1
9
#: ../zathura/zathura.c:7
8
9
msgid "Unsupported file type. Please install the necessary plugin."
msgstr "Dateityp ist nicht unterstützt. Installiere das benötigete Plugin."
#: ../zathura/zathura.c:7
31
#: ../zathura/zathura.c:7
99
msgid "Document does not contain any pages"
msgstr "Dieses Dokument beinhaltet keine Seiten"
po/el.po
View file @
cd711c98
...
...
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: zathura\n"
"Report-Msgid-Bugs-To: http://bugs.pwmt.org\n"
"POT-Creation-Date: 201
5-12
-1
4
2
2
:0
3
+0
1
00\n"
"PO-Revision-Date: 201
5-10
-1
5
2
3:07
+0200\n"
"POT-Creation-Date: 201
6-04
-1
8
2
1
:0
8
+0
2
00\n"
"PO-Revision-Date: 201
6-04
-1
8
2
1:10
+0200\n"
"Last-Translator: Sebastian Ramacher <sebastian+dev@ramacher.at>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/zathura/language/"
"el/)\n"
...
...
@@ -18,7 +18,7 @@ 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.8.
5
\n"
"X-Generator: Poedit 1.8.
7.1
\n"