mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-02-23 18:52:09 +01:00
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:
commit
d50bc089e2
@ -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
|
||||
|
||||
|
2
po/bg.po
2
po/bg.po
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user