diff -Nru gnome-desktop3-3.36.3.1/debian/changelog gnome-desktop3-3.36.8/debian/changelog --- gnome-desktop3-3.36.3.1/debian/changelog 2020-06-23 14:03:01.000000000 +0000 +++ gnome-desktop3-3.36.8/debian/changelog 2020-11-26 16:37:26.000000000 +0000 @@ -1,3 +1,11 @@ +gnome-desktop3 (3.36.8-0ubuntu1) focal; urgency=medium + + * New upstream release (lp: #1905756) + * debian/patches/tests-Don-t-run-at-build-time.patch: + - removed since the change is in the new version + + -- Sebastien Bacher Thu, 26 Nov 2020 17:37:26 +0100 + gnome-desktop3 (3.36.3.1-0ubuntu1) focal; urgency=medium * New stable version (lp: #1884775) diff -Nru gnome-desktop3-3.36.3.1/debian/gbp.conf gnome-desktop3-3.36.8/debian/gbp.conf --- gnome-desktop3-3.36.3.1/debian/gbp.conf 2020-04-30 10:27:03.000000000 +0000 +++ gnome-desktop3-3.36.8/debian/gbp.conf 2020-11-26 16:37:26.000000000 +0000 @@ -1,8 +1,8 @@ [DEFAULT] pristine-tar = True -debian-branch = ubuntu/master +debian-branch = ubuntu/focal debian-tag = ubuntu/%(version)s -upstream-branch = upstream/latest +upstream-branch = upstream/3.36.x upstream-vcs-tag = %(version)s [buildpackage] diff -Nru gnome-desktop3-3.36.3.1/debian/patches/series gnome-desktop3-3.36.8/debian/patches/series --- gnome-desktop3-3.36.3.1/debian/patches/series 2020-06-23 13:15:54.000000000 +0000 +++ gnome-desktop3-3.36.8/debian/patches/series 2020-11-26 16:37:26.000000000 +0000 @@ -3,4 +3,3 @@ git_revert_draw_background.patch ubuntu_language_list_from_SUPPORTED.patch riscv64_seccomp.patch -tests-Don-t-run-at-build-time.patch diff -Nru gnome-desktop3-3.36.3.1/debian/patches/tests-Don-t-run-at-build-time.patch gnome-desktop3-3.36.8/debian/patches/tests-Don-t-run-at-build-time.patch --- gnome-desktop3-3.36.3.1/debian/patches/tests-Don-t-run-at-build-time.patch 2020-06-23 13:14:16.000000000 +0000 +++ gnome-desktop3-3.36.8/debian/patches/tests-Don-t-run-at-build-time.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -From: Simon McVittie -Date: Mon, 22 Jun 2020 15:42:29 +0000 -Subject: tests: Don't run at build-time - -These tests require that our locale files have been installed properly, -so they need to be deferred until libgnome-desktop has been installed. -Build-time tests can't rely on that, but installed-tests can. - -Bug: https://gitlab.gnome.org/GNOME/gnome-desktop/-/issues/159 -Signed-off-by: Simon McVittie -Applied-upstream: 3.36.4, commit:94a3996373f53c6beb3fdd5c2b30160cb8e94078 -Applied-upstream: 3.37.3, commit:985e49662d527daf5417bfbb8be475bc8d64d64a -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=963384 ---- - tests/meson.build | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/tests/meson.build b/tests/meson.build -index df5634b..6401618 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -37,10 +37,9 @@ foreach program: test_programs - ) - endif - -- test(program, -- exe, -- env: test_env -- ) -+ # Don't run these tests at build-time with test(): currently both tests -+ # rely on our locales having been installed, and at build-time that -+ # hasn't happened yet. - endforeach - - if get_option('installed_tests') diff -Nru gnome-desktop3-3.36.3.1/libgnome-desktop/gnome-desktop-thumbnail-script.c gnome-desktop3-3.36.8/libgnome-desktop/gnome-desktop-thumbnail-script.c --- gnome-desktop3-3.36.3.1/libgnome-desktop/gnome-desktop-thumbnail-script.c 2020-06-14 21:18:25.495147200 +0000 +++ gnome-desktop3-3.36.8/libgnome-desktop/gnome-desktop-thumbnail-script.c 2020-11-24 18:05:55.370745200 +0000 @@ -556,6 +556,18 @@ if (!g_str_has_prefix (FONTCONFIG_CACHE_PATH, "/usr/")) add_args (array, "--ro-bind-try", FONTCONFIG_CACHE_PATH, FONTCONFIG_CACHE_PATH, NULL); + /* + * Used in various distributions. On those distributions, /usr is not + * complete without it: some files in /usr might be a symbolic link + * like /usr/bin/composite -> /etc/alternatives/composite -> + * /usr/bin/composite-im6.q16. + * + * https://manpages.debian.org/stable/dpkg/update-alternatives.1.en.html + * https://docs.fedoraproject.org/en-US/packaging-guidelines/Alternatives/ + * https://en.opensuse.org/openSUSE:Packaging_Multiple_Version_guidelines + */ + add_args (array, "--ro-bind-try", "/etc/alternatives", "/etc/alternatives", NULL); + add_args (array, "--proc", "/proc", "--dev", "/dev", diff -Nru gnome-desktop3-3.36.3.1/meson.build gnome-desktop3-3.36.8/meson.build --- gnome-desktop3-3.36.3.1/meson.build 2020-06-14 21:18:25.498147500 +0000 +++ gnome-desktop3-3.36.8/meson.build 2020-11-24 18:05:55.375745300 +0000 @@ -1,6 +1,6 @@ project('gnome-desktop', 'c', meson_version: '>= 0.49.0', - version: '3.36.3.1', + version: '3.36.8', license: ['GPL2+', 'LGPL2+'] ) @@ -14,7 +14,7 @@ # to 0. When bumping the second version, set the third one to zero. # # A lot easier than libtool, right? -libversion = '19.0.3' +libversion = '19.0.8' soversion = libversion.split('.')[0] gdk_pixbuf_req = '>= 2.36.5' diff -Nru gnome-desktop3-3.36.3.1/NEWS gnome-desktop3-3.36.8/NEWS --- gnome-desktop3-3.36.3.1/NEWS 2020-06-14 21:18:25.478147000 +0000 +++ gnome-desktop3-3.36.8/NEWS 2020-11-24 18:05:55.345744800 +0000 @@ -1,4 +1,35 @@ =============== +Version 3.36.8 +=============== + +- No changes + +=============== +Version 3.36.7 +=============== + +- No changes + +=============== +Version 3.36.6 +=============== + +- No changes + +=============== +Version 3.36.5 +=============== + +- No changes + +=============== +Version 3.36.4 +=============== + +- tests: Don't run at build-time +- Translation updates + +=============== Version 3.36.3 =============== diff -Nru gnome-desktop3-3.36.3.1/po/kk.po gnome-desktop3-3.36.8/po/kk.po --- gnome-desktop3-3.36.3.1/po/kk.po 2020-06-14 21:18:25.504147500 +0000 +++ gnome-desktop3-3.36.8/po/kk.po 2020-11-24 18:05:55.386745500 +0000 @@ -1,15 +1,15 @@ # Kazakh translation of gnome-desktop. # Copyright (C) 2010 HZ # This file is distributed under the same license as the gnome-desktop package. -# Baurzhan Muftakhidinov , 2010. +# Baurzhan Muftakhidinov , 2010-2020. # Moldabekov Margulan , 2008 # Erzhan Shaniev , 2008 msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-desktop/issues\n" -"POT-Creation-Date: 2018-08-04 21:21+0000\n" -"PO-Revision-Date: 2018-08-23 21:40+0500\n" +"POT-Creation-Date: 2020-05-31 13:00+0000\n" +"PO-Revision-Date: 2020-06-25 11:09+0500\n" "Last-Translator: Baurzhan Muftakhidinov \n" "Language-Team: Kazakh \n" "Language: kk\n" @@ -17,28 +17,72 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 2.1.1\n" +"X-Generator: Poedit 2.3.1\n" -#: libgnome-desktop/gnome-languages.c:713 +#: libgnome-desktop/gnome-languages.c:717 msgid "Unspecified" msgstr "Анықталмаған" -#: libgnome-desktop/gnome-rr-config.c:759 +#. TRANSLATORS: Used to distinguish the labels representing the gez_ER +#. and gez_ET locales from gez_ER@abegede respective gez_ET@abegede. The +#. difference is related to collation. +#: libgnome-desktop/gnome-languages.c:1382 +msgid "Abegede" +msgstr "Абежде" + +#. TRANSLATORS: Used to distinguish Cyrillic from Latin written language variants. +#: libgnome-desktop/gnome-languages.c:1384 +msgid "Cyrillic" +msgstr "Кирилл жазуы" + +#. TRANSLATORS: Also known as "Nagari", a written variant for many languages +#. of the Indian subcontinent. See: +#. https://en.wikipedia.org/wiki/Devanagari +#: libgnome-desktop/gnome-languages.c:1388 +msgid "Devanagari" +msgstr "Деванагари" + +#. TRANSLATORS: Used to distinguish the label representing the tt_RU +#. locale from tt_RU@iqtelif. It's a special alphabet for Tatar. +#: libgnome-desktop/gnome-languages.c:1391 +msgid "IQTElif" +msgstr "IQTElif" + +#. TRANSLATORS: The alphabet/script, not the language. Used to distinguish +#. Latin from Cyrillic written language variants. +#: libgnome-desktop/gnome-languages.c:1394 +msgid "Latin" +msgstr "Латын жазуы" + +#. TRANSLATORS: "Saho" is a variant of the Afar language. Used to +#. distinguish the label representing the aa_ER locale from aa_ER@saaho. +#: libgnome-desktop/gnome-languages.c:1397 +msgid "Saho" +msgstr "Сахо" + +#. TRANSLATORS: "Valencia" is a dialect of the Catalan language spoken +#. in Valencia. Used to distinguish the label representing the ca_ES +#. locale from ca_ES@valencia. +#: libgnome-desktop/gnome-languages.c:1401 +msgid "Valencia" +msgstr "Валенсия" + +#: libgnome-desktop/gnome-rr-config.c:754 #, c-format msgid "CRTC %d cannot drive output %s" msgstr "CRT %d контроллері %s шығысын басқара алмайды" -#: libgnome-desktop/gnome-rr-config.c:766 +#: libgnome-desktop/gnome-rr-config.c:761 #, c-format msgid "output %s does not support mode %dx%d@%dHz" msgstr "%s шығысы %dx%d@%dГц режимін қолдамайды" -#: libgnome-desktop/gnome-rr-config.c:777 +#: libgnome-desktop/gnome-rr-config.c:772 #, c-format msgid "CRTC %d does not support rotation=%d" msgstr "CRT %d rotation=%d қолдамайды" -#: libgnome-desktop/gnome-rr-config.c:790 +#: libgnome-desktop/gnome-rr-config.c:785 #, c-format msgid "" "output %s does not have the same parameters as another cloned output:\n" @@ -51,22 +95,22 @@ "бар координаттар = (%d, %d), жаңа координаттар = (%d, %d)\n" "бар айналдыру = %d, жаңа айналдыру = %d" -#: libgnome-desktop/gnome-rr-config.c:805 +#: libgnome-desktop/gnome-rr-config.c:800 #, c-format msgid "cannot clone to output %s" msgstr "%s шығысына клондау мүмкін емес" -#: libgnome-desktop/gnome-rr-config.c:931 +#: libgnome-desktop/gnome-rr-config.c:926 #, c-format msgid "Trying modes for CRTC %d\n" msgstr "CRT %d контроллері үшін режимдерді тексеру\n" -#: libgnome-desktop/gnome-rr-config.c:955 +#: libgnome-desktop/gnome-rr-config.c:950 #, c-format msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n" msgstr "CRTC %d: %dx%d@%dГц режимін көру, %dx%d@%dГц шығысымен (%d-талабы)\n" -#: libgnome-desktop/gnome-rr-config.c:1002 +#: libgnome-desktop/gnome-rr-config.c:997 #, c-format msgid "" "could not assign CRTCs to outputs:\n" @@ -75,7 +119,7 @@ "шығыстар үшін CRT контроллерларын орнату сәтсіз:\n" "%s" -#: libgnome-desktop/gnome-rr-config.c:1006 +#: libgnome-desktop/gnome-rr-config.c:1001 #, c-format msgid "" "none of the selected modes were compatible with the possible modes:\n" @@ -87,7 +131,7 @@ #. Translators: the "requested", "minimum", and #. * "maximum" words here are not keywords; please #. * translate them as usual. -#: libgnome-desktop/gnome-rr-config.c:1087 +#: libgnome-desktop/gnome-rr-config.c:1082 #, c-format msgid "" "required virtual size does not fit available size: requested=(%d, %d), " @@ -99,94 +143,86 @@ #. Translators: This is the time format with full date #. plus day used in 24-hour mode. Please keep the under- #. score to separate the date from the time. -#: libgnome-desktop/gnome-wall-clock.c:290 -#| msgid "%a %b %e, %R:%S" +#: libgnome-desktop/gnome-wall-clock.c:330 msgid "%a %b %-e_%R:%S" msgstr "%a %b %-e_%R:%S" -#: libgnome-desktop/gnome-wall-clock.c:291 -#| msgid "%a %b %e, %R" +#: libgnome-desktop/gnome-wall-clock.c:331 msgid "%a %b %-e_%R" msgstr "%a %b %-e_%R" #. Translators: This is the time format with full date #. used in 24-hour mode. Please keep the underscore to #. separate the date from the time. -#: libgnome-desktop/gnome-wall-clock.c:296 -#| msgid "%a %b %e, %R:%S" +#: libgnome-desktop/gnome-wall-clock.c:336 msgid "%b %-e_%R:%S" msgstr "%b %-e_%R:%S" -#: libgnome-desktop/gnome-wall-clock.c:297 -#| msgid "%a %b %e, %R" +#: libgnome-desktop/gnome-wall-clock.c:337 msgid "%b %-e_%R" msgstr "%b %-e_%R" #. Translators: This is the time format with day used #. in 24-hour mode. -#: libgnome-desktop/gnome-wall-clock.c:301 +#: libgnome-desktop/gnome-wall-clock.c:341 msgid "%a %R:%S" msgstr "%a %R:%S" -#: libgnome-desktop/gnome-wall-clock.c:302 +#: libgnome-desktop/gnome-wall-clock.c:342 msgid "%a %R" msgstr "%a %R" #. Translators: This is the time format without date used #. in 24-hour mode. -#: libgnome-desktop/gnome-wall-clock.c:306 +#: libgnome-desktop/gnome-wall-clock.c:346 msgid "%R:%S" msgstr "%R:%S" -#: libgnome-desktop/gnome-wall-clock.c:306 +#: libgnome-desktop/gnome-wall-clock.c:347 msgid "%R" msgstr "%R" #. Translators: This is a time format with full date #. plus day used for AM/PM. Please keep the under- #. score to separate the date from the time. -#: libgnome-desktop/gnome-wall-clock.c:314 -#| msgid "%a %b %e, %l:%M:%S %p" +#: libgnome-desktop/gnome-wall-clock.c:355 msgid "%a %b %-e_%l:%M:%S %p" -msgstr "%a %b %-e_%l:%M:%S %p" +msgstr "%a %b %-e_%H:%M:%S" -#: libgnome-desktop/gnome-wall-clock.c:315 -#| msgid "%a %b %e, %l:%M %p" +#: libgnome-desktop/gnome-wall-clock.c:356 msgid "%a %b %-e_%l:%M %p" -msgstr "%a %b %-e_%l:%M %p" +msgstr "%a %b %-e_%H:%M" #. Translators: This is a time format with full date #. used for AM/PM. Please keep the underscore to #. separate the date from the time. -#: libgnome-desktop/gnome-wall-clock.c:320 -#| msgid "%a %b %e, %l:%M:%S %p" +#: libgnome-desktop/gnome-wall-clock.c:361 msgid "%b %-e_%l:%M:%S %p" -msgstr "%b %-e_%l:%M:%S %p" +msgstr "%b %-e_%H:%M:%S" -#: libgnome-desktop/gnome-wall-clock.c:321 -#| msgid "%a %b %e, %l:%M %p" +#: libgnome-desktop/gnome-wall-clock.c:362 msgid "%b %-e_%l:%M %p" -msgstr "%b %-e_%l:%M %p" +msgstr "%b %-e_%H:%M" #. Translators: This is a time format with day used #. for AM/PM. -#: libgnome-desktop/gnome-wall-clock.c:325 +#: libgnome-desktop/gnome-wall-clock.c:366 msgid "%a %l:%M:%S %p" -msgstr "%a %l:%M:%S %p" +msgstr "%a %H:%M:%S" -#: libgnome-desktop/gnome-wall-clock.c:326 +#: libgnome-desktop/gnome-wall-clock.c:367 msgid "%a %l:%M %p" -msgstr "%a %l:%M %p" +msgstr "%a %H:%M" #. Translators: This is a time format without date used #. for AM/PM. -#: libgnome-desktop/gnome-wall-clock.c:330 +#: libgnome-desktop/gnome-wall-clock.c:371 msgid "%l:%M:%S %p" -msgstr "%l:%M:%S %p" +msgstr "%H:%M:%S" -#: libgnome-desktop/gnome-wall-clock.c:331 +#: libgnome-desktop/gnome-wall-clock.c:372 msgid "%l:%M %p" -msgstr "%l:%M %p" +msgstr "%H:%M" #~ msgctxt "Monitor vendor" #~ msgid "Unknown" diff -Nru gnome-desktop3-3.36.3.1/po/zh_CN.po gnome-desktop3-3.36.8/po/zh_CN.po --- gnome-desktop3-3.36.3.1/po/zh_CN.po 2020-06-14 21:18:25.509147600 +0000 +++ gnome-desktop3-3.36.8/po/zh_CN.po 2020-11-24 18:05:55.392745500 +0000 @@ -18,38 +18,83 @@ msgid "" msgstr "" "Project-Id-Version: gnome-desktop master\n" -"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-desktop/issues\n" -"POT-Creation-Date: 2018-09-03 17:34+0000\n" -"PO-Revision-Date: 2018-09-05 15:36+0800\n" -"Last-Translator: Dingzhong Chen \n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-desktop/" +"issues\n" +"POT-Creation-Date: 2020-06-25 06:11+0000\n" +"PO-Revision-Date: 2020-07-01 15:13-0400\n" +"Last-Translator: Boyuan Yang <073plan@gmail.com>\n" "Language-Team: Chinese (China) \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Gtranslator 2.91.7\n" +"X-Generator: Poedit 2.3.1\n" -#: libgnome-desktop/gnome-languages.c:711 +#: libgnome-desktop/gnome-languages.c:717 msgid "Unspecified" msgstr "未指定" -#: libgnome-desktop/gnome-rr-config.c:759 +#. TRANSLATORS: Used to distinguish the labels representing the gez_ER +#. and gez_ET locales from gez_ER@abegede respective gez_ET@abegede. The +#. difference is related to collation. +#: libgnome-desktop/gnome-languages.c:1382 +msgid "Abegede" +msgstr "Abegede" + +#. TRANSLATORS: Used to distinguish Cyrillic from Latin written language variants. +#: libgnome-desktop/gnome-languages.c:1384 +msgid "Cyrillic" +msgstr "西里尔文" + +#. TRANSLATORS: Also known as "Nagari", a written variant for many languages +#. of the Indian subcontinent. See: +#. https://en.wikipedia.org/wiki/Devanagari +#: libgnome-desktop/gnome-languages.c:1388 +msgid "Devanagari" +msgstr "天城文" + +#. TRANSLATORS: Used to distinguish the label representing the tt_RU +#. locale from tt_RU@iqtelif. It's a special alphabet for Tatar. +#: libgnome-desktop/gnome-languages.c:1391 +msgid "IQTElif" +msgstr "IQTElif" + +#. TRANSLATORS: The alphabet/script, not the language. Used to distinguish +#. Latin from Cyrillic written language variants. +#: libgnome-desktop/gnome-languages.c:1394 +msgid "Latin" +msgstr "拉丁文" + +#. TRANSLATORS: "Saho" is a variant of the Afar language. Used to +#. distinguish the label representing the aa_ER locale from aa_ER@saaho. +#: libgnome-desktop/gnome-languages.c:1397 +msgid "Saho" +msgstr "萨霍语" + +#. TRANSLATORS: "Valencia" is a dialect of the Catalan language spoken +#. in Valencia. Used to distinguish the label representing the ca_ES +#. locale from ca_ES@valencia. +#: libgnome-desktop/gnome-languages.c:1401 +msgid "Valencia" +msgstr "巴伦西亚语" + +#: libgnome-desktop/gnome-rr-config.c:754 #, c-format msgid "CRTC %d cannot drive output %s" msgstr "CRTC %d 不能驱动输出 %s" -#: libgnome-desktop/gnome-rr-config.c:766 +#: libgnome-desktop/gnome-rr-config.c:761 #, c-format msgid "output %s does not support mode %dx%d@%dHz" msgstr "输出 %s 不支持 %dx%d@%dHz 模式" -#: libgnome-desktop/gnome-rr-config.c:777 +#: libgnome-desktop/gnome-rr-config.c:772 #, c-format msgid "CRTC %d does not support rotation=%d" msgstr "CRTC %d 不支持旋转=%d" -#: libgnome-desktop/gnome-rr-config.c:790 +#: libgnome-desktop/gnome-rr-config.c:785 #, c-format msgid "" "output %s does not have the same parameters as another cloned output:\n" @@ -61,22 +106,24 @@ "当前模式= %d，新模式= %d\n" "当前坐标= (%d, %d)，新坐标= (%d, %d)当前旋转= %d，新旋转= %d" -#: libgnome-desktop/gnome-rr-config.c:805 +#: libgnome-desktop/gnome-rr-config.c:800 #, c-format msgid "cannot clone to output %s" msgstr "不能克隆到输出 %s" -#: libgnome-desktop/gnome-rr-config.c:931 +#: libgnome-desktop/gnome-rr-config.c:926 #, c-format msgid "Trying modes for CRTC %d\n" msgstr "正在尝试 CRTC %d 的各种模式\n" -#: libgnome-desktop/gnome-rr-config.c:955 +#: libgnome-desktop/gnome-rr-config.c:950 #, c-format -msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n" -msgstr "CRTC %d: 正在尝试 %dx%d@%dHz 模式，使用 %dx%d@%dHz 输出(第 %d 回)\n" +msgid "" +"CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n" +msgstr "" +"CRTC %d: 正在尝试 %dx%d@%dHz 模式，使用 %dx%d@%dHz 输出(第 %d 回)\n" -#: libgnome-desktop/gnome-rr-config.c:1002 +#: libgnome-desktop/gnome-rr-config.c:997 #, c-format msgid "" "could not assign CRTCs to outputs:\n" @@ -85,7 +132,7 @@ "无法指定 CRTC 到输出：\n" "%s" -#: libgnome-desktop/gnome-rr-config.c:1006 +#: libgnome-desktop/gnome-rr-config.c:1001 #, c-format msgid "" "none of the selected modes were compatible with the possible modes:\n" @@ -97,94 +144,95 @@ #. Translators: the "requested", "minimum", and #. * "maximum" words here are not keywords; please #. * translate them as usual. -#: libgnome-desktop/gnome-rr-config.c:1087 +#: libgnome-desktop/gnome-rr-config.c:1082 #, c-format msgid "" "required virtual size does not fit available size: requested=(%d, %d), " "minimum=(%d, %d), maximum=(%d, %d)" msgstr "" -"要求的虚拟尺寸不符合可用尺寸： 要求=(%d, %d)， 最小=(%d, %d)，最大=(%d, %d)" +"要求的虚拟尺寸不符合可用尺寸： 要求=(%d, %d)， 最小=(%d, %d)，最大" +"=(%d, %d)" #. Translators: This is the time format with full date #. plus day used in 24-hour mode. Please keep the under- #. score to separate the date from the time. -#: libgnome-desktop/gnome-wall-clock.c:290 +#: libgnome-desktop/gnome-wall-clock.c:330 msgid "%a %b %-e_%R:%S" -msgstr "%-m月%-e日 %A，%R:%S" +msgstr "%-m月%-e日 %A_%R:%S" -#: libgnome-desktop/gnome-wall-clock.c:291 +#: libgnome-desktop/gnome-wall-clock.c:331 msgid "%a %b %-e_%R" -msgstr "%-m月%-e日 %A，%R" +msgstr "%-m月%-e日 %A_%R" #. Translators: This is the time format with full date #. used in 24-hour mode. Please keep the underscore to #. separate the date from the time. -#: libgnome-desktop/gnome-wall-clock.c:296 +#: libgnome-desktop/gnome-wall-clock.c:336 msgid "%b %-e_%R:%S" -msgstr "%-m月%-e日 %A，%R:%S" +msgstr "%-m月%-e日_%R:%S" -#: libgnome-desktop/gnome-wall-clock.c:297 +#: libgnome-desktop/gnome-wall-clock.c:337 msgid "%b %-e_%R" -msgstr "%-m月%-e日 %A，%R" +msgstr "%-m月%-e日_%R" #. Translators: This is the time format with day used #. in 24-hour mode. -#: libgnome-desktop/gnome-wall-clock.c:301 +#: libgnome-desktop/gnome-wall-clock.c:341 msgid "%a %R:%S" msgstr "%A %R:%S" -#: libgnome-desktop/gnome-wall-clock.c:302 +#: libgnome-desktop/gnome-wall-clock.c:342 msgid "%a %R" msgstr "%A %R" #. Translators: This is the time format without date used #. in 24-hour mode. -#: libgnome-desktop/gnome-wall-clock.c:306 +#: libgnome-desktop/gnome-wall-clock.c:346 msgid "%R:%S" msgstr "%R:%S" -#: libgnome-desktop/gnome-wall-clock.c:306 +#: libgnome-desktop/gnome-wall-clock.c:347 msgid "%R" msgstr "%R" #. Translators: This is a time format with full date #. plus day used for AM/PM. Please keep the under- #. score to separate the date from the time. -#: libgnome-desktop/gnome-wall-clock.c:314 +#: libgnome-desktop/gnome-wall-clock.c:355 msgid "%a %b %-e_%l:%M:%S %p" -msgstr "%-m月%-e日 %A，%p %-l:%M:%S" +msgstr "%-m月%-e日 %A_%p %-l:%M:%S" -#: libgnome-desktop/gnome-wall-clock.c:315 +#: libgnome-desktop/gnome-wall-clock.c:356 msgid "%a %b %-e_%l:%M %p" -msgstr "%-m月%-e日 %A，%p %-l:%M" +msgstr "%-m月%-e日 %A_%p %-l:%M" #. Translators: This is a time format with full date #. used for AM/PM. Please keep the underscore to #. separate the date from the time. -#: libgnome-desktop/gnome-wall-clock.c:320 +#: libgnome-desktop/gnome-wall-clock.c:361 msgid "%b %-e_%l:%M:%S %p" -msgstr "%-m月%-e日 %A，%p %-l:%M:%S" +msgstr "%-m月%-e日_%p %-l:%M:%S" -#: libgnome-desktop/gnome-wall-clock.c:321 +#: libgnome-desktop/gnome-wall-clock.c:362 msgid "%b %-e_%l:%M %p" -msgstr "%-m月%-e日 %A，%p %-l:%M" +msgstr "%-m月%-e日_%p %-l:%M" #. Translators: This is a time format with day used #. for AM/PM. -#: libgnome-desktop/gnome-wall-clock.c:325 +#: libgnome-desktop/gnome-wall-clock.c:366 msgid "%a %l:%M:%S %p" msgstr "%A %p %-l:%M:%S" -#: libgnome-desktop/gnome-wall-clock.c:326 +#: libgnome-desktop/gnome-wall-clock.c:367 msgid "%a %l:%M %p" msgstr "%A %p %-l:%M" #. Translators: This is a time format without date used #. for AM/PM. -#: libgnome-desktop/gnome-wall-clock.c:330 +#: libgnome-desktop/gnome-wall-clock.c:371 msgid "%l:%M:%S %p" msgstr "%p %-l:%M:%S" -#: libgnome-desktop/gnome-wall-clock.c:331 +#: libgnome-desktop/gnome-wall-clock.c:372 msgid "%l:%M %p" msgstr "%p %-l:%M" diff -Nru gnome-desktop3-3.36.3.1/tests/meson.build gnome-desktop3-3.36.8/tests/meson.build --- gnome-desktop3-3.36.3.1/tests/meson.build 2020-06-14 21:18:25.510147600 +0000 +++ gnome-desktop3-3.36.8/tests/meson.build 2020-11-24 18:05:55.392745500 +0000 @@ -37,10 +37,9 @@ ) endif - test(program, - exe, - env: test_env - ) + # Don't run these tests at build-time with test(): currently both tests + # rely on our locales having been installed, and at build-time that + # hasn't happened yet. endforeach if get_option('installed_tests')