Commit b39cfc43 authored by Sebastian Ramacher's avatar Sebastian Ramacher

Merge tag 'upstream/0.3.7'

Upstream version 0.3.7

# gpg: Signature made 2017-01-11T23:05:35 CET
# gpg:                using RSA key F78CBA07817BB149A11D339069F2FC516EA71993
# gpg:                issuer "sramacher@debian.org"
# gpg: Good signature from "Sebastian Ramacher <sebastian@ramacher.at>" [ultimate]
# gpg:                 aka "Sebastian Ramacher <s.ramacher@gmail.com>" [ultimate]
# gpg:                 aka "Sebastian Ramacher <s.ramacher@gmx.at>" [ultimate]
# gpg:                 aka "Sebastian Ramacher <s.ramacher@student.tugraz.at>" [ultimate]
# gpg:                 aka "Sebastian Ramacher <sramacher@debian.org>" [ultimate]
# gpg:                 aka "Sebastian Ramacher <sebastian.ramacher@iaik.tugraz.at>" [ultimate]
parents 0e4a2f5e e681145f
Copyright (c) 2009-2016 pwmt.org
Copyright (c) 2009-2017 pwmt.org
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
......
......@@ -4,7 +4,7 @@ include config.mk
include colors.mk
include common.mk
OSOURCE = $(filter-out ${PROJECT}/css-definitions.c, $(filter-out ${PROJECT}/dbus-interface-definitions.c, $(wildcard ${PROJECT}/*.c)))
OSOURCE = $(filter-out ${PROJECT}/css-definitions.c, $(filter-out ${PROJECT}/dbus-interface-definitions.c, $(sort $(wildcard ${PROJECT}/*.c))))
ifneq (${WITH_SQLITE},0)
INCS += $(SQLITE_INC)
......
......@@ -6,7 +6,7 @@ PROJECT = zathura
ZATHURA_VERSION_MAJOR = 0
ZATHURA_VERSION_MINOR = 3
ZATHURA_VERSION_REV = 6
ZATHURA_VERSION_REV = 7
# 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.6
GIRARA_MIN_VERSION = 0.2.7
GIRARA_PKG_CONFIG_NAME = girara-gtk3
# glib
GLIB_VERSION_CHECK ?= 1
......
.\" Man page generated from reStructuredText.
.
.TH "ZATHURA" "1" "2016-04-18" "0.2.7" "zathura"
.TH "ZATHURA" "1" "2017-01-11" "0.2.7" "zathura"
.SH NAME
zathura \- a document viewer
.
......@@ -65,8 +65,8 @@ Opens the document at the given page number. Pages are numbered starting
with 1, and negative numbers indicate page numbers starting from the end
of the document, \-1 being the last page.
.TP
.BI \-l\fP,\fB \-\-debug\fB= level
Set log debug level (debug, info, warning, error)
.BI \-l\fP,\fB \-\-log\-level\fB= level
Set log level (debug, info, warning, error)
.TP
.BI \-x\fP,\fB \-\-synctex\-editor\-command\fB= command
Set the synctex editor command. Overrides the synctex\-editor\-command setting.
......
.\" Man page generated from reStructuredText.
.
.TH "ZATHURARC" "5" "2016-04-18" "0.2.7" "zathura"
.TH "ZATHURARC" "5" "2017-01-11" "0.2.7" "zathura"
.SH NAME
zathurarc \- zathura configuration file
.
......@@ -43,7 +43,7 @@ is not possible to write multiple commands in one single line.
.SH COMMANDS
.SS set \- Changing options
.sp
In addition to the build\-in \fB:set\fP command zathura offers more options to be
In addition to the built\-in \fB:set\fP command zathura offers more options to be
changed and makes those changes permanent. To overwrite an option you just have
to add a line structured like the following
.INDENT 0.0
......@@ -872,6 +872,16 @@ Value type: Boolean
.IP \(bu 2
Default value: true
.UNINDENT
.SS filemonitor
.sp
Defines the filemonitor backend. Possible values are "glib" and "signal" (if
signal handling is supported).
.INDENT 0.0
.IP \(bu 2
Value type: String
.IP \(bu 2
Default value: glib
.UNINDENT
.SS incremental\-search
.sp
En/Disables incremental search (search while typing).
......@@ -961,7 +971,7 @@ 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>[: ...]]. The last
value in the list will be used for all other number of pages per row if not set
explicitely.
explicitly.
.sp
Per default, the first column is set to 2 for double\-page layout.
.INDENT 0.0
......
set - Changing options
======================
In addition to the build-in *:set* command zathura offers more options
In addition to the built-in *:set* command zathura offers more options
to be changed and makes those changes permanent. To overwrite an option
you just have to add a line structured like the following
......
......@@ -20,8 +20,8 @@
with 1, and negative numbers indicate page numbers starting from the end
of the document, -1 being the last page.
-l, --debug=level
Set log debug level (debug, info, warning, error)
-l, --log-level=level
Set log level (debug, info, warning, error)
-x, --synctex-editor-command=command
Set the synctex editor command. Overrides the synctex-editor-command setting.
......
......@@ -22,7 +22,7 @@ COMMANDS
set - Changing options
----------------------
In addition to the build-in ``:set`` command zathura offers more options to be
In addition to the built-in ``:set`` command zathura offers more options to be
changed and makes those changes permanent. To overwrite an option you just have
to add a line structured like the following
......@@ -661,13 +661,21 @@ values are "plain", "sqlite" (if built with sqlite support) and "null". If
* Default value: plain
dbus-service
^^^^^^^^^^^^^^^^^^^
^^^^^^^^^^^^
En/Disables the D-Bus service. If the services is disabled, SyncTeX forward
synchronization is not available.
* Value type: Boolean
* Default value: true
filemonitor
^^^^^^^^^^^
Defines the filemonitor backend. Possible values are "glib" and "signal" (if
signal handling is supported).
* Value type: String
* Default value: glib
incremental-search
^^^^^^^^^^^^^^^^^^
En/Disables incremental search (search while typing).
......@@ -741,7 +749,7 @@ 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>[: ...]]. The last
value in the list will be used for all other number of pages per row if not set
explicitely.
explicitly.
Per default, the first column is set to 2 for double-page layout.
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: zathura\n"
"Report-Msgid-Bugs-To: http://bugs.pwmt.org\n"
"POT-Creation-Date: 2016-04-18 21:08+0200\n"
"POT-Creation-Date: 2017-01-05 15:52+0100\n"
"PO-Revision-Date: 2015-10-15 23:07+0200\n"
"Last-Translator: Sebastian Ramacher <sebastian+dev@ramacher.at>\n"
"Language-Team: Estonian (http://www.transifex.net/projects/p/zathura/"
......@@ -34,7 +34,7 @@ msgstr ""
msgid "Invalid index '%s' given."
msgstr ""
#: ../zathura/callbacks.c:594
#: ../zathura/callbacks.c:590
#, c-format
msgid "Copied selected text to selection %s: %s"
msgstr ""
......@@ -43,8 +43,8 @@ msgstr ""
#: ../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
#: ../zathura/shortcuts.c:413 ../zathura/shortcuts.c:1223
#: ../zathura/shortcuts.c:1258 ../zathura/shortcuts.c:1285
msgid "No document opened."
msgstr ""
......@@ -197,289 +197,293 @@ msgstr ""
msgid "Database backend"
msgstr ""
#: ../zathura/config.c:146
#: ../zathura/config.c:145
msgid "File monitor backend"
msgstr ""
#: ../zathura/config.c:147
msgid "Zoom step"
msgstr ""
#: ../zathura/config.c:148
#: ../zathura/config.c:149
msgid "Padding between pages"
msgstr ""
#: ../zathura/config.c:150
#: ../zathura/config.c:151
msgid "Number of pages per row"
msgstr ""
#: ../zathura/config.c:152
#: ../zathura/config.c:153
msgid "Column of the first page"
msgstr ""
#: ../zathura/config.c:154
#: ../zathura/config.c:155
msgid "Scroll step"
msgstr ""
#: ../zathura/config.c:156
#: ../zathura/config.c:157
msgid "Horizontal scroll step"
msgstr ""
#: ../zathura/config.c:158
#: ../zathura/config.c:159
msgid "Full page scroll overlap"
msgstr ""
#: ../zathura/config.c:160
#: ../zathura/config.c:161
msgid "Zoom minimum"
msgstr ""
#: ../zathura/config.c:162
#: ../zathura/config.c:163
msgid "Zoom maximum"
msgstr ""
#: ../zathura/config.c:164
#: ../zathura/config.c:165
msgid "Maximum number of pages to keep in the cache"
msgstr ""
#: ../zathura/config.c:166
#: ../zathura/config.c:167
msgid "Maximum size in pixels of thumbnails to keep in the cache"
msgstr ""
#: ../zathura/config.c:168
#: ../zathura/config.c:169
msgid "Number of positions to remember in the jumplist"
msgstr ""
#: ../zathura/config.c:170
#: ../zathura/config.c:171
msgid "Recoloring (dark color)"
msgstr ""
#: ../zathura/config.c:171
#: ../zathura/config.c:172
msgid "Recoloring (light color)"
msgstr ""
#: ../zathura/config.c:172
#: ../zathura/config.c:173
msgid "Color for highlighting"
msgstr "Esiletõstmise värv"
#: ../zathura/config.c:174
#: ../zathura/config.c:175
msgid "Color for highlighting (active)"
msgstr "Esiletõstmise värv (aktiivne)"
#: ../zathura/config.c:176
#: ../zathura/config.c:177
msgid "'Loading ...' background color"
msgstr ""
#: ../zathura/config.c:178
#: ../zathura/config.c:179
msgid "'Loading ...' foreground color"
msgstr ""
#: ../zathura/config.c:181
#: ../zathura/config.c:182
msgid "Index mode foreground color"
msgstr ""
#: ../zathura/config.c:182
#: ../zathura/config.c:183
msgid "Index mode background color"
msgstr ""
#: ../zathura/config.c:183
#: ../zathura/config.c:184
msgid "Index mode foreground color (active element)"
msgstr ""
#: ../zathura/config.c:184
#: ../zathura/config.c:185
msgid "Index mode background color (active element)"
msgstr ""
#: ../zathura/config.c:187
#: ../zathura/config.c:188
msgid "Recolor pages"
msgstr ""
#: ../zathura/config.c:189
#: ../zathura/config.c:190
msgid "When recoloring keep original hue and adjust lightness only"
msgstr ""
#: ../zathura/config.c:191
#: ../zathura/config.c:192
msgid "When recoloring keep original image colors"
msgstr ""
#: ../zathura/config.c:193
#: ../zathura/config.c:194
msgid "Wrap scrolling"
msgstr ""
#: ../zathura/config.c:195
#: ../zathura/config.c:196
msgid "Page aware scrolling"
msgstr ""
#: ../zathura/config.c:197
#: ../zathura/config.c:198
msgid "Advance number of pages per row"
msgstr ""
#: ../zathura/config.c:199
#: ../zathura/config.c:200
msgid "Horizontally centered zoom"
msgstr ""
#: ../zathura/config.c:201
#: ../zathura/config.c:202
msgid "Align link target to the left"
msgstr ""
#: ../zathura/config.c:203
#: ../zathura/config.c:204
msgid "Let zoom be changed when following links"
msgstr ""
#: ../zathura/config.c:205
#: ../zathura/config.c:206
msgid "Center result horizontally"
msgstr ""
#: ../zathura/config.c:207
#: ../zathura/config.c:208
msgid "Transparency for highlighting"
msgstr ""
#: ../zathura/config.c:209
#: ../zathura/config.c:210
msgid "Render 'Loading ...'"
msgstr ""
#: ../zathura/config.c:210
#: ../zathura/config.c:211
msgid "Adjust to when opening file"
msgstr ""
#: ../zathura/config.c:212
#: ../zathura/config.c:213
msgid "Show hidden files and directories"
msgstr ""
#: ../zathura/config.c:214
#: ../zathura/config.c:215
msgid "Show directories"
msgstr "Näita kaustasid"
#: ../zathura/config.c:216
#: ../zathura/config.c:217
msgid "Show recent files"
msgstr ""
#: ../zathura/config.c:218
#: ../zathura/config.c:219
msgid "Always open on first page"
msgstr "Ava alati esimene leht"
#: ../zathura/config.c:220
#: ../zathura/config.c:221
msgid "Highlight search results"
msgstr ""
#: ../zathura/config.c:223
#: ../zathura/config.c:224
msgid "Enable incremental search"
msgstr ""
#: ../zathura/config.c:225
#: ../zathura/config.c:226
msgid "Clear search results on abort"
msgstr ""
#: ../zathura/config.c:227
#: ../zathura/config.c:228
msgid "Use basename of the file in the window title"
msgstr ""
#: ../zathura/config.c:229
#: ../zathura/config.c:230
msgid "Use ~ instead of $HOME in the filename in the window title"
msgstr ""
#: ../zathura/config.c:231
#: ../zathura/config.c:232
msgid "Display the page number in the window title"
msgstr ""
#: ../zathura/config.c:233
#: ../zathura/config.c:234
msgid "Use basename of the file in the statusbar"
msgstr ""
#: ../zathura/config.c:235
#: ../zathura/config.c:236
msgid "Use ~ instead of $HOME in the filename in the statusbar"
msgstr ""
#: ../zathura/config.c:237
#: ../zathura/config.c:238
msgid "Enable synctex support"
msgstr ""
#: ../zathura/config.c:239
#: ../zathura/config.c:240
msgid "Synctex editor command"
msgstr ""
#: ../zathura/config.c:241
#: ../zathura/config.c:242
msgid "Enable D-Bus service"
msgstr ""
#: ../zathura/config.c:243
#: ../zathura/config.c:244
msgid "The clipboard into which mouse-selected data will be written"
msgstr ""
#: ../zathura/config.c:245
#: ../zathura/config.c:246
msgid "Enable notification after selecting text"
msgstr ""
#. define default inputbar commands
#: ../zathura/config.c:435
#: ../zathura/config.c:436
msgid "Add a bookmark"
msgstr "Lisa järjehoidja"
#: ../zathura/config.c:436
#: ../zathura/config.c:437
msgid "Delete a bookmark"
msgstr "Kustuta järjehoidja"
#: ../zathura/config.c:437
#: ../zathura/config.c:438
msgid "List all bookmarks"
msgstr "Näita kõiki järjehoidjaid"
#: ../zathura/config.c:438
#: ../zathura/config.c:439
msgid "Close current file"
msgstr "Sulge praegune fail"
#: ../zathura/config.c:439
#: ../zathura/config.c:440
msgid "Show file information"
msgstr "Näita faili infot"
#: ../zathura/config.c:440 ../zathura/config.c:441
#: ../zathura/config.c:441 ../zathura/config.c:442
msgid "Execute a command"
msgstr ""
#. like vim
#: ../zathura/config.c:442
#: ../zathura/config.c:443
msgid "Show help"
msgstr "Näita abiinfot"
#: ../zathura/config.c:443
#: ../zathura/config.c:444
msgid "Open document"
msgstr "Ava dokument"
#: ../zathura/config.c:444
#: ../zathura/config.c:445
msgid "Close zathura"
msgstr "Sule zathura"
#: ../zathura/config.c:445
#: ../zathura/config.c:446
msgid "Print document"
msgstr "Prindi dokument"
#: ../zathura/config.c:446
#: ../zathura/config.c:447
msgid "Save document"
msgstr "Salvesta dokument"
#: ../zathura/config.c:447
#: ../zathura/config.c:448
msgid "Save document (and force overwriting)"
msgstr ""
#: ../zathura/config.c:448
#: ../zathura/config.c:449
msgid "Save attachments"
msgstr "Salvesta manused"
#: ../zathura/config.c:449
#: ../zathura/config.c:450
msgid "Set page offset"
msgstr ""
#: ../zathura/config.c:450
#: ../zathura/config.c:451
msgid "Mark current location within the document"
msgstr ""
#: ../zathura/config.c:451
#: ../zathura/config.c:452
msgid "Delete the specified marks"
msgstr ""
#: ../zathura/config.c:452
#: ../zathura/config.c:453
msgid "Don't highlight current search results"
msgstr ""
#: ../zathura/config.c:453
#: ../zathura/config.c:454
msgid "Highlight current search results"
msgstr ""
#: ../zathura/config.c:454
#: ../zathura/config.c:455
msgid "Show version information"
msgstr ""
......@@ -561,11 +565,11 @@ msgstr ""
msgid "Loading..."
msgstr ""
#: ../zathura/page-widget.c:1006
#: ../zathura/page-widget.c:1007
msgid "Copy image"
msgstr "Kopeeri pilt"
#: ../zathura/page-widget.c:1007
#: ../zathura/page-widget.c:1008
msgid "Save image as"
msgstr ""
......@@ -574,11 +578,16 @@ msgstr ""
msgid "Printing failed: %s"
msgstr ""
#: ../zathura/shortcuts.c:1126
#: ../zathura/shortcuts.c:105
#, c-format
msgid "Invalid adjust mode: %d"
msgstr ""
#: ../zathura/shortcuts.c:1133
msgid "This document does not contain any index"
msgstr ""
#: ../zathura/zathura.c:216 ../zathura/zathura.c:1301
#: ../zathura/zathura.c:216 ../zathura/zathura.c:1274
msgid "[No name]"
msgstr "[Nime pole]"
......@@ -594,10 +603,10 @@ msgstr ""
msgid "Enter password:"
msgstr ""
#: ../zathura/zathura.c:789
#: ../zathura/zathura.c:788
msgid "Unsupported file type. Please install the necessary plugin."
msgstr ""
#: ../zathura/zathura.c:799
#: ../zathura/zathura.c:798
msgid "Document does not contain any pages"
msgstr ""
This diff is collapsed.
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: zathura\n"
"Report-Msgid-Bugs-To: http://bugs.pwmt.org\n"
"POT-Creation-Date: 2016-04-18 21:08+0200\n"
"POT-Creation-Date: 2017-01-05 15:52+0100\n"
"PO-Revision-Date: 2014-01-31 09:37+0000\n"
"Last-Translator: Sebastian Ramacher <sebastian+dev@ramacher.at>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/zathura/language/"
......@@ -32,7 +32,7 @@ msgstr ""
msgid "Invalid index '%s' given."
msgstr ""
#: ../zathura/callbacks.c:594
#: ../zathura/callbacks.c:590
#, c-format
msgid "Copied selected text to selection %s: %s"
msgstr ""
......@@ -41,8 +41,8 @@ msgstr ""
#: ../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
#: ../zathura/shortcuts.c:413 ../zathura/shortcuts.c:1223
#: ../zathura/shortcuts.c:1258 ../zathura/shortcuts.c:1285
msgid "No document opened."
msgstr ""
......@@ -195,289 +195,293 @@ msgstr ""
msgid "Database backend"
msgstr ""
#: ../zathura/config.c:146
#: ../zathura/config.c:145
msgid "File monitor backend"
msgstr ""
#: ../zathura/config.c:147
msgid "Zoom step"
msgstr ""
#: ../zathura/config.c:148
#: ../zathura/config.c:149
msgid "Padding between pages"
msgstr ""
#: ../zathura/config.c:150
#: ../zathura/config.c:151
msgid "Number of pages per row"
msgstr ""
#: ../zathura/config.c:152
#: ../zathura/config.c:153
msgid "Column of the first page"
msgstr ""
#: ../zathura/config.c:154
#: ../zathura/config.c:155
msgid "Scroll step"
msgstr ""
#: ../zathura/config.c:156
#: ../zathura/config.c:157
msgid "Horizontal scroll step"
msgstr ""
#: ../zathura/config.c:158
#: ../zathura/config.c:159
msgid "Full page scroll overlap"
msgstr ""
#: ../zathura/config.c:160
#: ../zathura/config.c:161
msgid "Zoom minimum"
msgstr ""
#: ../zathura/config.c:162
#: ../zathura/config.c:163
msgid "Zoom maximum"
msgstr ""
#: ../zathura/config.c:164
#: ../zathura/config.c:165
msgid "Maximum number of pages to keep in the cache"
msgstr ""
#: ../zathura/config.c:166
#: ../zathura/config.c:167
msgid "Maximum size in pixels of thumbnails to keep in the cache"
msgstr ""
#: ../zathura/config.c:168
#: ../zathura/config.c:169
msgid "Number of positions to remember in the jumplist"
msgstr ""
#: ../zathura/config.c:170
#: ../zathura/config.c:171
msgid "Recoloring (dark color)"
msgstr ""
#: ../zathura/config.c:171
#: ../zathura/config.c:172
msgid "Recoloring (light color)"
msgstr ""
#: ../zathura/config.c:172
#: ../zathura/config.c:173
msgid "Color for highlighting"
msgstr ""
#: ../zathura/config.c:174
#: ../zathura/config.c:175
msgid "Color for highlighting (active)"
msgstr ""
#: ../zathura/config.c:176
#: ../zathura/config.c:177
msgid "'Loading ...' background color"
msgstr ""
#: ../zathura/config.c:178
#: ../zathura/config.c:179
msgid "'Loading ...' foreground color"
msgstr ""
#: ../zathura/config.c:181
#: ../zathura/config.c:182
msgid "Index mode foreground color"
msgstr ""
#: ../zathura/config.c:182
#: ../zathura/config.c:183
msgid "Index mode background color"
msgstr ""
#: ../zathura/config.c:183
#: ../zathura/config.c:184
msgid "Index mode foreground color (active element)"
msgstr ""
#: ../zathura/config.c:184
#: ../zathura/config.c:185
msgid "Index mode background color (active element)"
msgstr ""
#: ../zathura/config.c:187
#: ../zathura/config.c:188
msgid "Recolor pages"
msgstr ""
#: ../zathura/config.c:189
#: ../zathura/config.c:190
msgid "When recoloring keep original hue and adjust lightness only"
msgstr ""
#: ../zathura/config.c:191
#: ../zathura/config.c:192
msgid "When recoloring keep original image colors"
msgstr ""
#: ../zathura/config.c:193
#: ../zathura/config.c:194
msgid "Wrap scrolling"
msgstr ""
#: ../zathura/config.c:195
#: ../zathura/config.c:196
msgid "Page aware scrolling"
msgstr ""
#: ../zathura/config.c:197
#: ../zathura/config.c:198
msgid "Advance number of pages per row"
msgstr ""
#: ../zathura/config.c:199
#: ../zathura/config.c:200
msgid "Horizontally centered zoom"
msgstr ""
#: ../zathura/config.c:201