Commit cd8931cb authored by Moritz Lipp's avatar Moritz Lipp

Merge branch 'release/0.3.7'

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