Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package cheese for openSUSE:Factory checked
in at 2021-11-18 10:33:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cheese (Old)
and /work/SRC/openSUSE:Factory/.cheese.new.1895 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cheese"
Thu Nov 18 10:33:08 2021 rev:111 rq:931782 version:41.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/cheese/cheese.changes 2021-09-29
20:17:30.698789969 +0200
+++ /work/SRC/openSUSE:Factory/.cheese.new.1895/cheese.changes 2021-11-18
10:33:28.155887060 +0100
@@ -1,0 +2,18 @@
+Mon Nov 15 15:12:59 UTC 2021 - Bj??rn Lie <bjorn....@gmail.com>
+
+- Update to version 41.1:
+ + meson: avoid positional arguments in merge_file.
+ + tests: Compile gsettings schemas for use in build tests.
+ + Update DOAP with Gitlab account information.
+ + introspection: Pin the API version for now.
+ + Updated translations.
+- Rename typelib-1_0-Cheese-41_0 subpackage to
+ typelib-1_0-Cheese-3_0 again, following upstreams revert. Do this
+ via 2 new defines, typelib_major 3 and typelib_minor 0.
+- Use ldconfig_scriptlets for post(un) handling.
+- Drop removal of la files, not needed with meson buildsystem.
+- Drop libcheese-gtk18 Obsoletes, it was added 10 years ago, we can
+ probably expect everyone to have updated by now.
+- Stop packaging help files as docs, silence rpmlint.
+
+-------------------------------------------------------------------
Old:
----
cheese-41.0.tar.xz
New:
----
cheese-41.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cheese.spec ++++++
--- /var/tmp/diff_new_pack.e1B2cU/_old 2021-11-18 10:33:28.615887488 +0100
+++ /var/tmp/diff_new_pack.e1B2cU/_new 2021-11-18 10:33:28.619887492 +0100
@@ -18,9 +18,11 @@
%define lib_major 8
%define lib_gtk_major 25
+%define typelib_major 3
+%define typelib_minor 0
Name: cheese
-Version: 41.0
+Version: 41.1
Release: 0
Summary: Webcam Booth for GNOME
License: GPL-2.0-or-later
@@ -71,11 +73,11 @@
Cheese is an application to take photos and videos with your webcam,
with fun graphical effects.
-%package -n typelib-1_0-Cheese-41_0
+%package -n typelib-1_0-Cheese-%{typelib_major}_%{typelib_minor}
Summary: Introspection bindings for libcheese
Group: System/Libraries
-%description -n typelib-1_0-Cheese-41_0
+%description -n typelib-1_0-Cheese-%{typelib_major}_%{typelib_minor}
Cheese is an application to take photos and videos with your webcam,
with fun graphical effects.
@@ -87,9 +89,6 @@
# The library is using gsettings keys that are defined in the -common package
Group: System/Libraries
Requires: libcheese-common >= %{version}
-# Obsolete the old libcheese-gtk18 library, technially wrong, but needed here
-# for a smooth update process. Solved for the future with a -common subpackage
-Obsoletes: libcheese-gtk18
%description -n libcheese-gtk%{lib_gtk_major}
Cheese is an application to take photos and videos with your webcam,
@@ -114,7 +113,7 @@
Group: Development/Libraries/GNOME
Requires: libcheese%{lib_major} = %{version}
Requires: libcheese-gtk%{lib_gtk_major} = %{version}
-Requires: typelib-1_0-Cheese-41_0 = %{version}
+Requires: typelib-1_0-Cheese-%{typelib_major}_%{typelib_minor} =
%{version}
%description devel
Cheese is an application to take photos and videos with your webcam,
@@ -131,20 +130,17 @@
%install
%meson_install
-find %{buildroot} -type f -name "*.la" -delete -print
%find_lang %{name} %{?no_lang_C}
%suse_update_desktop_file org.gnome.Cheese
%fdupes %{buildroot}%{_datadir}/help/
-%post -n libcheese%{lib_major} -p /sbin/ldconfig
-%postun -n libcheese%{lib_major} -p /sbin/ldconfig
-%post -n libcheese-gtk%{lib_gtk_major} -p /sbin/ldconfig
-%postun -n libcheese-gtk%{lib_gtk_major} -p /sbin/ldconfig
+%ldconfig_scriptlets -n libcheese%{lib_major}
+%ldconfig_scriptlets -n libcheese-gtk%{lib_gtk_major}
%files
%license COPYING
%doc NEWS
-%doc %{_datadir}/help/C/%{name}/
+%{_datadir}/help/C/%{name}/
%{_bindir}/cheese
%dir %{_datadir}/metainfo
%{_datadir}/metainfo/org.gnome.Cheese.appdata.xml
@@ -156,8 +152,8 @@
%files -n libcheese%{lib_major}
%{_libdir}/libcheese.so.%{lib_major}*
-%files -n typelib-1_0-Cheese-41_0
-%{_libdir}/girepository-1.0/Cheese-41.0.typelib
+%files -n typelib-1_0-Cheese-%{typelib_major}_%{typelib_minor}
+%{_libdir}/girepository-1.0/Cheese-%{typelib_major}.%{typelib_minor}.typelib
%files -n libcheese-gtk%{lib_gtk_major}
%{_libdir}/libcheese-gtk.so.%{lib_gtk_major}*
@@ -172,7 +168,7 @@
%{_libdir}/pkgconfig/cheese-gtk.pc
%{_libdir}/libcheese.so
%{_libdir}/libcheese-gtk.so
-%{_datadir}/gir-1.0/Cheese-41.0.gir
+%{_datadir}/gir-1.0/Cheese-%{typelib_major}.%{typelib_minor}.gir
%{_datadir}/gtk-doc/html/cheese/
%files lang -f %{name}.lang
++++++ cheese-41.0.tar.xz -> cheese-41.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cheese-41.0/NEWS new/cheese-41.1/NEWS
--- old/cheese-41.0/NEWS 2021-09-20 09:16:32.721539300 +0200
+++ new/cheese-41.1/NEWS 2021-11-15 15:57:12.669718300 +0100
@@ -1,6 +1,17 @@
ChangeLog for Cheese
--------------------
+version 41.1
+ - meson: avoid positional arguments in merge_file
+ https://gitlab.gnome.org/GNOME/cheese/-/issues/124
+ - tests: Compile gsettings schemas for use in build tests
+ Closes: https://bugzilla.gnome.org/show_bug.cgi?id=731009
+ - Update DOAP with Gitlab account information
+ https://gitlab.gnome.org/GNOME/cheese/-/issues/117
+ - introspection: Pin the API version for now
+ - Added/Updated Translations
+ - bg, courtesy of Alexander Shopov
+
version 41.0
- Allow headerbar to appear on all desktops
Removed gtk_dialogs_use_header() and accompanying code to allow the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cheese-41.0/cheese.doap new/cheese-41.1/cheese.doap
--- old/cheese-41.0/cheese.doap 2021-09-20 09:16:32.721539300 +0200
+++ new/cheese-41.1/cheese.doap 2021-11-15 15:57:12.669718300 +0100
@@ -34,13 +34,12 @@
<foaf:mbox rdf:resource="mailto:amigad...@amigadave.com"; />
<foaf:seeAlso rdf:resource="http://amigadave.com/foaf.rdf#david"; />
<gnome:userid>davidk</gnome:userid>
- </foaf:Person>
- </maintainer>
- <maintainer>
- <foaf:Person>
- <foaf:name>Luciana Fujii Pontello</foaf:name>
- <foaf:mbox rdf:resource="mailto:luci...@fujii.eti.br"; />
- <gnome:userid>lufujii</gnome:userid>
+ <foaf:account>
+ <foaf:OnlineAccount>
+ <foaf:accountServiceHomepage
rdf:resource="https://gitlab.gnome.org/"/>
+ <foaf:accountName>davidk</foaf:accountName>
+ </foaf:OnlineAccount>
+ </foaf:account>
</foaf:Person>
</maintainer>
</Project>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cheese-41.0/data/meson.build
new/cheese-41.1/data/meson.build
--- old/cheese-41.0/data/meson.build 2021-09-20 09:16:32.722539200 +0200
+++ new/cheese-41.1/data/meson.build 2021-11-15 15:57:12.670718400 +0100
@@ -23,10 +23,9 @@
desktop = cheese_namespace + '.desktop'
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop + '.in',
- output: '@BASENAME@',
+ output: desktop,
po_dir: po_dir,
install: true,
install_dir: cheese_datadir / 'applications',
@@ -35,9 +34,8 @@
appdata = cheese_namespace + '.appdata.xml'
i18n.merge_file(
- appdata,
input: appdata + '.in',
- output: '@BASENAME@',
+ output: appdata,
po_dir: po_dir,
install: true,
install_dir: cheese_datadir / 'metainfo',
@@ -51,6 +49,8 @@
install_dir: dbus_session_bus_services_dir,
)
+compile_schemas = gnome.compile_schemas()
+
install_data(
cheese_namespace + '.gschema.xml',
install_dir: gio_schemasdir,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cheese-41.0/meson.build new/cheese-41.1/meson.build
--- old/cheese-41.0/meson.build 2021-09-20 09:16:32.736539400 +0200
+++ new/cheese-41.1/meson.build 2021-11-15 15:57:12.682718500 +0100
@@ -1,6 +1,6 @@
project(
'cheese', ['c', 'vala'],
- version: '41.0',
+ version: '41.1',
license: 'GPL2',
default_options: 'buildtype=debugoptimized',
meson_version: '>= 0.50.0',
@@ -13,7 +13,8 @@
cheese_major_version = version_array[0].to_int()
cheese_minor_version = version_array[1].to_int()
-cheese_api_version = cheese_major_version.to_string() + '.0'
+#cheese_api_version = cheese_major_version.to_string() + '.0'
+cheese_api_version = '3.0'
cheese_prefix = get_option('prefix')
cheese_bindir = get_option('bindir')
@@ -35,12 +36,12 @@
# change to C+1:0:0
# - If the interface is the same as the previous version, change to C:R+1:A
current = 8
-revision = 16
+revision = 17
age = 0
libcheese_version = '@0@.@1@.@2@'.format(current - age, age, revision)
current = 26
-revision = 6
+revision = 7
age = 1
libcheese_gtk_version = '@0@.@1@.@2@'.format(current - age, age, revision)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cheese-41.0/po/bg.po new/cheese-41.1/po/bg.po
--- old/cheese-41.0/po/bg.po 2021-09-20 09:16:32.739539400 +0200
+++ new/cheese-41.1/po/bg.po 2021-11-15 15:57:12.685718500 +0100
@@ -1,16 +1,17 @@
# Bulgarian translation of cheese po-file.
# Copyright (C) 2008, 2009, 2010, 2012, 2013, 2016, 2017 Free Software
Foundation, Inc.
# Copyright (C) 2010, 2011, 2012 Krasimir Chonov <mk2...@abv.bg>.
+# Copyright (C) 2021 Alexander Shopov.
# This file is distributed under the same license as the cheese package.
-# Alexander Shopov <a...@kambanaria.org>, 2008, 2009, 2010, 2012, 2013, 2016,
2017.
+# Alexander Shopov <a...@kambanaria.org>, 2008, 2009, 2010, 2012, 2013, 2016,
2017, 2021.
# Krasimir Chonov <mk2...@abv.bg>, 2010, 2011, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: cheese master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-02 09:30+0300\n"
-"PO-Revision-Date: 2017-08-25 10:52+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/cheese/issues\n";
+"POT-Creation-Date: 2021-09-21 06:25+0000\n"
+"PO-Revision-Date: 2021-10-05 16:37+0200\n"
"Last-Translator: Alexander Shopov <a...@kambanaria.org>\n"
"Language-Team: Bulgarian <d...@fsa-bg.org>\n"
"Language: bg\n"
@@ -19,182 +20,180 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../data/cheese-main-window.ui.h:1
+#: data/cheese-main-window.ui:52
msgid "Photo mode"
msgstr "?????????? ??????????????????"
-#: ../data/cheese-main-window.ui.h:2
+#: data/cheese-main-window.ui:53
msgid "Photo"
msgstr "????????????"
-#: ../data/cheese-main-window.ui.h:3
+#: data/cheese-main-window.ui:65
msgid "Video mode"
msgstr "?????????? ????????????????"
-#: ../data/cheese-main-window.ui.h:4
+#: data/cheese-main-window.ui:66
msgid "Video"
msgstr "??????????"
-#: ../data/cheese-main-window.ui.h:5
+#: data/cheese-main-window.ui:77
msgid "Photo burst mode"
msgstr "?????????? ???? ????????????"
-#: ../data/cheese-main-window.ui.h:6
+#: data/cheese-main-window.ui:78
msgid "Burst"
msgstr "??????????"
-#: ../data/cheese-main-window.ui.h:7 ../src/cheese-window.vala:1321
+#: data/cheese-main-window.ui:107 src/cheese-window.vala:1409
msgid "Take a photo using a webcam"
msgstr "???????????? ?? ????????????"
-#: ../data/cheese-main-window.ui.h:8
+#: data/cheese-main-window.ui:133
msgid "Navigate to the previous page of effects"
msgstr "?????? ???????????????????? ???????????????? ?? ????????????"
-#: ../data/cheese-main-window.ui.h:9
+#: data/cheese-main-window.ui:148
msgid "Effects"
msgstr "????????????"
-#: ../data/cheese-main-window.ui.h:10
+#: data/cheese-main-window.ui:157
msgid "_Effects"
msgstr "_????????????"
-#: ../data/cheese-main-window.ui.h:11
+#: data/cheese-main-window.ui:170
msgid "Navigate to the next page of effects"
msgstr "?????? ???????????????????? ???????????????? ?? ????????????"
-#: ../data/cheese-main-window.ui.h:12
+#: data/cheese-main-window.ui:192
msgid "Leave fullscreen mode and go back to windowed mode"
msgstr "?????????? ???? ?????? ??????????"
-#: ../data/cheese-prefs.ui.h:1
+#: data/cheese-prefs.ui:7
msgid "Preferences"
msgstr "??????????????????"
-#: ../data/cheese-prefs.ui.h:2 ../data/menus.ui.h:3
+#: data/cheese-prefs.ui:13 data/headerbar.ui:21
msgid "_Help"
msgstr "????????_??"
-#: ../data/cheese-prefs.ui.h:3
+#: data/cheese-prefs.ui:22
msgid "_Close"
msgstr "_??????????????????"
-#: ../data/cheese-prefs.ui.h:4
+#: data/cheese-prefs.ui:51
msgid "Device"
msgstr "????????????????????"
-#: ../data/cheese-prefs.ui.h:5
+#: data/cheese-prefs.ui:66
msgid "Photo resolution"
msgstr "???????????????????????? ???????????????????? ???? ????????????"
-#: ../data/cheese-prefs.ui.h:6
+#: data/cheese-prefs.ui:81
msgid "Video resolution"
msgstr "???????????????????????? ???????????????????? ???? ??????????"
-#: ../data/cheese-prefs.ui.h:7 ../libcheese/cheese-fileutil.c:283
-#: ../libcheese/cheese-fileutil.c:303
+#: data/cheese-prefs.ui:140 libcheese/cheese-fileutil.c:283
+#: libcheese/cheese-fileutil.c:303
msgid "Webcam"
msgstr "????????????"
-#: ../data/cheese-prefs.ui.h:8
+#: data/cheese-prefs.ui:159
msgid "Brightness"
msgstr "????????????"
-#: ../data/cheese-prefs.ui.h:9
+#: data/cheese-prefs.ui:174
msgid "Saturation"
msgstr "????????????????"
-#: ../data/cheese-prefs.ui.h:10
+#: data/cheese-prefs.ui:189
msgid "Hue"
msgstr "??????????????"
-#: ../data/cheese-prefs.ui.h:11
+#: data/cheese-prefs.ui:280
msgid "Contrast"
msgstr "????????????????"
-#: ../data/cheese-prefs.ui.h:12
+#: data/cheese-prefs.ui:298
msgid "Image"
msgstr "??????????????????????"
-#: ../data/cheese-prefs.ui.h:13
+#: data/cheese-prefs.ui:324
msgid "Shutter"
msgstr "???????? ?????? ????????????"
-#: ../data/cheese-prefs.ui.h:14
+#: data/cheese-prefs.ui:338
msgid "_Countdown"
msgstr "_????????????????????"
-#: ../data/cheese-prefs.ui.h:15
+#: data/cheese-prefs.ui:358
msgid "Fire _flash"
msgstr "_????????????????????"
-#: ../data/cheese-prefs.ui.h:16
+#: data/cheese-prefs.ui:394
msgid "Burst mode"
msgstr "?????????? ???? ????????????"
-#: ../data/cheese-prefs.ui.h:17
+#: data/cheese-prefs.ui:412
msgid "Number of photos"
msgstr "???????? ????????????"
-#: ../data/cheese-prefs.ui.h:18
+#: data/cheese-prefs.ui:427
msgid "Delay between photos (seconds)"
msgstr "???????????????? ?????????? ???????????????? ?? ??????????????"
-#: ../data/cheese-prefs.ui.h:19
+#: data/cheese-prefs.ui:486
msgid "Capture"
msgstr "??????????????????"
-#: ../data/headerbar.ui.h:1 ../libcheese/cheese-avatar-chooser.c:85
-#: ../src/cheese-window.vala:1350
-msgid "Take a Photo"
-msgstr "?????????????? ???? ????????????"
-
-#: ../data/menus.ui.h:1
+#: data/headerbar.ui:6
msgid "_Fullscreen"
msgstr "???? _?????? ??????????"
-#: ../data/menus.ui.h:2
+#: data/headerbar.ui:10
msgid "P_references"
msgstr "_??????????????????"
-#: ../data/menus.ui.h:4
-msgid "_About"
-msgstr "_??????????????"
-
-#: ../data/menus.ui.h:5
-msgid "_Quit"
-msgstr "_?????????????? ???? ????????????????????"
+#: data/headerbar.ui:16
+msgid "_Keyboard Shortcuts"
+msgstr "_???????????????? ????????????????????"
+
+#: data/headerbar.ui:25
+msgid "_About Cheese"
+msgstr "_?????????????? Cheese"
+
+#: data/headerbar.ui:32 libcheese/cheese-avatar-chooser.c:85
+#: src/cheese-window.vala:1438
+msgid "Take a Photo"
+msgstr "?????????????? ???? ????????????"
-#: ../data/menus.ui.h:6
+#: data/menus.ui:6
msgid "Open"
msgstr "????????????????"
-#: ../data/menus.ui.h:7
+#: data/menus.ui:11
msgid "Save _As???"
msgstr "?????????????????? _???????????"
-#: ../data/menus.ui.h:8
+#: data/menus.ui:16
msgid "Move to _Trash"
msgstr "??????_???????????????? ?? ??????????????"
-#: ../data/menus.ui.h:9
+#: data/menus.ui:21
msgid "Delete"
msgstr "??????????????????"
#. Both taken from the desktop file.
-#: ../data/org.gnome.Cheese.appdata.xml.in.h:2
-#: ../data/org.gnome.Cheese.desktop.in.in.h:1
-#: ../src/cheese-application.vala:113 ../src/cheese-application.vala:543
+#: data/org.gnome.Cheese.appdata.xml.in:9 data/org.gnome.Cheese.desktop.in:3
+#: src/cheese-application.vala:116 src/cheese-application.vala:582
msgid "Cheese"
msgstr "Cheese"
-#: ../data/org.gnome.Cheese.appdata.xml.in.h:3
-#: ../data/org.gnome.Cheese.desktop.in.in.h:4
-#: ../src/cheese-application.vala:538
+#: data/org.gnome.Cheese.appdata.xml.in:10 data/org.gnome.Cheese.desktop.in:5
+#: src/cheese-application.vala:577
msgid "Take photos and videos with your webcam, with fun graphical effects"
msgstr "????????e???????? ???? ???????????? ?? ?????????? ?? ????????????
?????? ???????????? ?? ?????????????????? ???? ????????????"
-#: ../data/org.gnome.Cheese.appdata.xml.in.h:4
+#: data/org.gnome.Cheese.appdata.xml.in:12
msgid ""
"Cheese uses your webcam to take photos and videos, applies fancy special "
"effects and lets you share the fun with others."
@@ -202,7 +201,7 @@
"Cheese ???????????????? ???????????????? ???? ???? ?????????????????? ????
???????????? ?? ??????????. ???????? ???? "
"?????????????????? ?????????????????? ???????????? ?????? ?????? ?? ???? ????
?????????????????? ?? ???????? ????????????????."
-#: ../data/org.gnome.Cheese.appdata.xml.in.h:5
+#: data/org.gnome.Cheese.appdata.xml.in:16
msgid ""
"Take multiple photos in quick succession with burst mode. Use the countdown "
"to give yourself time to strike a pose, and wait for the flash!"
@@ -211,7 +210,7 @@
"????????????. ?????????????????????? ???????????????????????? ????
????????????????????, ???? ???? ?????????? ?????????? ???? ?????????????? "
"????????????, ?????????? ?????? ???? ??????????????!"
-#: ../data/org.gnome.Cheese.appdata.xml.in.h:6
+#: data/org.gnome.Cheese.appdata.xml.in:21
msgid ""
"Under the hood, Cheese uses GStreamer to apply fancy effects to photos and "
"videos. With Cheese it is easy to take photos of you, your friends, pets or "
@@ -221,129 +220,128 @@
"???? ?????????????? ???????? ????, ???????????????????? ????,
?????????????????? ???? ?????????????? ??? ???????????? ?????????????? ???? "
"??????????, ?? ???????? ???????? ???????? ???? ??????????????????
??????????????????."
-#: ../data/org.gnome.Cheese.desktop.in.in.h:2
+#: data/org.gnome.Cheese.desktop.in:4
msgid "Webcam Booth"
msgstr "???????????? ?? ????????????????"
-#: ../data/org.gnome.Cheese.desktop.in.in.h:3
-msgid "Cheese Webcam Booth"
-msgstr "?????????? ???????????? ?? Cheese"
-
-#: ../data/org.gnome.Cheese.desktop.in.in.h:5
-msgid "photo;video;webcam;"
-msgstr
"????????;????????????????????;????????????;??????????;????????;????????????;photo;video;webcam;"
+#. Translators: Search terms to find this application. Do NOT translate or
localize the semicolons! The list MUST also end with a semicolon!
+#: data/org.gnome.Cheese.desktop.in:7
+msgid "photo;video;webcam;camera;selfie;"
+msgstr ""
+"photo;video;webcam;camera;selfie;????????;????????????????????;????????????;??????????;????????;????????????;"
+"??????????;"
-#: ../data/org.gnome.Cheese.gschema.xml.h:1
+#: data/org.gnome.Cheese.gschema.xml:5
msgid "Use a countdown"
msgstr "????????????????????"
-#: ../data/org.gnome.Cheese.gschema.xml.h:2
+#: data/org.gnome.Cheese.gschema.xml:6
msgid "Set to true to show a countdown before taking a photo"
msgstr "???????????????????? ?????????? ??????????????????"
-#: ../data/org.gnome.Cheese.gschema.xml.h:3
+#: data/org.gnome.Cheese.gschema.xml:11
msgid "Countdown length"
msgstr "??????????????????????"
-#: ../data/org.gnome.Cheese.gschema.xml.h:4
+#: data/org.gnome.Cheese.gschema.xml:12
msgid "The duration of the countdown before taking a photo, in seconds"
msgstr "?????????????????????? ???? ???????????????????????? ?? ??????????????"
-#: ../data/org.gnome.Cheese.gschema.xml.h:5
+#: data/org.gnome.Cheese.gschema.xml:18
msgid "Fire flash before taking a photo"
msgstr "???????????????????? ???? ????????????????????"
-#: ../data/org.gnome.Cheese.gschema.xml.h:6
+#: data/org.gnome.Cheese.gschema.xml:19
msgid "Set to true to fire a flash before taking a photo"
-msgstr "?????????????? ???? ???????????????????? ???? ????????????????????
?????? ??????????????"
+msgstr "?????????????? ???? ?? ???????????? ???? ???????????????????? ????
???????????????????? ?????? ??????????????"
-#: ../data/org.gnome.Cheese.gschema.xml.h:7
+#: data/org.gnome.Cheese.gschema.xml:24
msgid "Camera device string indicator"
msgstr "???????????????? ???? ????????????????????"
-#: ../data/org.gnome.Cheese.gschema.xml.h:8
+#: data/org.gnome.Cheese.gschema.xml:25
msgid ""
"The path to the device node which points to the camera, for example /dev/"
"video0"
msgstr "?????? ???? ?????????? ???????????????????? (????????????????
???/dev/video0???)."
-#: ../data/org.gnome.Cheese.gschema.xml.h:9
+#: data/org.gnome.Cheese.gschema.xml:30
msgid "Last selected effect"
msgstr "???????????????? ??????????"
-#: ../data/org.gnome.Cheese.gschema.xml.h:10
+#: data/org.gnome.Cheese.gschema.xml:31
msgid "Name of the installed effect that was selected last"
-msgstr "?????? ???? ?????????????????? ?????????????????? ??????????"
+msgstr "?????? ???? ???????????????? ?????????????????????? ??????????"
-#: ../data/org.gnome.Cheese.gschema.xml.h:11
+#: data/org.gnome.Cheese.gschema.xml:36
msgid "Photo width"
msgstr "???????????????? ???? ????????????"
-#: ../data/org.gnome.Cheese.gschema.xml.h:12
+#: data/org.gnome.Cheese.gschema.xml:37
msgid "The width of the image captured from the camera, in pixels"
msgstr "???????????????? ???? ?????????????????? ?????????????????????? ??
??????????????"
-#: ../data/org.gnome.Cheese.gschema.xml.h:13
+#: data/org.gnome.Cheese.gschema.xml:43
msgid "Photo height"
msgstr "???????????????? ???? ????????????"
-#: ../data/org.gnome.Cheese.gschema.xml.h:14
+#: data/org.gnome.Cheese.gschema.xml:44
msgid "The height of the image captured from the camera, in pixels"
msgstr "???????????????? ???? ?????????????????? ?????????????????????? ??
??????????????"
-#: ../data/org.gnome.Cheese.gschema.xml.h:15
+#: data/org.gnome.Cheese.gschema.xml:50
msgid "Video width"
msgstr "???????????????? ???? ??????????"
-#: ../data/org.gnome.Cheese.gschema.xml.h:16
+#: data/org.gnome.Cheese.gschema.xml:51
msgid "The width of the video captured from the camera, in pixels"
msgstr "???????????????? ???? ?????????????????? ?????????? ?? ??????????????"
-#: ../data/org.gnome.Cheese.gschema.xml.h:17
+#: data/org.gnome.Cheese.gschema.xml:57
msgid "Video height"
msgstr "???????????????? ???? ??????????"
-#: ../data/org.gnome.Cheese.gschema.xml.h:18
+#: data/org.gnome.Cheese.gschema.xml:58
msgid "The height of the video captured from the camera, in pixels"
msgstr "???????????????? ???? ?????????????????? ?????????? ?? ??????????????"
-#: ../data/org.gnome.Cheese.gschema.xml.h:19
+#: data/org.gnome.Cheese.gschema.xml:64
msgid "Image brightness"
msgstr "????????????"
-#: ../data/org.gnome.Cheese.gschema.xml.h:20
+#: data/org.gnome.Cheese.gschema.xml:65
msgid "Adjusts the brightness of the image coming from the camera"
msgstr "?????????????????????? ???? ???????????????? ???? ??????????????????
?????????????????????? ???? ????????????????"
-#: ../data/org.gnome.Cheese.gschema.xml.h:21
+#: data/org.gnome.Cheese.gschema.xml:71
msgid "Image contrast"
msgstr "????????????????"
-#: ../data/org.gnome.Cheese.gschema.xml.h:22
+#: data/org.gnome.Cheese.gschema.xml:72
msgid "Adjusts the contrast of the image coming from the camera"
msgstr "?????????????????????? ?????????????????? ???? ??????????????????
?????????????????????? ???? ????????????????"
-#: ../data/org.gnome.Cheese.gschema.xml.h:23
+#: data/org.gnome.Cheese.gschema.xml:78
msgid "Image saturation"
msgstr "????????????????"
-#: ../data/org.gnome.Cheese.gschema.xml.h:24
+#: data/org.gnome.Cheese.gschema.xml:79
msgid "Adjusts the saturation of the image coming from the camera"
msgstr "?????????????????????? ???? ???????????????????????? ????
?????????????????? ?????????????????????? ???? ????????????????"
-#: ../data/org.gnome.Cheese.gschema.xml.h:25
+#: data/org.gnome.Cheese.gschema.xml:85
msgid "Image hue"
msgstr "??????????????"
-#: ../data/org.gnome.Cheese.gschema.xml.h:26
+#: data/org.gnome.Cheese.gschema.xml:86
msgid "Adjusts the hue (color tint) of the image coming from the camera"
msgstr "?????????????????????? ???? ???????????????? ???? ??????????????????
?????????????????????? ???? ????????????????"
-#: ../data/org.gnome.Cheese.gschema.xml.h:27
+#: data/org.gnome.Cheese.gschema.xml:92
msgid "Video path"
msgstr "?????? ???? ??????????"
-#: ../data/org.gnome.Cheese.gschema.xml.h:28
+#: data/org.gnome.Cheese.gschema.xml:93
msgid ""
"Defines the path where the videos are stored. If empty, ???XDG_VIDEOS_DIR/"
"Webcam??? will be used."
@@ -351,11 +349,11 @@
"???????????? ?????? ???? ?????????? ???? ?????????????????????? ????
??????????. ?????? ?????????????????? ???? ???????????? "
"???XDG_VIDEOS_DIR/Webcam???."
-#: ../data/org.gnome.Cheese.gschema.xml.h:29
+#: data/org.gnome.Cheese.gschema.xml:98
msgid "Photo path"
msgstr "?????? ???? ????????????"
-#: ../data/org.gnome.Cheese.gschema.xml.h:30
+#: data/org.gnome.Cheese.gschema.xml:99
msgid ""
"Defines the path where the photos are stored. If empty, ???XDG_PICTURES_DIR/"
"Webcam??? will be used."
@@ -363,11 +361,11 @@
"???????????? ?????? ???? ?????????? ???? ?????????????????????? ????
????????????????. ?????? ?????????????????? ???? ???????????? "
"???XDG_PICTURES_DIR/Webcam???."
-#: ../data/org.gnome.Cheese.gschema.xml.h:31
+#: data/org.gnome.Cheese.gschema.xml:104
msgid "Time between photos in burst mode"
msgstr "???????????????? ?????????? ????????????????"
-#: ../data/org.gnome.Cheese.gschema.xml.h:32
+#: data/org.gnome.Cheese.gschema.xml:105
msgid ""
"The length of time, in milliseconds, to delay between taking each photo in a "
"burst sequence of photos. If the burst delay is less than the countdown "
@@ -377,36 +375,76 @@
"???? ???????????????? ?????????????? ???? ???????????????????? ??
????????????, ???? ???????????????????? ???????????????? ?? ????-"
"?????????? ???? ????????."
-#: ../data/org.gnome.Cheese.gschema.xml.h:33
+#: data/org.gnome.Cheese.gschema.xml:111
msgid "Number of photos in burst mode"
msgstr "???????? ????????????"
-#: ../data/org.gnome.Cheese.gschema.xml.h:34
+#: data/org.gnome.Cheese.gschema.xml:112
msgid "The number of photos to take in a single burst."
msgstr "???????? ???????????? ?????????????? ?? ???????? ??????????."
-#: ../libcheese/cheese-avatar-chooser.c:80 ../src/cheese-window.vala:264
-#: ../src/cheese-window.vala:293 ../src/cheese-window.vala:368
+#: data/shortcuts.ui:12
+msgctxt "shortcut window"
+msgid "Overview"
+msgstr "??????????????"
+
+#: data/shortcuts.ui:16
+msgctxt "shortcut window"
+msgid "Fullscreen on / off"
+msgstr "???????????????????????? ???? ?????? ??????????"
+
+#: data/shortcuts.ui:22
+msgctxt "shortcut window"
+msgid "Quit the application"
+msgstr "?????????????? ???? ????????????????????"
+
+#: data/shortcuts.ui:30
+msgctxt "shortcut window"
+msgid "Thumbnails"
+msgstr "??????????????????"
+
+#: data/shortcuts.ui:34
+msgctxt "shortcut window"
+msgid "Open"
+msgstr "????????????????"
+
+#: data/shortcuts.ui:40
+msgctxt "shortcut window"
+msgid "Save As"
+msgstr "?????????????????? ????????"
+
+#: data/shortcuts.ui:46
+msgctxt "shortcut window"
+msgid "Move to Trash"
+msgstr "?????????????????????? ?? ??????????????"
+
+#: data/shortcuts.ui:52
+msgctxt "shortcut window"
+msgid "Delete"
+msgstr "??????????????????"
+
+#: libcheese/cheese-avatar-chooser.c:80 src/cheese-window.vala:257
+#: src/cheese-window.vala:286 src/cheese-window.vala:361
msgid "_Cancel"
msgstr "_????????????"
-#: ../libcheese/cheese-avatar-chooser.c:82
+#: libcheese/cheese-avatar-chooser.c:82
msgid "_Select"
msgstr "_??????????"
-#: ../libcheese/cheese-avatar-widget.c:128 ../src/cheese-window.vala:692
+#: libcheese/cheese-avatar-widget.c:128 src/cheese-window.vala:685
msgid "Shutter sound"
msgstr "???????? ?????? ????????????"
-#: ../libcheese/cheese-avatar-widget.c:270
+#: libcheese/cheese-avatar-widget.c:270
msgid "_Take Another Picture"
msgstr "?????????????? _????????????"
-#: ../libcheese/cheese-camera.c:424 ../libcheese/cheese-camera.c:1602
+#: libcheese/cheese-camera.c:445 libcheese/cheese-camera.c:1639
msgid "One or more needed GStreamer elements are missing: "
msgstr "???????????? ???????? ???????? ?????????????? ???? GStreamer: "
-#: ../libcheese/cheese-camera.c:1544
+#: libcheese/cheese-camera.c:1581
#, c-format
msgid "No device found"
msgstr "???????????? ????????????"
@@ -416,164 +454,166 @@
#. * the separator that your locale uses or use "%Id" instead
#. * of "%d" if your locale uses localized digits.
#.
-#: ../libcheese/cheese-camera.c:1837
+#: libcheese/cheese-camera.c:1874
#, c-format
msgctxt "time format"
msgid "%02i:%02i:%02i"
msgstr "%02i:%02i:%02i"
-#: ../libcheese/cheese-camera-device.c:552
+#: libcheese/cheese-camera-device.c:577
msgid "Device capabilities not supported"
msgstr "?????????? ?????????????????????? ???? ???????????????????????? ????
???? ??????????????????"
-#: ../libcheese/cheese-camera-device.c:683
+#: libcheese/cheese-camera-device.c:732
msgid "Unknown device"
msgstr "?????????????????? ????????????"
-#: ../libcheese/cheese-camera-device.c:702
+#: libcheese/cheese-camera-device.c:751
msgid "Cancellable initialization not supported"
msgstr "???? ???? ???????????????? ??????????????????????????, ??????????
???????? ???? ???? ????????????"
-#: ../src/cheese-application.vala:53
+#: src/cheese-application.vala:56
msgid "Start in wide mode"
msgstr "???????????????????? ?? ?????????? ??????????????????"
-#: ../src/cheese-application.vala:56
+#: src/cheese-application.vala:59
msgid "Device to use as a camera"
msgstr "?????? ???????????????????? (????????????) ???? ???? ????????????????"
-#: ../src/cheese-application.vala:56
+#: src/cheese-application.vala:59
msgid "DEVICE"
msgstr "????????????????????"
-#: ../src/cheese-application.vala:58
+#: src/cheese-application.vala:61
msgid "Output version information and exit"
msgstr "?????????????????? ???? ???????????????????? ???? ???????????????? ??
??????????"
-#: ../src/cheese-application.vala:60
+#: src/cheese-application.vala:63
msgid "Start in fullscreen mode"
msgstr "???????????????????? ???? ?????? ??????????"
-#: ../src/cheese-application.vala:310
+#: src/cheese-application.vala:321
msgid "Webcam in use"
msgstr "???????????????? ?? ?????????????? ?? ??????????"
-#: ../src/cheese-application.vala:544
+#: src/cheese-application.vala:583
msgid "translator-credits"
msgstr ""
-"???????????????????? ?????????? <a...@kambanaria.org>\n"
+"???????????????????? ?????????? <<a
href='mailto:a...@kambanaria.org'>a...@kambanaria.org</"
+"a>>\n"
+"\n"
"\n"
"???????????????? ???? ???????????? ???? GNOME ?????? ?????????? ????
????????????????.\n"
-"?????????????? ???????????? ???? ?????? ???? <a
href=\"http://gnome.cult.bg\";>http://gnome.cult.";
-"bg</a>\n"
-"?????????????????????? ???? ???????????? ???? <a
href=\"http://gnome.cult.bg/bugs\";>http://gnome.";
-"cult.bg/bugs</a>"
+"?????????????? ???????????? ???? ?????? ???? <a
href='https://fsa-bg.org/project/gtp'>?????? ??????????</"
+"a> ????.\n"
+"?????????????????????? ???? ???????????? ?? ?????????????? ?? <a
href='https://fsa-bg.org/project/gtp/";
+"newticket'>???????????????????? ????????????</a>."
-#: ../src/cheese-application.vala:546
+#: src/cheese-application.vala:585
msgid "Cheese Website"
msgstr "?????? ???????? ???? Cheese"
#. Translators: a description of an effect (to be applied to images
#. * from the webcam) which does nothing.
-#: ../src/cheese-effects-manager.vala:51
+#: src/cheese-effects-manager.vala:51
msgid "No Effect"
msgstr "?????? ??????????"
-#: ../src/cheese-window.vala:236
+#: src/cheese-window.vala:229
#, c-format
msgid "Could not open %s"
msgstr "???%s??? ???? ???????? ???? ???? ????????????"
-#: ../src/cheese-window.vala:261
+#: src/cheese-window.vala:254
#, c-format
msgid "Are you sure you want to permanently delete the file?"
msgid_plural "Are you sure you want to permanently delete %d files?"
msgstr[0] "?????????????? ???? ??????, ???? ???????????? ???? ????????????????
???????????"
msgstr[1] "?????????????? ???? ??????, ???? ???????????? ???? ????????????????
%d ???????????"
-#: ../src/cheese-window.vala:265
+#: src/cheese-window.vala:258
msgid "_Delete"
msgstr "_??????????????????"
-#: ../src/cheese-window.vala:267
+#: src/cheese-window.vala:260
msgid "If you delete an item, it will be permanently lost"
msgid_plural "If you delete the items, they will be permanently lost"
msgstr[0] "?????????????????? ?????????? ?? ????????????????????????
??????????????"
msgstr[1] "?????????????????? ???????????? ???? ????????????????????????
????????????????"
-#: ../src/cheese-window.vala:291
+#: src/cheese-window.vala:284
#, c-format
msgid "Could not delete %s"
msgstr "???%s??? ???? ???????? ???? ???????? ????????????"
-#: ../src/cheese-window.vala:294
+#: src/cheese-window.vala:287
msgid "Skip"
msgstr "????????????????????"
-#: ../src/cheese-window.vala:295
+#: src/cheese-window.vala:288
msgid "Skip all"
msgstr "???????????????????? ???? ????????????"
-#: ../src/cheese-window.vala:340
+#: src/cheese-window.vala:333
#, c-format
msgid "Could not move %s to trash"
msgstr "???%s??? ???? ???????? ???? ???????? ?????????????????? ??
??????????????"
#. Nothing selected.
-#: ../src/cheese-window.vala:365
+#: src/cheese-window.vala:358
msgid "Save File"
msgstr "??????????????????"
-#: ../src/cheese-window.vala:369
+#: src/cheese-window.vala:362
msgid "Save"
msgstr "??????????????????"
-#: ../src/cheese-window.vala:399
+#: src/cheese-window.vala:392
#, c-format
msgid "Could not save %s"
msgstr "???%s??? ???? ???????? ???? ???????? ??????????????"
-#: ../src/cheese-window.vala:820
+#: src/cheese-window.vala:813
msgid "Stop recording"
msgstr "???????? ???? ??????????"
-#: ../src/cheese-window.vala:835
+#: src/cheese-window.vala:828
msgid "Record a video"
msgstr "?????????? ???? ??????????"
#. FIXME: Set the effects action to be inactive.
-#: ../src/cheese-window.vala:870
+#: src/cheese-window.vala:863
msgid "Stop taking pictures"
msgstr "????????"
-#: ../src/cheese-window.vala:893
+#: src/cheese-window.vala:886
msgid "Take multiple photos"
msgstr "?????????????? ???? ?????????? ???? ????????????"
-#: ../src/cheese-window.vala:1087
+#: src/cheese-window.vala:1080
msgid "No effects found"
msgstr "?????????????? ????????????"
-#: ../src/cheese-window.vala:1211
+#: src/cheese-window.vala:1204
msgid "There was an error playing video from the webcam"
msgstr "???????????? ?????? ???????????????????? ???? ?????????? ????
????????????????"
-#: ../src/cheese-window.vala:1325
+#: src/cheese-window.vala:1413
msgid "Record a video using a webcam"
msgstr "?????????? ???? ?????????? ?? ????????????????"
-#: ../src/cheese-window.vala:1331
+#: src/cheese-window.vala:1419
msgid "Take multiple photos using a webcam"
msgstr "?????????????????? ???? ?????????? ???? ???????????? ??
????????????????"
-#: ../src/cheese-window.vala:1343
+#: src/cheese-window.vala:1431
msgid "Choose an Effect"
msgstr "?????????? ???? ??????????"
-#: ../src/cheese-window.vala:1354
+#: src/cheese-window.vala:1442
msgid "Record a Video"
msgstr "?????????? ???? ??????????"
-#: ../src/cheese-window.vala:1358
+#: src/cheese-window.vala:1446
msgid "Take Multiple Photos"
msgstr "?????????????? ???? ?????????? ???? ????????????"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cheese-41.0/src/meson.build
new/cheese-41.1/src/meson.build
--- old/cheese-41.0/src/meson.build 2021-09-20 09:16:32.752539600 +0200
+++ new/cheese-41.1/src/meson.build 2021-11-15 15:57:12.697718600 +0100
@@ -1,15 +1,18 @@
-sources = files(
- 'cheese-application.vala',
- 'cheese-countdown.vala',
- 'cheese-effects-manager.vala',
- 'cheese-main.vala',
- 'cheese-preferences.vala',
- 'cheese-window.vala',
- 'thumbview/cheese-thumbnail.c',
- 'thumbview/cheese-thumb-view.c',
- 'thumbview/eog-thumb-nav.c',
- 'vapi/libcanberra-gtk3.vapi'
-)
+sources = [
+ files(
+ 'cheese-application.vala',
+ 'cheese-countdown.vala',
+ 'cheese-effects-manager.vala',
+ 'cheese-main.vala',
+ 'cheese-preferences.vala',
+ 'cheese-window.vala',
+ 'thumbview/cheese-thumbnail.c',
+ 'thumbview/cheese-thumb-view.c',
+ 'thumbview/eog-thumb-nav.c',
+ 'vapi/libcanberra-gtk3.vapi'
+ ),
+ compile_schemas
+]
deps = [
cheese_common_dep,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cheese-41.0/tests/meson.build
new/cheese-41.1/tests/meson.build
--- old/cheese-41.0/tests/meson.build 2021-09-20 09:16:32.754539700 +0200
+++ new/cheese-41.1/tests/meson.build 2021-11-15 15:57:12.698718500 +0100
@@ -20,6 +20,9 @@
test_env = environment()
test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+test_env.set('GSETTINGS_SCHEMA_DIR', join_paths(meson.build_root(), 'data'))
+test_env.set('GSETTINGS_BACKEND', 'memory')
+
test_env.set('G_DEBUG', 'gc-friendly')
test_env.set('MALLOC_CHECK_', '2')
test_env.set('MALLOC_PERTURB_', '@0@'.format(random_number % 256))
