Commit e5d2ca48 authored by Sebastian Ramacher's avatar Sebastian Ramacher
Browse files

Merge branch 'release/0.4.8'

parents 12c8cd91 713480f1
Pipeline #374 passed with stages
in 4 minutes and 19 seconds
......@@ -15,8 +15,9 @@ build:archlinux:
stage: build
image: registry.pwmt.org/pwmt/gitlab-runner-images/archlinux:latest
script:
- meson subprojects update
- mkdir -p build && cd build
- meson ..
- meson --force-fallback-for=girara ..
- ninja
cache:
<<: *girara_cache
......@@ -50,8 +51,9 @@ build:debian-buster:
stage: build
image: registry.pwmt.org/pwmt/gitlab-runner-images/debian:buster
script:
- meson subprojects update
- mkdir -p build && cd build
- meson ..
- meson --force-fallback-for=girara ..
- ninja
cache:
<<: *girara_cache
......@@ -85,8 +87,9 @@ build:ubuntu-bionic:
stage: build
image: registry.pwmt.org/pwmt/gitlab-runner-images/ubuntu:bionic
script:
- meson subprojects update
- mkdir -p build && cd build
- meson ..
- meson --force-fallback-for=girara ..
- ninja
cache:
<<: *girara_cache
......@@ -120,8 +123,9 @@ build:ubuntu-eoan:
stage: build
image: registry.pwmt.org/pwmt/gitlab-runner-images/ubuntu:eoan
script:
- meson subprojects update
- mkdir -p build && cd build
- meson ..
- meson --force-fallback-for=girara ..
- ninja
cache:
<<: *girara_cache
......
......@@ -44,5 +44,10 @@
<arg type='u' name='column' direction='in' />
<arg type='b' name='return' direction='out' />
</method>
<!-- Execute a command as if entered in the inputbar. -->
<method name='ExecuteCommand'>
<arg type='s' name='input' direction='in' />
<arg type='b' name='return' direction='out' />
</method>
</interface>
</node>
......@@ -43,6 +43,14 @@ General settings
:type: String
:default: #9FBC00
.. describe:: highlight-fg
Defines the color that is for text when highlighting parts of the document
(e.g.: numbers for links)
:type: String
:default: #FFFFFF
.. describe:: highlight-active-color
Defines the color that is used to show the current selected highlighted
......
......@@ -113,6 +113,8 @@ General
Follow links
F
Display link target
c
Copy link target into the clipboard
\:
Enter command
r
......
......@@ -53,6 +53,9 @@ can be used
set option4 hello\ world
set option5 "hello world"
Especially for options with strings as values, note that escaping of special characters and white
spaces is necessary. In the above example, ``option4`` and ``option5`` are both set to ``hello
world``, but ``set option6 hello world`` would set ``option6`` only to ``hello``.
For colors, zathura supports HTML color codes and CSS3-style ``rgb(r,g,b)`` and ``rgba(r,g,b,a)``
values. If you want to use color codes for some options, make sure to quote them accordingly or
......@@ -525,51 +528,6 @@ girara
* Value type: String
* Default value: #FFF712
*tabbar-fg*
Defines the foreground color for a tab
* Value type: String
* Default value: #FFFFFF
*tabbar-bg*
Defines the background color for a tab
* Value type: String
* Default value: #000000
*tabbar-focus-fg*
Defines the foreground color for the focused tab
* Value type: String
* Default value: #9FBC00
*tabbar-focus-bg*
Defines the background color for the focused tab
* Value type: String
* Default value: #000000
*show-scrollbars*
Defines if both the horizontal and vertical scrollbars should be shown or not.
Deprecated, use 'guioptions' instead.
* Value type: Boolean
* Default value: false
*show-h-scrollbar*
Defines whether to show/hide the horizontal scrollbar. Deprecated, use
'guioptions' instead.
* Value type: Boolean
* Default value: false
*show-v-scrollbar*
Defines whether to show/hide the vertical scrollbar. Deprecated, use
'guioptions' instead.
* Value type: Boolean
* Default value: false
*statusbar-bg*
Defines the background color of the statusbar
......@@ -658,6 +616,13 @@ zathura
* Value type: Boolean
* Default value: true
*dbus-raise-window*
Defines whether zathura's window should be raised when receiving certain
commands via D-Bus.
* Value type: Boolean
* Default value: true
*filemonitor*
Defines the file monitor backend used to check for changes in files. Possible
values are "glib", "signal" (if signal handling is supported), and "noop". The
......@@ -679,6 +644,13 @@ zathura
* Value type: String
* Default value: #9FBC00
*highlight-fg*
Defines the color that is used for text when highlighting parts of the
document (e.g.: number for links).
* Value type: String
* Default value: #9FBC00
*highlight-active-color*
Defines the color that is used to show the current selected highlighted element
(e.g: current search result)
......
project('zathura', 'c',
version: '0.4.7',
version: '0.4.8',
meson_version: '>=0.47',
default_options: ['c_std=c11', 'warning_level=3'],
)
......@@ -37,7 +37,7 @@ plugindir = join_paths(get_option('libdir'), 'zathura')
# required dependencies
libm = cc.find_library('m', required: false)
girara = dependency('girara-gtk3', version: '>=0.3.3', fallback: ['girara', 'girara_dependency'])
girara = dependency('girara-gtk3', version: '>=0.3.6', fallback: ['girara', 'girara_dependency'])
glib = dependency('glib-2.0', version: '>=2.50')
gio = dependency('gio-unix-2.0', required: host_machine.system() != 'windows')
gthread = dependency('gthread-2.0', version: '>=2.50')
......@@ -47,6 +47,12 @@ cairo = dependency('cairo')
build_dependencies = [libm, girara, glib, gio, gthread, gmodule, gtk3, cairo]
if host_machine.system() == 'darwin'
gtk_mac_integration = dependency('gtk-mac-integration-gtk3')
build_dependencies += gtk_mac_integration
endif
# defines
defines = [
'-DGETTEXT_PACKAGE="zathura"',
......@@ -55,6 +61,10 @@ defines = [
'-D_DEFAULT_SOURCE',
]
if host_machine.system() == 'darwin'
defines += '-DGTKOSXAPPLICATION'
endif
# compile flags
flags = [
'-Werror=implicit-function-declaration',
......@@ -101,6 +111,7 @@ version_header = configure_file(
output: 'zathura-version.h',
configuration: conf_data
)
include_directories = [
include_directories('.')
]
......@@ -143,7 +154,7 @@ sources = files(
sources += zathura_resources
sources += additional_sources
# header fiels to install
# header files to install
headers = files(
'zathura/document.h',
'zathura/links.h',
......
This diff is collapsed.
......@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: zathura\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-07-27 10:06+0200\n"
"PO-Revision-Date: 2020-03-22 22:48+0000\n"
"POT-Creation-Date: 2021-07-14 17:36+0200\n"
"PO-Revision-Date: 2020-07-27 08:12+0000\n"
"Last-Translator: Sebastian Ramacher <sebastian+dev@ramacher.at>\n"
"Language-Team: Catalan (http://www.transifex.com/pwmt/zathura/language/ca/)\n"
"Language: ca\n"
......@@ -52,11 +52,6 @@ msgstr ""
msgid "Automatic document reloading."
msgstr ""
#. Translators: Icon of the desktop entry.
#: data/org.pwmt.zathura.desktop.in:9
msgid "org.pwmt.zathura"
msgstr ""
#. Translators: Search terms to find this application. Do not translate or
#. localize the semicolons. The list must also end with a semicolon.
#: data/org.pwmt.zathura.desktop.in:14
......@@ -68,35 +63,35 @@ msgstr ""
msgid "'%s' must not be 0. Set to 1."
msgstr ""
#: zathura/callbacks.c:395
#: zathura/callbacks.c:396
#, c-format
msgid "Invalid input '%s' given."
msgstr "Entrada invàlida '%s'."
#: zathura/callbacks.c:433
#: zathura/callbacks.c:444
#, c-format
msgid "Invalid index '%s' given."
msgstr "Índex invàlid '%s'."
#: zathura/callbacks.c:674
#: zathura/callbacks.c:692
#, c-format
msgid "Copied selected text to selection %s: %s"
msgstr ""
#: zathura/callbacks.c:706
#: zathura/callbacks.c:724
#, c-format
msgid "Copied selected image to selection %s"
msgstr ""
#: zathura/commands.c:36 zathura/commands.c:76 zathura/commands.c:103
#: zathura/commands.c:165 zathura/commands.c:281 zathura/commands.c:311
#: zathura/commands.c:337 zathura/commands.c:437 zathura/commands.c:569
#: zathura/shortcuts.c:413 zathura/shortcuts.c:1222 zathura/shortcuts.c:1257
#: zathura/shortcuts.c:1284
#: zathura/commands.c:333 zathura/commands.c:429 zathura/commands.c:561
#: zathura/shortcuts.c:438 zathura/shortcuts.c:1257 zathura/shortcuts.c:1292
#: zathura/shortcuts.c:1319
msgid "No document opened."
msgstr "No s'ha obert cap document."
#: zathura/commands.c:42 zathura/commands.c:82 zathura/commands.c:442
#: zathura/commands.c:42 zathura/commands.c:82 zathura/commands.c:434
msgid "Invalid number of arguments given."
msgstr "Nombre d'arguments invàlids."
......@@ -195,53 +190,45 @@ msgstr "Cap argument subministrat."
msgid "Printing is not permitted in strict sandbox mode"
msgstr ""
#: zathura/commands.c:317 zathura/commands.c:343
msgid "Document saved."
msgstr "Document desat."
#: zathura/commands.c:319 zathura/commands.c:345
msgid "Failed to save document."
msgstr "No s'ha pogut desar el document."
#: zathura/commands.c:322 zathura/commands.c:348
#: zathura/commands.c:318 zathura/commands.c:340
msgid "Invalid number of arguments."
msgstr "Nombre d'arguments invàlids."
#: zathura/commands.c:461
#: zathura/commands.c:453
#, 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:463
#: zathura/commands.c:455
#, c-format
msgid "Wrote attachment '%s' to '%s'."
msgstr "S'ha escrit el fitxer adjunt '%s' a '%s'."
#: zathura/commands.c:507
#: zathura/commands.c:499
#, c-format
msgid "Wrote image '%s' to '%s'."
msgstr "S'ha escrit la imatge '%s' a '%s'."
#: zathura/commands.c:509
#: zathura/commands.c:501
#, c-format
msgid "Couldn't write image '%s' to '%s'."
msgstr "No s'ha pogut escriure la imatge '%s' a '%s'."
#: zathura/commands.c:516
#: zathura/commands.c:508
#, c-format
msgid "Unknown image '%s'."
msgstr "Imatge desconeguda '%s'."
#: zathura/commands.c:520
#: zathura/commands.c:512
#, c-format
msgid "Unknown attachment or image '%s'."
msgstr "Imatge o fitxer adjunt desconegut '%s'."
#: zathura/commands.c:538
#: zathura/commands.c:530
msgid "Exec is not permitted in strict sandbox mode"
msgstr ""
#: zathura/commands.c:582
#: zathura/commands.c:574
msgid "Argument must be a number."
msgstr "L'argument ha de ser un nombre."
......@@ -260,317 +247,325 @@ msgid "Images"
msgstr "Imatges"
#. zathura settings
#: zathura/config.c:183
#: zathura/config.c:185
msgid "Database backend"
msgstr "Base de dades de rerefons"
#: zathura/config.c:184
#: zathura/config.c:186
msgid "File monitor backend"
msgstr ""
#: zathura/config.c:186
#: zathura/config.c:188
msgid "Zoom step"
msgstr "Pas d'ampliació"
#: zathura/config.c:188
#: zathura/config.c:190
msgid "Padding between pages"
msgstr "Separació entre pàgines"
#: zathura/config.c:190
#: zathura/config.c:192
msgid "Number of pages per row"
msgstr "Nombre de pàgines per fila"
#: zathura/config.c:192
#: zathura/config.c:194
msgid "Column of the first page"
msgstr "Columna de la primera pàgina"
#: zathura/config.c:194
#: zathura/config.c:196
msgid "Render pages from right to left"
msgstr ""
#: zathura/config.c:196
#: zathura/config.c:198
msgid "Scroll step"
msgstr "Pas de desplaçament"
#: zathura/config.c:198
#: zathura/config.c:200
msgid "Horizontal scroll step"
msgstr "Pas de desplaçament horitzontal"
#: zathura/config.c:200
#: zathura/config.c:202
msgid "Full page scroll overlap"
msgstr "Superposició de pàgines completes de desplaçament"
#: zathura/config.c:202
#: zathura/config.c:204
msgid "Zoom minimum"
msgstr "Zoom mínim"
#: zathura/config.c:204
#: zathura/config.c:206
msgid "Zoom maximum"
msgstr "Zoom màxim"
#: zathura/config.c:206
#: zathura/config.c:208
msgid "Maximum number of pages to keep in the cache"
msgstr ""
#: zathura/config.c:208
#: zathura/config.c:210
msgid "Maximum size in pixels of thumbnails to keep in the cache"
msgstr ""
#: zathura/config.c:210
#: zathura/config.c:212
msgid "Number of positions to remember in the jumplist"
msgstr "Nombre de posicions per recordar al jumplist"
#: zathura/config.c:212
#: zathura/config.c:214
msgid "Recoloring (dark color)"
msgstr "Recolorejant (color fosc)"
#: zathura/config.c:213
#: zathura/config.c:215
msgid "Recoloring (light color)"
msgstr "Recolorejant (color clar)"
#: zathura/config.c:214
#: zathura/config.c:216
msgid "Color for highlighting"
msgstr "Color de realçament"
#: zathura/config.c:216
#: zathura/config.c:218
msgid "Foreground color for highlighting"
msgstr ""
#: zathura/config.c:220
msgid "Color for highlighting (active)"
msgstr "Color de realçament (activat)"
#: zathura/config.c:218
#: zathura/config.c:222
msgid "'Loading ...' background color"
msgstr ""
#: zathura/config.c:220
#: zathura/config.c:224
msgid "'Loading ...' foreground color"
msgstr ""
#: zathura/config.c:223
#: zathura/config.c:227
msgid "Index mode foreground color"
msgstr ""
#: zathura/config.c:224
#: zathura/config.c:228
msgid "Index mode background color"
msgstr ""
#: zathura/config.c:225
#: zathura/config.c:229
msgid "Index mode foreground color (active element)"
msgstr ""
#: zathura/config.c:226
#: zathura/config.c:230
msgid "Index mode background color (active element)"
msgstr ""
#: zathura/config.c:229
#: zathura/config.c:233
msgid "Recolor pages"
msgstr "Recolorejant les pàgines"
#: zathura/config.c:231
#: zathura/config.c:235
msgid "When recoloring keep original hue and adjust lightness only"
msgstr "Quan recoloregis manté el to original i ajusta només la lluminositat"
#: zathura/config.c:233
#: zathura/config.c:237
msgid "When recoloring keep original image colors"
msgstr ""
#: zathura/config.c:235
#: zathura/config.c:239
msgid "Wrap scrolling"
msgstr "Desplaçament recollit"
#: zathura/config.c:237
#: zathura/config.c:241
msgid "Page aware scrolling"
msgstr "Desplaçament recollit"
#: zathura/config.c:239
#: zathura/config.c:243
msgid "Advance number of pages per row"
msgstr "Avançar nombre de pàgines per fila"
#: zathura/config.c:241
#: zathura/config.c:245
msgid "Horizontally centered zoom"
msgstr "Zoom centrat horitzontalment"
#: zathura/config.c:243
#: zathura/config.c:247
msgid "Vertically center pages"
msgstr ""
#: zathura/config.c:245
#: zathura/config.c:249
msgid "Align link target to the left"
msgstr ""
#: zathura/config.c:247
#: zathura/config.c:251
msgid "Let zoom be changed when following links"
msgstr ""
#: zathura/config.c:249
#: zathura/config.c:253
msgid "Center result horizontally"
msgstr "Centra el resultat horitzontalment"
#: zathura/config.c:251
#: zathura/config.c:255
msgid "Transparency for highlighting"
msgstr "Transparència del realçat"
#: zathura/config.c:253
#: zathura/config.c:257
msgid "Render 'Loading ...'"
msgstr "Renderitza 'Carregant ...'"
#: zathura/config.c:254
#: zathura/config.c:258
msgid "Adjust to when opening file"
msgstr "Ajustar al fitxer quan s'obri"
#: zathura/config.c:256
#: zathura/config.c:260
msgid "Show hidden files and directories"
msgstr "Mostra els directoris i fitxers ocults"
#: zathura/config.c:258
#: zathura/config.c:262
msgid "Show directories"
msgstr "Mostra els directoris"
#: zathura/config.c:260
#: zathura/config.c:264
msgid "Show recent files"
msgstr ""
#: zathura/config.c:262
#: zathura/config.c:266
msgid "Always open on first page"
msgstr "Obrir sempre la primera pàgina"
#: zathura/config.c:264
#: zathura/config.c:268
msgid "Highlight search results"
msgstr "Realça els resultats de recerca"
#: zathura/config.c:267
#: zathura/config.c:271
msgid "Enable incremental search"
msgstr "Habilita la cerca incremental"
#: zathura/config.c:269
#: zathura/config.c:273
msgid "Clear search results on abort"
msgstr "Esborra els resultats de recerca a l'interrompre"
#: zathura/config.c:271
#: zathura/config.c:275
msgid "Use basename of the file in the window title"
msgstr "Utilitza el nom base del fitxer en el títol de la finestra"
#: zathura/config.c:273
#: zathura/config.c:277
msgid "Use ~ instead of $HOME in the filename in the window title"
msgstr ""
#: zathura/config.c:275
#: zathura/config.c:279
msgid "Display the page number in the window title"
msgstr ""
#: zathura/config.c:277
#: zathura/config.c:281
msgid "Use first page of a document as window icon"
msgstr ""
#: zathura/config.c:279
#: zathura/config.c:283
msgid "Use basename of the file in the statusbar"
msgstr ""
#: zathura/config.c:281
#: zathura/config.c:285
msgid "Use ~ instead of $HOME in the filename in the statusbar"
msgstr ""
#: zathura/config.c:283
#: zathura/config.c:287
msgid "Enable synctex support"
msgstr "Habilitar la compatibilitat amb synctex"
#: zathura/config.c:284
#: zathura/config.c:288
msgid "Synctex editor command"
msgstr ""
#: zathura/config.c:286
#: zathura/config.c:290
msgid "Enable D-Bus service"
msgstr ""
#: zathura/config.c:288
#: zathura/config.c:291
msgid "Raise window on certain D-Bus commands"
msgstr ""
#: zathura/config.c:293
msgid "Save history at each page change"
msgstr ""
#: zathura/config.c:289
#: zathura/config.c:294
msgid "The clipboard into which mouse-selected data will be written"
msgstr ""
#: zathura/config.c:291
#: zathura/config.c:296
msgid "Enable notification after selecting text"
msgstr ""
#: zathura/config.c:294
#: zathura/config.c:299
msgid "Sandbox level"
msgstr ""
#. define default inputbar commands
#: zathura/config.c:485
#: zathura/config.c:491
msgid "Add a bookmark"