Merge branch 'backport-translation-fixes-and-2571-glib-2-72' into 'glib-2-72'

Backport translation fixes and !2571 “meson: Set BROKEN_POLL in macOS builds” to glib-2-72

See merge request GNOME/glib!2573
This commit is contained in:
Simon McVittie 2022-04-05 14:23:33 +00:00
commit d50bc089e2
2 changed files with 3 additions and 3 deletions

View File

@ -165,8 +165,8 @@ glibconfig_conf.set('LT_CURRENT_MINUS_AGE', soversion)
glib_conf.set('_GNU_SOURCE', 1)
if host_system == 'windows'
# Poll doesn't work on devices on Windows
if host_system in ['windows', 'darwin']
# Poll doesn't work on devices on Windows, and macOS's poll() implementation is known to be broken
glib_conf.set('BROKEN_POLL', true)
endif

View File

@ -2581,7 +2581,7 @@ msgstr "Неправилна числова стойност"
#: gio/glib-compile-schemas.c:111
#, c-format
msgid "<value nick='%s'/> already specified"
msgstr "вече е указано <value nick='%s'>"
msgstr "вече е указано <value nick='%s'/>"
#: gio/glib-compile-schemas.c:119
#, c-format