Hello community, here is the log from the commit of package gnome-desktop for openSUSE:Factory checked in at 2020-07-13 09:06:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-desktop (Old) and /work/SRC/openSUSE:Factory/.gnome-desktop.new.3060 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-desktop" Mon Jul 13 09:06:01 2020 rev:159 rq:819959 version:3.36.4 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-desktop/gnome-desktop.changes 2020-06-22 17:42:47.473247472 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-desktop.new.3060/gnome-desktop.changes 2020-07-13 09:06:16.556205595 +0200 @@ -1,0 +2,7 @@ +Wed Jul 8 17:50:05 UTC 2020 - Bjørn Lie <[email protected]> + +- Update to version 3.36.4: + + tests: Don't run at build-time. + + Updated translations. + +------------------------------------------------------------------- Old: ---- gnome-desktop-3.36.3.1.tar.xz New: ---- gnome-desktop-3.36.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-desktop.spec ++++++ --- /var/tmp/diff_new_pack.ds0ScI/_old 2020-07-13 09:06:17.336207556 +0200 +++ /var/tmp/diff_new_pack.ds0ScI/_new 2020-07-13 09:06:17.340207566 +0200 @@ -17,7 +17,7 @@ Name: gnome-desktop -Version: 3.36.3.1 +Version: 3.36.4 Release: 0 Summary: The GNOME Desktop API Library License: LGPL-2.1-or-later ++++++ gnome-desktop-3.36.3.1.tar.xz -> gnome-desktop-3.36.4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-desktop-3.36.3.1/NEWS new/gnome-desktop-3.36.4/NEWS --- old/gnome-desktop-3.36.3.1/NEWS 2020-06-14 23:18:25.478147000 +0200 +++ new/gnome-desktop-3.36.4/NEWS 2020-07-08 19:06:27.000000000 +0200 @@ -1,4 +1,11 @@ =============== +Version 3.36.4 +=============== + +- tests: Don't run at build-time +- Translation updates + +=============== Version 3.36.3 =============== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-desktop-3.36.3.1/meson.build new/gnome-desktop-3.36.4/meson.build --- old/gnome-desktop-3.36.3.1/meson.build 2020-06-14 23:18:25.498147500 +0200 +++ new/gnome-desktop-3.36.4/meson.build 2020-07-08 19:06:27.000000000 +0200 @@ -1,6 +1,6 @@ project('gnome-desktop', 'c', meson_version: '>= 0.49.0', - version: '3.36.3.1', + version: '3.36.4', 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.4' soversion = libversion.split('.')[0] gdk_pixbuf_req = '>= 2.36.5' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-desktop-3.36.3.1/po/kk.po new/gnome-desktop-3.36.4/po/kk.po --- old/gnome-desktop-3.36.3.1/po/kk.po 2020-06-14 23:18:25.504147500 +0200 +++ new/gnome-desktop-3.36.4/po/kk.po 2020-07-08 19:06:27.000000000 +0200 @@ -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 <[email protected]>, 2010. +# Baurzhan Muftakhidinov <[email protected]>, 2010-2020. # Moldabekov Margulan <[email protected]>, 2008 # Erzhan Shaniev <[email protected]>, 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 <[email protected]>\n" "Language-Team: Kazakh <[email protected]>\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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-desktop-3.36.3.1/po/zh_CN.po new/gnome-desktop-3.36.4/po/zh_CN.po --- old/gnome-desktop-3.36.3.1/po/zh_CN.po 2020-06-14 23:18:25.509147600 +0200 +++ new/gnome-desktop-3.36.4/po/zh_CN.po 2020-07-08 19:06:27.000000000 +0200 @@ -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 <[email protected]>\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 <[email protected]>\n" "Language-Team: Chinese (China) <[email protected]>\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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-desktop-3.36.3.1/tests/meson.build new/gnome-desktop-3.36.4/tests/meson.build --- old/gnome-desktop-3.36.3.1/tests/meson.build 2020-06-14 23:18:25.510147600 +0200 +++ new/gnome-desktop-3.36.4/tests/meson.build 2020-07-08 19:06:27.000000000 +0200 @@ -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')
