Commit a1df5ace authored by Corentin Noël's avatar Corentin Noël
Browse files

M!78 - Remove dependency on intltool



Add the I18n CMake module to merge files.
Signed-off-by: Corentin Noël's avatarCorentin Noël <corentin.noel@collabora.com>

Closes !78
parent 2256cdc6
......@@ -274,7 +274,8 @@ include(PkgConfigEx)
include(SetupBuildFlags)
include(UninstallTarget)
include(FindIntltool)
include(FindGettext)
include(I18n)
include(FindKRB5)
include(FindLDAP)
include(FindPhonenumber)
......
# FindIntltool.cmake
#
# Searches for intltool and gettext. It aborts, if anything cannot be found.
# Requires GETTEXT_PO_DIR to be set to full path of the po/ directory.
#
# Output is:
# INTLTOOL_UPDATE - an intltool-update executable path, as found
# INTLTOOL_EXTRACT - an intltool-extract executable path, as found
# INTLTOOL_MERGE - an intltool-merge executable path, as found
#
# and anything from the FindGettext module.
#
# The below provided macros require GETTEXT_PACKAGE to be set.
#
# intltool_add_check_potfiles_target()
# Adds a check-potfiles target, which verifies that all files with translations
# are added in the POTFILES.in file inside GETTEXT_PO_DIR. This macro can be called
# only inside GETTEXT_PO_DIR.
#
# intltool_add_pot_file_target()
# Creates a new target pot-file, which generates ${GETTEXT_PACKAGE}.pot file into
# the CMAKE_CURERNT_BINARY_DIR. This target is not part of ALL.
# This can be called only inside GETTEXT_PO_DIR.
#
# intltool_process_po_files()
# Processes all files in the GETTEXT_PO_DIR and generates .gmo files for them
# in CMAKE_CURRENT_BINARY_DIR. These are added into a new target gmo-files.
# It also installs them into proper location under LOCALE_INSTALL_DIR.
# This can be called only inside GETTEXT_PO_DIR.
#
# intltool_setup_po_dir()
# Shortcut to setup intltool's po/ directory by adding all custom targets
# and such. this can be called only inside GETTEXT_PO_DIR.
#
# intltool_merge(_in_filename _out_filename ...args)
# Adds rule to call intltool-merge. The args are optional arguments.
# This can be called in any folder, only the GETTEXT_PO_DIR should
# be properly set, otherwise the call will fail.
#
# add_appdata_file(_infilename _outfilename)
# A shortcut to call intltool-merge() for an appdata file and install it
# to ${SHARE_INSTALL_PREFIX}/metainfo
include(FindGettext)
if(NOT GETTEXT_FOUND)
message(FATAL_ERROR "gettext not found, please install at least 0.18.3 version")
endif(NOT GETTEXT_FOUND)
if(GETTEXT_VERSION_STRING VERSION_LESS "0.18.3")
message(FATAL_ERROR "gettext version 0.18.3+ required, but version '${GETTEXT_VERSION_STRING}' found instead. Please update your gettext")
endif(GETTEXT_VERSION_STRING VERSION_LESS "0.18.3")
find_program(XGETTEXT xgettext)
if(NOT XGETTEXT)
message(FATAL_ERROR "xgettext executable not found. Please install or update your gettext to at least 0.18.3 version")
endif(NOT XGETTEXT)
find_program(INTLTOOL_UPDATE intltool-update)
if(NOT INTLTOOL_UPDATE)
message(FATAL_ERROR "intltool-update not found. Please install it (usually part of an 'intltool' package)")
endif(NOT INTLTOOL_UPDATE)
find_program(INTLTOOL_EXTRACT intltool-extract)
if(NOT INTLTOOL_EXTRACT)
message(FATAL_ERROR "intltool-extract not found. Please install it (usually part of an 'intltool' package)")
endif(NOT INTLTOOL_EXTRACT)
find_program(INTLTOOL_MERGE intltool-merge)
if(NOT INTLTOOL_MERGE)
message(FATAL_ERROR "intltool-merge not found. Please install it (usually part of an 'intltool' package)")
endif(NOT INTLTOOL_MERGE)
macro(intltool_add_check_potfiles_target)
if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL GETTEXT_PO_DIR)
message(FATAL_ERROR "intltool_add_pot_file_target() can be called only inside GETTEXT_PO_DIR ('${GETTEXT_PO_DIR}'), but it is called inside '${CMAKE_CURRENT_SOURCE_DIR}' instead")
endif(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL GETTEXT_PO_DIR)
add_custom_target(check-potfiles
COMMAND ${INTLTOOL_UPDATE} -m
WORKING_DIRECTORY ${GETTEXT_PO_DIR}
)
endmacro(intltool_add_check_potfiles_target)
macro(intltool_add_pot_file_target)
if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL GETTEXT_PO_DIR)
message(FATAL_ERROR "intltool_add_pot_file_target() can be called only inside GETTEXT_PO_DIR ('${GETTEXT_PO_DIR}'), but it is called inside '${CMAKE_CURRENT_SOURCE_DIR}' instead")
endif(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL GETTEXT_PO_DIR)
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${GETTEXT_PACKAGE}.pot
COMMAND ${CMAKE_COMMAND} -E env INTLTOOL_EXTRACT="${INTLTOOL_EXTRACT}" XGETTEXT="${XGETTEXT}" srcdir=${CMAKE_CURRENT_SOURCE_DIR} ${INTLTOOL_UPDATE} --gettext-package ${GETTEXT_PACKAGE} --pot
)
add_custom_target(pot-file
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${GETTEXT_PACKAGE}.pot
)
endmacro(intltool_add_pot_file_target)
macro(intltool_process_po_files)
if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL GETTEXT_PO_DIR)
message(FATAL_ERROR "intltool_process_po_files() can be called only inside GETTEXT_PO_DIR ('${GETTEXT_PO_DIR}'), but it is called inside '${CMAKE_CURRENT_SOURCE_DIR}' instead")
endif(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL GETTEXT_PO_DIR)
file(GLOB po_files ${GETTEXT_PO_DIR}/*.po)
set(LINGUAS)
set(LINGUAS_GMO)
foreach(file IN LISTS po_files)
get_filename_component(lang ${file} NAME_WE)
list(APPEND LINGUAS ${lang})
list(APPEND LINGUAS_GMO ${lang}.gmo)
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${lang}.gmo
COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${CMAKE_CURRENT_BINARY_DIR}/${lang}.gmo ${CMAKE_CURRENT_SOURCE_DIR}/${lang}.po
DEPENDS ${lang}.po
)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${lang}.gmo
DESTINATION ${LOCALE_INSTALL_DIR}/${lang}/LC_MESSAGES/
RENAME ${GETTEXT_PACKAGE}.mo
)
if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/${lang}.gmo.m)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${lang}.gmo.m
DESTINATION ${LOCALE_INSTALL_DIR}/${lang}/LC_MESSAGES/
RENAME ${GETTEXT_PACKAGE}.mo.m
)
endif(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/${lang}.gmo.m)
endforeach(file)
add_custom_target(gmo-files ALL
DEPENDS ${LINGUAS_GMO}
)
endmacro(intltool_process_po_files)
macro(intltool_setup_po_dir)
if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL GETTEXT_PO_DIR)
message(FATAL_ERROR "intltool_setup_po_dir() can be called only inside GETTEXT_PO_DIR ('${GETTEXT_PO_DIR}'), but it is called inside '${CMAKE_CURRENT_SOURCE_DIR}' instead")
endif(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL GETTEXT_PO_DIR)
intltool_add_check_potfiles_target()
intltool_add_pot_file_target()
intltool_process_po_files()
endmacro(intltool_setup_po_dir)
macro(intltool_merge _in_filename _out_filename)
set(_in ${_in_filename})
set(_out ${_out_filename})
get_filename_component(_path ${_in} DIRECTORY)
if(_path STREQUAL "")
set(_in ${CMAKE_CURRENT_SOURCE_DIR}/${_in})
endif(_path STREQUAL "")
get_filename_component(_path ${_out} DIRECTORY)
if(_path STREQUAL "")
set(_out ${CMAKE_CURRENT_BINARY_DIR}/${_out})
endif(_path STREQUAL "")
set(_has_no_translations OFF)
set(_args)
foreach(_arg ${ARGN})
list(APPEND _args "${_arg}")
if(_arg STREQUAL "--no-translations")
set(_has_no_translations ON)
endif(_arg STREQUAL "--no-translations")
endforeach(_arg)
if(_has_no_translations)
add_custom_command(OUTPUT ${_out}
COMMAND ${INTLTOOL_MERGE} ${_args} --quiet "${_in}" "${_out}"
DEPENDS ${_in}
)
else(_has_no_translations)
if(NOT TARGET intltool-merge-cache)
add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/po/.intltool-merge-cache
COMMAND ${INTLTOOL_MERGE} ${_args} --quiet --cache="${CMAKE_BINARY_DIR}/po/.intltool-merge-cache" "${GETTEXT_PO_DIR}" "${_in}" "${_out}"
DEPENDS ${_in}
)
add_custom_target(intltool-merge-cache ALL
DEPENDS ${CMAKE_BINARY_DIR}/po/.intltool-merge-cache)
endif(NOT TARGET intltool-merge-cache)
add_custom_command(OUTPUT ${_out}
COMMAND ${INTLTOOL_MERGE} ${_args} --quiet --cache="${CMAKE_BINARY_DIR}/po/.intltool-merge-cache" "${GETTEXT_PO_DIR}" "${_in}" "${_out}"
DEPENDS ${_in} intltool-merge-cache
)
endif(_has_no_translations)
endmacro(intltool_merge)
macro(add_appdata_file _infilename _outfilename)
if(NOT TARGET appdata-files)
add_custom_target(appdata-files ALL)
endif(NOT TARGET appdata-files)
set(_out ${_outfilename})
get_filename_component(_outtarget ${_out} NAME)
get_filename_component(_path ${_out} DIRECTORY)
if(_path STREQUAL "")
set(_out ${CMAKE_CURRENT_BINARY_DIR}/${_out})
endif(_path STREQUAL "")
intltool_merge(${_infilename} ${_out} --xml-style --utf8)
add_custom_target(appdata-${_outtarget}
DEPENDS ${_out}
)
add_dependencies(appdata-files appdata-${_outtarget})
install(FILES ${_out}
DESTINATION ${SHARE_INSTALL_PREFIX}/metainfo
)
endmacro(add_appdata_file)
# I18n.cmake
#
# Macros to easily use Gettext translations capabilities
#
include(FindGettext)
include(CMakeParseArguments)
macro(i18n_merge_file _source _target _po_dir)
cmake_parse_arguments(_I18N "" "TYPE" "EXTRA_ARGS" ${ARGN})
if (NOT DEFINED _I18N_TYPE)
set(_I18N_TYPE "desktop")
elseif(NOT ((${_I18N_TYPE} STREQUAL "desktop") OR (${_I18N_TYPE} STREQUAL "xml")))
message(FATAL_ERROR "Wrong type supplied, only 'desktop' and 'xml' are allowed, given: '${_I18N_TYPE}'")
endif()
add_custom_command(
OUTPUT ${_target}
DEPENDS ${_source}
COMMAND ${GETTEXT_MSGFMT_EXECUTABLE}
--${_I18N_TYPE}
--template=${_source}
-d ${_po_dir}
-o ${_target}
${_I18N_EXTRA_ARGS}
)
endmacro(i18n_merge_file)
......@@ -10,7 +10,7 @@ configure_file(org.gnome.Evolution-alarm-notify.desktop.in.in
@ONLY
)
intltool_merge(${CMAKE_CURRENT_BINARY_DIR}/org.gnome.Evolution-alarm-notify.desktop.in org.gnome.Evolution-alarm-notify.desktop --desktop-style --utf8)
i18n_merge_file(${CMAKE_CURRENT_BINARY_DIR}/org.gnome.Evolution-alarm-notify.desktop.in org.gnome.Evolution-alarm-notify.desktop ${CMAKE_SOURCE_DIR}/po)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.gnome.Evolution-alarm-notify.desktop
DESTINATION ${autostartdir}
......@@ -36,7 +36,7 @@ set(SCHEMAS
set(BUILT_SCHEMAS)
foreach(_schema IN LISTS SCHEMAS)
intltool_merge(${_schema}.in ${_schema} --no-translations --xml-style --utf8)
configure_file(${_schema}.in ${_schema} COPYONLY)
list(APPEND BUILT_SCHEMAS ${CMAKE_CURRENT_BINARY_DIR}/${_schema})
endforeach(_schema)
......
[Desktop Entry]
Type=Application
_Name=Evolution Alarm Notify
_Comment=Calendar event notifications
Name=Evolution Alarm Notify
Comment=Calendar event notifications
Icon=appointment-soon
Exec=@privlibexecdir@/evolution-alarm-notify
Terminal=false
......
......@@ -2,7 +2,7 @@
<schema gettext-domain="evolution-data-server" id="org.gnome.evolution-data-server.addressbook" path="/org/gnome/evolution-data-server/addressbook/">
<key name="self-contact-uid" type="s">
<default>''</default>
<_summary>Contact UID of a user</_summary>
<summary>Contact UID of a user</summary>
</key>
</schema>
</schemalist>
......@@ -10,79 +10,79 @@
<key name="contacts-reminder-enabled" type="b">
<default>false</default>
<_summary>Birthday and anniversary reminder</_summary>
<_description>Whether to set a reminder for birthdays and anniversaries</_description>
<summary>Birthday and anniversary reminder</summary>
<description>Whether to set a reminder for birthdays and anniversaries</description>
</key>
<key name="contacts-reminder-interval" type="i">
<default>15</default>
<_summary>Birthday and anniversary reminder value</_summary>
<_description>Number of units for determining a birthday or anniversary reminder</_description>
<summary>Birthday and anniversary reminder value</summary>
<description>Number of units for determining a birthday or anniversary reminder</description>
</key>
<key name="contacts-reminder-units" enum='org.gnome.evolution-data-server.calendar.Duration'>
<default>'minutes'</default>
<_summary>Birthday and anniversary reminder units</_summary>
<_description>Units for a birthday or anniversary reminder, “minutes”, “hours” or “days”</_description>
<summary>Birthday and anniversary reminder units</summary>
<description>Units for a birthday or anniversary reminder, “minutes”, “hours” or “days”</description>
</key>
<key name="reminders-past" type="as">
<default>['']</default>
<_summary>Past reminders for EReminderWatcher</_summary>
<summary>Past reminders for EReminderWatcher</summary>
</key>
<key name="reminders-snoozed" type="as">
<default>['']</default>
<_summary>Snoozed reminders for EReminderWatcher</_summary>
<summary>Snoozed reminders for EReminderWatcher</summary>
</key>
<key name="notify-programs" type="as">
<default>[]</default>
<_summary>Reminder programs</_summary>
<_description>Programs that are allowed to be run by reminders</_description>
<summary>Reminder programs</summary>
<description>Programs that are allowed to be run by reminders</description>
</key>
<key name="notify-with-tray" type="b">
<default>true</default>
<_summary>Show reminders in notification tray only</_summary>
<_description>When set to true, the reminders are shown only in the notification tray, otherwise the reminders dialog is shown immediately</_description>
<summary>Show reminders in notification tray only</summary>
<description>When set to true, the reminders are shown only in the notification tray, otherwise the reminders dialog is shown immediately</description>
</key>
<key name="notify-window-on-top" type="b">
<default>true</default>
<_summary>Show reminder notification dialog always on top</_summary>
<_description>Whether or not to show reminder notification dialog always on top. Note this works only as a hint for the window manager, which may or may not obey it.</_description>
<summary>Show reminder notification dialog always on top</summary>
<description>Whether or not to show reminder notification dialog always on top. Note this works only as a hint for the window manager, which may or may not obey it.</description>
</key>
<key name="notify-window-x" type="i">
<default>-1</default>
<_summary>X position of the reminder notification dialog</_summary>
<summary>X position of the reminder notification dialog</summary>
</key>
<key name="notify-window-y" type="i">
<default>-1</default>
<_summary>Y position of the reminder notification dialog</_summary>
<summary>Y position of the reminder notification dialog</summary>
</key>
<key name="notify-window-width" type="i">
<default>-1</default>
<_summary>Width of the reminder notification dialog</_summary>
<summary>Width of the reminder notification dialog</summary>
</key>
<key name="notify-window-height" type="i">
<default>-1</default>
<_summary>Height of the reminder notification dialog</_summary>
<summary>Height of the reminder notification dialog</summary>
</key>
<key name="notify-window-paned-position" type="i">
<default>-1</default>
<_summary>Size in pixels of the event list in the reminder notification dialog</_summary>
<summary>Size in pixels of the event list in the reminder notification dialog</summary>
</key>
<key name="notify-completed-tasks" type="b">
<default>true</default>
<_summary>Show reminder notification for completed tasks</_summary>
<summary>Show reminder notification for completed tasks</summary>
</key>
<key name="notify-past-events" type="b">
<default>false</default>
<_summary>Show reminder notification for past events</_summary>
<summary>Show reminder notification for past events</summary>
</key>
<key name="notify-last-snooze-minutes" type="i">
<default>5</default>
<_summary>The last used snooze time, in minutes</_summary>
<summary>The last used snooze time, in minutes</summary>
</key>
<key name="notify-custom-snooze-minutes" type="ai">
<default>[]</default>
<_summary>User-defined snooze times, in minutes</_summary>
<summary>User-defined snooze times, in minutes</summary>
</key>
</schema>
</schemalist>
......@@ -2,47 +2,47 @@
<schema gettext-domain="evolution-data-server" id="org.gnome.evolution-data-server" path="/org/gnome/evolution-data-server/">
<key name="migrated" type="b">
<default>false</default>
<_summary>Whether the migration of old setting was already done</_summary>
<summary>Whether the migration of old setting was already done</summary>
</key>
<key name="camel-gpg-binary" type="s">
<default>''</default>
<_summary>An absolute path where the gpg (or gpg2) binary is</_summary>
<_description>An example is “/usr/bin/gpg”; when it is left empty, or an incorrect value is set, then it will be searched for. Change requires restart of the application.</_description>
<summary>An absolute path where the gpg (or gpg2) binary is</summary>
<description>An example is “/usr/bin/gpg”; when it is left empty, or an incorrect value is set, then it will be searched for. Change requires restart of the application.</description>
</key>
<key name="camel-cipher-load-photos" type="b">
<default>true</default>
<_summary>Whether to load photos of signers/encrypters</_summary>
<_description>When set to “true”, tries to load also photo of the signers/encrypters, if available in the key/certificate.</_description>
<summary>Whether to load photos of signers/encrypters</summary>
<description>When set to “true”, tries to load also photo of the signers/encrypters, if available in the key/certificate.</description>
</key>
<key name="camel-smtp-helo-argument" type="s">
<default>''</default>
<_summary>Override SMTP HELO/EHLO argument</_summary>
<_description>When not empty, it's used as the SMTP HELO/EHLO argument, instead of the local host name/IP.</_description>
<summary>Override SMTP HELO/EHLO argument</summary>
<description>When not empty, it's used as the SMTP HELO/EHLO argument, instead of the local host name/IP.</description>
</key>
<key name="camel-message-info-user-headers" type="as">
<default>[]</default>
<_summary>Array of user header names</_summary>
<_description>These headers can be stored in the folder summary, possibly being visible in the GUI. The value can contain a pipe character ('|'), which delimits the display name from the header name. Example: 'Spam Score|X-Spam-Score'</_description>
<summary>Array of user header names</summary>
<description>These headers can be stored in the folder summary, possibly being visible in the GUI. The value can contain a pipe character ('|'), which delimits the display name from the header name. Example: 'Spam Score|X-Spam-Score'</description>
</key>
<key name="network-monitor-gio-name" type="s">
<default>''</default>
<_summary>GIO name of the GNetworkMonitor to use for an ENetworkMonitor instance</_summary>
<_description>When set to an unknown value, then the default GNetworkMonitor is used in the background. A special value “always-online” is used for no network monitoring.</_description>
<summary>GIO name of the GNetworkMonitor to use for an ENetworkMonitor instance</summary>
<description>When set to an unknown value, then the default GNetworkMonitor is used in the background. A special value “always-online” is used for no network monitoring.</description>
</key>
<key name="autoconfig-directory" type="s">
<default>''</default>
<_summary>A full path to a directory where .source files with preconfigured options can be stored</_summary>
<_description>This directory, if filled with an existing path, is checked additionally to XDG configure directories.</_description>
<summary>A full path to a directory where .source files with preconfigured options can be stored</summary>
<description>This directory, if filled with an existing path, is checked additionally to XDG configure directories.</description>
</key>
<key name="autoconfig-variables" type="as">
<default>['']</default>
<_summary>A list of variables which can be part of the autoconfig .source files</_summary>
<_description>Each item of the array is expected to be of the form: name=value. These variables are checked before environment variables, but after the predefined USER, REALNAME and HOST variables.</_description>
<summary>A list of variables which can be part of the autoconfig .source files</summary>
<description>Each item of the array is expected to be of the form: name=value. These variables are checked before environment variables, but after the predefined USER, REALNAME and HOST variables.</description>
</key>
<key name="oauth2-services-hint" type="as">
<default>['']</default>
<_summary>A list of hints for OAuth2 services</_summary>
<_description>Users can extend the list of supported protocols and hostnames for defined OAuth2 services, in addition to those hard-coded.
<summary>A list of hints for OAuth2 services</summary>
<description>Users can extend the list of supported protocols and hostnames for defined OAuth2 services, in addition to those hard-coded.
Each line can be of the form:
servicename[-protocol]:hostname1,hostname2,...
where “servicename” is the actual service name;
......@@ -54,37 +54,37 @@
Examples:
Company:mail.company.com — enables “Company” OAuth2 authentication for “mail.company.com” host
Company-CalDAV:caldav.company.com — enables “Company” OAuth2 authentication for any “CalDAV” source, which reads data from “caldav.company.com” host</_description>
Company-CalDAV:caldav.company.com — enables “Company” OAuth2 authentication for any “CalDAV” source, which reads data from “caldav.company.com” host</description>
</key>
<key name="oauth2-google-client-id" type="s">
<default>''</default>
<_summary>An OAuth2 client ID to use to connect to Google servers, instead of the one provided during build time</_summary>
<_description>User-specified OAuth2 client ID for Google servers. Empty string means to use the one provided during build time. Change of this requires restart.</_description>
<summary>An OAuth2 client ID to use to connect to Google servers, instead of the one provided during build time</summary>
<description>User-specified OAuth2 client ID for Google servers. Empty string means to use the one provided during build time. Change of this requires restart.</description>
</key>
<key name="oauth2-google-client-secret" type="s">
<default>''</default>
<_summary>An OAuth2 client secret to use to connect to Google servers, instead of the one provided during build time</_summary>
<_description>User-specified OAuth2 client secret for Google servers. Empty string means to use the one provided during build time. Change of this requires restart.</_description>
<summary>An OAuth2 client secret to use to connect to Google servers, instead of the one provided during build time</summary>
<description>User-specified OAuth2 client secret for Google servers. Empty string means to use the one provided during build time. Change of this requires restart.</description>
</key>
<key name="oauth2-outlook-client-id" type="s">
<default>''</default>
<_summary>An OAuth2 client ID to use to connect to Outlook servers, instead of the one provided during build time</_summary>
<_description>User-specified OAuth2 client ID for Outlook servers. Empty string means to use the one provided during build time. Change of this requires restart.</_description>
<summary>An OAuth2 client ID to use to connect to Outlook servers, instead of the one provided during build time</summary>
<description>User-specified OAuth2 client ID for Outlook servers. Empty string means to use the one provided during build time. Change of this requires restart.</description>
</key>
<key name="oauth2-outlook-client-secret" type="s">
<default>''</default>
<_summary>An OAuth2 client secret to use to connect to Outlook servers, instead of the one provided during build time</_summary>
<_description>User-specified OAuth2 client secret for Outlook servers. Empty string means to use the one provided during build time. Change of this requires restart.</_description>
<summary>An OAuth2 client secret to use to connect to Outlook servers, instead of the one provided during build time</summary>
<description>User-specified OAuth2 client secret for Outlook servers. Empty string means to use the one provided during build time. Change of this requires restart.</description>
</key>
<key name="oauth2-yahoo-client-id" type="s">
<default>''</default>
<_summary>An OAuth2 client ID to use to connect to Yahoo! servers, instead of the one provided during build time</_summary>
<_description>User-specified OAuth2 client ID for Yahoo! servers. Empty string means to use the one provided during build time. Change of this requires restart.</_description>
<summary>An OAuth2 client ID to use to connect to Yahoo! servers, instead of the one provided during build time</summary>
<description>User-specified OAuth2 client ID for Yahoo! servers. Empty string means to use the one provided during build time. Change of this requires restart.</description>
</key>
<key name="oauth2-yahoo-client-secret" type="s">
<default>''</default>
<_summary>An OAuth2 client secret to use to connect to Yahoo! servers, instead of the one provided during build time</_summary>
<_description>User-specified OAuth2 client secret for Yahoo! servers. Empty string means to use the one provided during build time. Change of this requires restart.</_description>
<summary>An OAuth2 client secret to use to connect to Yahoo! servers, instead of the one provided during build time</summary>
<description>User-specified OAuth2 client secret for Yahoo! servers. Empty string means to use the one provided during build time. Change of this requires restart.</description>
</key>
</schema>
</schemalist>
......@@ -8,68 +8,68 @@
<key name="proxy-type" type="i">
<default>0</default>
<_summary>(Deprecated) Proxy type to use</_summary>
<_description>This key was deprecated in version 3.12 and should no longer be used. Proxy settings are now integrated into Evolution-Data-Server’s account system. See the ESourceProxy API documentation for details.</_description>
<summary>(Deprecated) Proxy type to use</summary>
<description>This key was deprecated in version 3.12 and should no longer be used. Proxy settings are now integrated into Evolution-Data-Server’s account system. See the ESourceProxy API documentation for details.</description>
</key>
<key name="use-http-proxy" type="b">
<default>false</default>
<_summary>(Deprecated) Whether to use http-proxy</_summary>
<_description>This key was deprecated in version 3.12 and should no longer be used. Proxy settings are now integrated into Evolution-Data-Server’s account system. See the ESourceProxy API documentation for details.</_description>
<summary>(Deprecated) Whether to use http-proxy</summary>
<description>This key was deprecated in version 3.12 and should no longer be used. Proxy settings are now integrated into Evolution-Data-Server’s account system. See the ESourceProxy API documentation for details.</description>
</key>
<key name="use-authentication" type="b">
<default>false</default>
<_summary>(Deprecated) Whether proxy server requires authentication</_summary>
<_description>This key was deprecated in version 3.12 and should no longer be used. Proxy settings are now integrated into Evolution-Data-Server’s account system. See the ESourceProxy API documentation for details.</_description>
<summary>(Deprecated) Whether proxy server requires authentication</summary>
<description>This key was deprecated in version 3.12 and should no longer be used. Proxy settings are now integrated into Evolution-Data-Server’s account system. See the ESourceProxy API documentation for details.</description>
</key>
<key name="http-host" type="s">
<default>''</default>
<_summary>(Deprecated) Host name for HTTP requests</_summary>
<_description>This key was deprecated in version 3.12 and should no longer be used. Proxy settings are now integrated into Evolution-Data-Server’s account system. See the ESourceProxy API documentation for details.</_description>
<summary>(Deprecated) Host name for HTTP requests</summary>
<description>This key was deprecated in version 3.12 and should no longer be used. Proxy settings are now integrated into Evolution-Data-Server’s account system. See the ESourceProxy API documentation for details.</description>
</key>
<key name="http-port" type="i">
<default>0</default>
<_summary>(Deprecated) Port number for HTTP requests</_summary>
<_description>This key was deprecated in version 3.12 and should no longer be used. Proxy settings are now integrated into Evolution-Data-Server’s account system. See the ESourceProxy API documentation for details.</_description>
<summary>(Deprecated) Port number for HTTP requests</summary>
<description>This key was deprecated in version 3.12 and should no longer be used. Proxy settings are now integrated into Evolution-Data-Server’s account system. See the ESourceProxy API documentation for details.</description>
</key>
<key name="authentication-user" type="s">
<default>''</default>
<_summary>(Deprecated) Proxy authentication user name</_summary>
<_description>This key was deprecated in version 3.12 and should no longer be used. Proxy settings are now integrated into Evolution-Data-Server’s account system. See the ESourceProxy API documentation for details.</_description>
<summary>(Deprecated) Proxy authentication user name</summary>
<description>This key was deprecated in version 3.12 and should no longer be used. Proxy settings are now integrated into Evolution-Data-Server’s account system. See the ESourceProxy API documentation for details.</description>
</key>
<key name="authentication-password" type="s">
<default>''</default>
<_summary>(Deprecated) Proxy authentication password</_summary>
<_description>This key was deprecated in version 3.12 and should no longer be used. Proxy settings are now integrated into Evolution-Data-Server’s account system. See the ESourceProxy API documentation for details.</_description>
<summary>(Deprecated) Proxy authentication password</summary>
<description>This key was deprecated in version 3.12 and should no longer be used. Proxy settings are now integrated into Evolution-Data-Server’s account system. See the ESourceProxy API documentation for details.</description>
</key>
<key name="ignore-hosts" type="as">
<default>[]</default>
<_summary>(Deprecated) List of hosts to connect to without proxy</_summary>
<_description>This key was deprecated in version 3.12 and should no longer be used. Proxy settings are now integrated into Evolution-Data-Server’s account system. See the ESourceProxy API documentation for details.</_description>
<summary>(Deprecated) List of hosts to connect to without proxy</summary>
<description>This key was deprecated in version 3.12 and should no longer be used. Proxy settings are now integrated into Evolution-Data-Server’s account system. See the ESourceProxy API documentation for details.</description>
</key>
<key name="secure-host" type="s">
<default>''</default>
<_summary>(Deprecated) Host name for HTTPS requests</_summary>
<_description>This key was deprecated in version 3.12 and should no longer be used. Proxy settings are now integrated into Evolution-Data-Server’s account system. See the ESourceProxy API documentation for details.</_description>
<summary>(Deprecated) Host name for HTTPS requests</summary>
<description>This key was deprecated in version 3.12 and should no longer be used. Proxy settings are now integrated into Evolution-Data-Server’s account system. See the ESourceProxy API documentation for details.</description>
</key>
<key name="secure-port" type="i">
<default>0</default>
<_summary>(Deprecated) Port number for HTTPS requests</_summary>
<_description>This key was deprecated in version 3.12 and should no longer be used. Proxy settings are now integrated into Evolution-Data-Server’s account system. See the ESourceProxy API documentation for details.</_description>
<summary>(Deprecated) Port number for HTTPS requests</summary>
<description>This key was deprecated in version 3.12 and should no longer be used. Proxy settings are now integrated into Evolution-Data-Server’s account system. See the ESourceProxy API documentation for details.</description>
</key>
<key name="socks-host" type="s">
<default>''</default>
<_summary>(Deprecated) Host name for SOCKS requests</_summary>
<_description>This key was deprecated in version 3.12 and should no longer be used. Proxy settings are now integrated into Evolution-Data-Server’s account system. See the ESourceProxy API documentation for details.</_description>
<summary>(Deprecated) Host name for SOCKS requests</summary>
<description>This key was deprecated in version 3.12 and should no longer be used. Proxy settings are now integrated into Evolution-Data-Server’s account system. See the ESourceProxy API documentation for details.</description>
</key>
<key name="socks-port" type="i">
<default>0</default>
<_summary>(Deprecated) Port number for SOCKS requests</_summary>
<_description>This key was deprecated in version 3.12 and should no longer be used. Proxy settings are now integrated into Evolution-Data-Server’s account system. See the ESourceProxy API documentation for details.</_description>
<summary>(Deprecated) Port number for SOCKS requests</summary>
<description>This key was deprecated in version 3.12 and should no longer be used. Proxy settings are now integrated into Evolution-Data-Server’s account system. See the ESourceProxy API documentation for details.</description>
</key>
<key name="autoconfig-url" type="s">
<default>''</default>
<_summary>(Deprecated) Automatic proxy configuration URL</_summary>
<_description>This key was deprecated in version 3.12 and should no longer be used. Proxy settings are now integrated into Evolution-Data-Server’s account system. See the ESourceProxy API documentation for details.</_description>
<summary>(Deprecated) Automatic proxy configuration URL</summary>
<description>This key was deprecated in version 3.12 and should no longer be used. Proxy settings are now integrated into Evolution-Data-Server’s account system. See the ESourceProxy API documentation for details.</description>
</key>
</schema>
</schemalist>