Commit 69d84c58 authored by Sam Thursfield's avatar Sam Thursfield

Merge branch 'piotrdrag/fix-gschema-translations' into 'master'

Stop merging translations to gschema files

See merge request !44
parents 70ae95ad 7ccb769a
Pipeline #57731 passed with stage
in 3 minutes and 40 seconds
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
src/libtracker-miners-common/tracker-dbus.c src/libtracker-miners-common/tracker-dbus.c
src/libtracker-miners-common/tracker-utils.c src/libtracker-miners-common/tracker-utils.c
src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in.in src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in.in
src/miners/fs/org.freedesktop.Tracker.Miner.Files.gschema.xml.in src/miners/fs/org.freedesktop.Tracker.Miner.Files.gschema.xml
src/miners/fs/tracker-main.c src/miners/fs/tracker-main.c
src/miners/fs/tracker-miner-files.c src/miners/fs/tracker-miner-files.c
src/miners/fs/tracker-miner-fs.desktop.in.in src/miners/fs/tracker-miner-fs.desktop.in.in
...@@ -12,9 +12,9 @@ src/miners/rss/tracker-main.c ...@@ -12,9 +12,9 @@ src/miners/rss/tracker-main.c
src/miners/rss/tracker-miner-rss.c src/miners/rss/tracker-miner-rss.c
src/miners/rss/tracker-miner-rss.desktop.in.in src/miners/rss/tracker-miner-rss.desktop.in.in
src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in.in src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in.in
src/tracker-extract/org.freedesktop.Tracker.Extract.gschema.xml.in src/tracker-extract/org.freedesktop.Tracker.Extract.gschema.xml
src/tracker-extract/tracker-extract.c src/tracker-extract/tracker-extract.c
src/tracker-extract/tracker-main.c src/tracker-extract/tracker-main.c
src/tracker-extract/tracker-extract.desktop.in.in src/tracker-extract/tracker-extract.desktop.in.in
src/tracker-writeback/tracker-main.c src/tracker-writeback/tracker-main.c
src/tracker-writeback/org.freedesktop.Tracker.Writeback.gschema.xml.in src/tracker-writeback/org.freedesktop.Tracker.Writeback.gschema.xml
tracker-miner-fs tracker-miner-fs
*.service *.service
*.xml
*.valid *.valid
*.cfg.5 *.cfg.5
...@@ -58,11 +58,7 @@ desktop_file = custom_target('tracker-miner-fs-desktop-file', ...@@ -58,11 +58,7 @@ desktop_file = custom_target('tracker-miner-fs-desktop-file',
install: true, install: true,
install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart')) install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
custom_target('tracker-miner-fs-settings-schema', install_data('org.freedesktop.Tracker.Miner.Files.gschema.xml',
input: 'org.freedesktop.Tracker.Miner.Files.gschema.xml.in',
output: 'org.freedesktop.Tracker.Miner.Files.gschema.xml',
command: ['intltool-merge', '--quiet', '--xml-style', '--utf8', join_paths(meson.source_root(), 'po'), '@INPUT@', '@OUTPUT@'],
install: true,
install_dir: gsettings_schema_dir) install_dir: gsettings_schema_dir)
if install_systemd_user_services if install_systemd_user_services
......
...@@ -21,141 +21,141 @@ Boston, MA 02110-1301, USA. ...@@ -21,141 +21,141 @@ Boston, MA 02110-1301, USA.
<schema id="org.freedesktop.Tracker.Miner.Files" path="/org/freedesktop/tracker/miner/files/" gettext-domain="tracker-miners"> <schema id="org.freedesktop.Tracker.Miner.Files" path="/org/freedesktop/tracker/miner/files/" gettext-domain="tracker-miners">
<key name="verbosity" enum="org.freedesktop.TrackerMiners.TrackerVerbosity"> <key name="verbosity" enum="org.freedesktop.TrackerMiners.TrackerVerbosity">
<default>'errors'</default> <default>'errors'</default>
<_summary>Log verbosity</_summary> <summary>Log verbosity</summary>
<_description>Log verbosity.</_description> <description>Log verbosity.</description>
</key> </key>
<key name="initial-sleep" type="i"> <key name="initial-sleep" type="i">
<_summary>Initial sleep</_summary> <summary>Initial sleep</summary>
<_description>Initial sleep time, in seconds.</_description> <description>Initial sleep time, in seconds.</description>
<range min="0" max="1000"/> <range min="0" max="1000"/>
<default>15</default> <default>15</default>
</key> </key>
<key name="sched-idle" enum="org.freedesktop.TrackerMiners.TrackerSchedIdle"> <key name="sched-idle" enum="org.freedesktop.TrackerMiners.TrackerSchedIdle">
<default>'first-index'</default> <default>'first-index'</default>
<_summary>Scheduler priority when idle</_summary> <summary>Scheduler priority when idle</summary>
<_description> <description>
The scheduler is the kernel component that decides which The scheduler is the kernel component that decides which
runnable application will be executed by the CPU next. Each runnable application will be executed by the CPU next. Each
application has an associated scheduling policy and priority. application has an associated scheduling policy and priority.
</_description> </description>
</key> </key>
<key name="throttle" type="i"> <key name="throttle" type="i">
<_summary>Throttle</_summary> <summary>Throttle</summary>
<_description>Indexing speed, the higher the slower.</_description> <description>Indexing speed, the higher the slower.</description>
<range min="0" max="20"/> <range min="0" max="20"/>
<default>0</default> <default>0</default>
</key> </key>
<key name="low-disk-space-limit" type="i"> <key name="low-disk-space-limit" type="i">
<_summary>Low disk space limit</_summary> <summary>Low disk space limit</summary>
<_description>Disk space threshold in percent at which to pause indexing, or -1 to disable.</_description> <description>Disk space threshold in percent at which to pause indexing, or -1 to disable.</description>
<range min="-1" max="100"/> <range min="-1" max="100"/>
<default>-1</default> <default>-1</default>
</key> </key>
<key name="crawling-interval" type="i"> <key name="crawling-interval" type="i">
<_summary>Crawling interval</_summary> <summary>Crawling interval</summary>
<_description> <description>
Interval in days to check whether the filesystem is up to date in the database. Interval in days to check whether the filesystem is up to date in the database.
0 forces crawling anytime, -1 forces it only after unclean shutdowns, and -2 0 forces crawling anytime, -1 forces it only after unclean shutdowns, and -2
disables it entirely. disables it entirely.
</_description> </description>
<range min="-2" max="365"/> <range min="-2" max="365"/>
<default>-1</default> <default>-1</default>
</key> </key>
<key name="removable-days-threshold" type="i"> <key name="removable-days-threshold" type="i">
<_summary>Removable devices’ data permanence threshold</_summary> <summary>Removable devices’ data permanence threshold</summary>
<_description> <description>
Threshold in days after which files from removables devices Threshold in days after which files from removables devices
will be removed from database if not mounted. 0 means never, will be removed from database if not mounted. 0 means never,
maximum is 365. maximum is 365.
</_description> </description>
<range min="0" max="365"/> <range min="0" max="365"/>
<default>3</default> <default>3</default>
</key> </key>
<key name="enable-monitors" type="b"> <key name="enable-monitors" type="b">
<_summary>Enable monitors</_summary> <summary>Enable monitors</summary>
<_description>Set to false to completely disable any file monitoring</_description> <description>Set to false to completely disable any file monitoring</description>
<default>true</default> <default>true</default>
</key> </key>
<key name="enable-writeback" type="b"> <key name="enable-writeback" type="b">
<_summary>Enable writeback</_summary> <summary>Enable writeback</summary>
<_description>Set to false to completely disable any file writeback</_description> <description>Set to false to completely disable any file writeback</description>
<default>true</default> <default>true</default>
</key> </key>
<key name="index-removable-devices" type="b"> <key name="index-removable-devices" type="b">
<_summary>Index removable devices</_summary> <summary>Index removable devices</summary>
<_description>Set to true to enable indexing mounted directories for removable devices.</_description> <description>Set to true to enable indexing mounted directories for removable devices.</description>
<default>false</default> <default>false</default>
</key> </key>
<key name="index-optical-discs" type="b"> <key name="index-optical-discs" type="b">
<_summary>Index optical discs</_summary> <summary>Index optical discs</summary>
<_description> <description>
Set to true to enable indexing CDs, DVDs, and generally optical media Set to true to enable indexing CDs, DVDs, and generally optical media
(if removable devices are not indexed, optical discs won’t be either) (if removable devices are not indexed, optical discs won’t be either)
</_description> </description>
<default>false</default> <default>false</default>
</key> </key>
<key name="index-on-battery" type="b"> <key name="index-on-battery" type="b">
<_summary>Index when running on battery</_summary> <summary>Index when running on battery</summary>
<_description>Set to true to index while running on battery</_description> <description>Set to true to index while running on battery</description>
<default>true</default> <default>true</default>
</key> </key>
<key name="index-on-battery-first-time" type="b"> <key name="index-on-battery-first-time" type="b">
<_summary>Perform initial indexing when running on battery</_summary> <summary>Perform initial indexing when running on battery</summary>
<_description>Set to true to index while running on battery for the first time only</_description> <description>Set to true to index while running on battery for the first time only</description>
<default>true</default> <default>true</default>
</key> </key>
<key name="index-recursive-directories" type="as"> <key name="index-recursive-directories" type="as">
<_summary>Directories to index recursively</_summary> <summary>Directories to index recursively</summary>
<_description> <description>
List of directories to index recursively, Special values include: List of directories to index recursively, Special values include:
&amp;DESKTOP, &amp;DOCUMENTS, &amp;DOWNLOAD, &amp;MUSIC, &amp;PICTURES, &amp;DESKTOP, &amp;DOCUMENTS, &amp;DOWNLOAD, &amp;MUSIC, &amp;PICTURES,
&amp;PUBLIC_SHARE, &amp;TEMPLATES, &amp;VIDEOS. &amp;PUBLIC_SHARE, &amp;TEMPLATES, &amp;VIDEOS.
See /etc/xdg/user-dirs.defaults and $HOME/.config/user-dirs.default See /etc/xdg/user-dirs.defaults and $HOME/.config/user-dirs.default
</_description> </description>
<default>[ '&amp;DESKTOP', '&amp;DOCUMENTS', '&amp;DOWNLOAD', '&amp;MUSIC', '&amp;PICTURES', '&amp;VIDEOS' ]</default> <default>[ '&amp;DESKTOP', '&amp;DOCUMENTS', '&amp;DOWNLOAD', '&amp;MUSIC', '&amp;PICTURES', '&amp;VIDEOS' ]</default>
</key> </key>
<key name="index-single-directories" type="as"> <key name="index-single-directories" type="as">
<_summary>Directories to index non-recursively</_summary> <summary>Directories to index non-recursively</summary>
<_description> <description>
List of directories to index without inspecting subfolders, Special values include: List of directories to index without inspecting subfolders, Special values include:
&amp;DESKTOP, &amp;DOCUMENTS, &amp;DOWNLOAD, &amp;MUSIC, &amp;PICTURES, &amp;DESKTOP, &amp;DOCUMENTS, &amp;DOWNLOAD, &amp;MUSIC, &amp;PICTURES,
&amp;PUBLIC_SHARE, &amp;TEMPLATES, &amp;VIDEOS. &amp;PUBLIC_SHARE, &amp;TEMPLATES, &amp;VIDEOS.
See /etc/xdg/user-dirs.defaults and $HOME/.config/user-dirs.default See /etc/xdg/user-dirs.defaults and $HOME/.config/user-dirs.default
</_description> </description>
<default>[ '$HOME' ]</default> <default>[ '$HOME' ]</default>
</key> </key>
<key name="ignored-files" type="as"> <key name="ignored-files" type="as">
<_summary>Ignored files</_summary> <summary>Ignored files</summary>
<_description>List of file patterns to avoid</_description> <description>List of file patterns to avoid</description>
<default>[ '*~', '*.o', '*.la', '*.lo' , '*.loT', '*.in', '*.csproj', '*.m4', '*.rej', '*.gmo', '*.orig', '*.pc', '*.omf', '*.aux', '*.tmp', '*.vmdk', '*.vm*', '*.nvram', '*.part', '*.rcore', '*.lzo', 'autom4te', 'conftest', 'confstat', 'Makefile', 'SCCS', 'ltmain.sh', 'libtool', 'config.status', 'confdefs.h', 'configure', '#*#', '~$*.doc?', '~$*.dot?', '~$*.xls?', '~$*.xlt?', '~$*.xlam', '~$*.ppt?', '~$*.pot?', '~$*.ppam', '~$*.ppsm', '~$*.ppsx', '~$*.vsd?', '~$*.vss?', '~$*.vst?', 'mimeapps.list', 'mimeinfo.cache', '*.directory' ]</default> <default>[ '*~', '*.o', '*.la', '*.lo' , '*.loT', '*.in', '*.csproj', '*.m4', '*.rej', '*.gmo', '*.orig', '*.pc', '*.omf', '*.aux', '*.tmp', '*.vmdk', '*.vm*', '*.nvram', '*.part', '*.rcore', '*.lzo', 'autom4te', 'conftest', 'confstat', 'Makefile', 'SCCS', 'ltmain.sh', 'libtool', 'config.status', 'confdefs.h', 'configure', '#*#', '~$*.doc?', '~$*.dot?', '~$*.xls?', '~$*.xlt?', '~$*.xlam', '~$*.ppt?', '~$*.pot?', '~$*.ppam', '~$*.ppsm', '~$*.ppsx', '~$*.vsd?', '~$*.vss?', '~$*.vst?', 'mimeapps.list', 'mimeinfo.cache', '*.directory' ]</default>
</key> </key>
<key name="ignored-directories" type="as"> <key name="ignored-directories" type="as">
<_summary>Ignored directories</_summary> <summary>Ignored directories</summary>
<_description>List of directories to avoid</_description> <description>List of directories to avoid</description>
<default>[ 'po', 'CVS', 'core-dumps', 'lost+found' ]</default> <default>[ 'po', 'CVS', 'core-dumps', 'lost+found' ]</default>
</key> </key>
<key name="ignored-directories-with-content" type="as"> <key name="ignored-directories-with-content" type="as">
<_summary>Ignored directories with content</_summary> <summary>Ignored directories with content</summary>
<_description>Avoid any directory containing a file blacklisted here</_description> <description>Avoid any directory containing a file blacklisted here</description>
<default>[ '.trackerignore', '.git', '.hg' ]</default> <default>[ '.trackerignore', '.git', '.hg' ]</default>
</key> </key>
</schema> </schema>
......
...@@ -3,6 +3,5 @@ tracker-extract-priority-dbus-stamp ...@@ -3,6 +3,5 @@ tracker-extract-priority-dbus-stamp
tracker-extract-priority-dbus.c tracker-extract-priority-dbus.c
tracker-extract-priority-dbus.h tracker-extract-priority-dbus.h
*.service *.service
*.xml
*.valid *.valid
*.cfg.5 *.cfg.5
...@@ -198,11 +198,7 @@ desktop_file = custom_target('tracker-extract-desktop-file', ...@@ -198,11 +198,7 @@ desktop_file = custom_target('tracker-extract-desktop-file',
install: true, install: true,
install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart')) install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
custom_target('tracker-extract-settings-schema', install_data('org.freedesktop.Tracker.Extract.gschema.xml',
input: 'org.freedesktop.Tracker.Extract.gschema.xml.in',
output: 'org.freedesktop.Tracker.Extract.gschema.xml',
command: ['intltool-merge', '--quiet', '--xml-style', '--utf8', join_paths(meson.source_root(), 'po'), '@INPUT@', '@OUTPUT@'],
install: true,
install_dir: gsettings_schema_dir) install_dir: gsettings_schema_dir)
if install_systemd_user_services if install_systemd_user_services
......
...@@ -21,37 +21,37 @@ Boston, MA 02110-1301, USA. ...@@ -21,37 +21,37 @@ Boston, MA 02110-1301, USA.
<schema id="org.freedesktop.Tracker.Extract" path="/org/freedesktop/tracker/extract/" gettext-domain="tracker-miners"> <schema id="org.freedesktop.Tracker.Extract" path="/org/freedesktop/tracker/extract/" gettext-domain="tracker-miners">
<key name="verbosity" enum="org.freedesktop.TrackerMiners.TrackerVerbosity"> <key name="verbosity" enum="org.freedesktop.TrackerMiners.TrackerVerbosity">
<default>'errors'</default> <default>'errors'</default>
<_summary>Log verbosity</_summary> <summary>Log verbosity</summary>
<_description>Log verbosity.</_description> <description>Log verbosity.</description>
</key> </key>
<key name="sched-idle" enum="org.freedesktop.TrackerMiners.TrackerSchedIdle"> <key name="sched-idle" enum="org.freedesktop.TrackerMiners.TrackerSchedIdle">
<default>'first-index'</default> <default>'first-index'</default>
<_summary>Scheduler priority when idle</_summary> <summary>Scheduler priority when idle</summary>
<_description> <description>
The scheduler is the kernel component that decides which The scheduler is the kernel component that decides which
runnable application will be executed by the CPU next. Each runnable application will be executed by the CPU next. Each
application has an associated scheduling policy and priority. application has an associated scheduling policy and priority.
</_description> </description>
</key> </key>
<key name="max-bytes" type="i"> <key name="max-bytes" type="i">
<_summary>Max bytes to extract</_summary> <summary>Max bytes to extract</summary>
<_description>Maximum number of UTF-8 bytes to extract.</_description> <description>Maximum number of UTF-8 bytes to extract.</description>
<range min="0" max="10485760"/> <range min="0" max="10485760"/>
<default>1048576</default> <default>1048576</default>
</key> </key>
<key name="max-media-art-width" type="i"> <key name="max-media-art-width" type="i">
<_summary>Max media art width</_summary> <summary>Max media art width</summary>
<_description>Maximum width in pixels for any media art extracted. Anything bigger is resized. Set to -1 to disable saving media art from files. Setting to 0 sets no limit on the media art width.</_description> <description>Maximum width in pixels for any media art extracted. Anything bigger is resized. Set to -1 to disable saving media art from files. Setting to 0 sets no limit on the media art width.</description>
<range min="-1" max="2048"/> <range min="-1" max="2048"/>
<default>0</default> <default>0</default>
</key> </key>
<key name="wait-for-miner-fs" type="b"> <key name="wait-for-miner-fs" type="b">
<_summary>Wait for FS miner to be done before extracting</_summary> <summary>Wait for FS miner to be done before extracting</summary>
<_description>When true, tracker-extract will wait for tracker-miner-fs to be done crawling before extracting meta-data. This option is useful on constrained environment where it is important to list files as fast as possible and can wait to get meta-data later.</_description> <description>When true, tracker-extract will wait for tracker-miner-fs to be done crawling before extracting meta-data. This option is useful on constrained environment where it is important to list files as fast as possible and can wait to get meta-data later.</description>
<default>false</default> <default>false</default>
</key> </key>
</schema> </schema>
......
tracker-writeback tracker-writeback
*.service *.service
*.xml
*.valid *.valid
*.cfg.5 *.cfg.5
...@@ -56,11 +56,7 @@ dbus_service_file = configure_file( ...@@ -56,11 +56,7 @@ dbus_service_file = configure_file(
install: true, install: true,
install_dir: dbus_services_dir) install_dir: dbus_services_dir)
custom_target('tracker-writeback-settings-schema', install_data('org.freedesktop.Tracker.Writeback.gschema.xml',
input: 'org.freedesktop.Tracker.Writeback.gschema.xml.in',
output: 'org.freedesktop.Tracker.Writeback.gschema.xml',
command: ['intltool-merge', '--quiet', '--xml-style', '--utf8', join_paths(meson.source_root(), 'po'), '@INPUT@', '@OUTPUT@'],
install: true,
install_dir: gsettings_schema_dir) install_dir: gsettings_schema_dir)
if install_systemd_user_services if install_systemd_user_services
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment