Hello community, here is the log from the commit of package grilo for openSUSE:Leap:15.2 checked in at 2020-03-06 12:38:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/grilo (Old) and /work/SRC/openSUSE:Leap:15.2/.grilo.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grilo" Fri Mar 6 12:38:20 2020 rev:18 rq:779720 version:0.3.12 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/grilo/grilo.changes 2020-01-30 14:48:49.250852056 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.grilo.new.26092/grilo.changes 2020-03-06 12:39:39.718698288 +0100 @@ -1,0 +2,22 @@ +Fri Feb 14 16:52:59 UTC 2020 - [email protected] + +- Update to version 0.3.12: + + grl-source: Fix reference count in the bindings. + + Updated translations. + +------------------------------------------------------------------- +Sat Jan 25 14:13:36 UTC 2020 - Dominique Leuenberger <[email protected]> + +- No longer recommend -lang: supplements are in use + +------------------------------------------------------------------- +Wed Jan 8 17:22:43 UTC 2020 - Bjørn Lie <[email protected]> + +- Update to version 0.3.11: + + pls: Support totem-pl-parser 3.26.4. + + build: + - Add a Meson dependency variable for libgrlpls. + - Avoid using meson.source_root(). +- Drop grilo-fix-build-totem-pl-parser.patch: Fixed upstream. + +------------------------------------------------------------------- Old: ---- grilo-0.3.10.tar.xz grilo-fix-build-totem-pl-parser.patch New: ---- grilo-0.3.12.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grilo.spec ++++++ --- /var/tmp/diff_new_pack.JJXQGr/_old 2020-03-06 12:39:40.294698638 +0100 +++ /var/tmp/diff_new_pack.JJXQGr/_new 2020-03-06 12:39:40.318698653 +0100 @@ -1,7 +1,7 @@ # # spec file for package grilo # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,13 @@ Name: grilo -Version: 0.3.10 +Version: 0.3.12 Release: 0 Summary: Framework for browsing and searching media content License: LGPL-2.1-or-later Group: Productivity/Multimedia/Other URL: https://live.gnome.org/Grilo Source0: https://download.gnome.org/sources/grilo/0.3/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM grilo-fix-build-totem-pl-parser.patch -- Fix build with totem-pl-parser 3.26.4 -Patch0: grilo-fix-build-totem-pl-parser.patch BuildRequires: fdupes BuildRequires: gtk-doc @@ -52,9 +50,8 @@ %package -n libgrilo-0_3-0 Summary: Framework for browsing and searching media content # Needed for the -lang package to be installable -Group: System/Libraries -Recommends: %{name}-lang # Without plugins, grilo is useless +Group: System/Libraries Recommends: grilo-plugins Provides: %{name} = %{version} ++++++ grilo-0.3.10.tar.xz -> grilo-0.3.12.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.10/NEWS new/grilo-0.3.12/NEWS --- old/grilo-0.3.10/NEWS 2019-09-12 17:01:01.000000000 +0200 +++ new/grilo-0.3.12/NEWS 2020-02-14 15:05:30.000000000 +0100 @@ -1,3 +1,24 @@ +NEW in 0.3.12 +============= + * #107 grl-source: Fix reference count in the bindings + + * Updated translations + * Japanese + * British English + + * Contributors to this release: + Jean Felder <[email protected]> + +NEW in 0.3.11 +============= + * !52 pls: Support totem-pl-parser 3.26.4 + * !51 build: Add a Meson dependency variable for libgrlpls + * !50 build: Avoid using meson.source_root() + + * Contributors to this release: + Sam Thursfield <[email protected]> + Bastien Nocera <[email protected]> + NEW in 0.3.10 ============= * !48 - build: Use variables in pc files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.10/doc/grilo/meson.build new/grilo-0.3.12/doc/grilo/meson.build --- old/grilo-0.3.10/doc/grilo/meson.build 2019-09-12 17:01:01.000000000 +0200 +++ new/grilo-0.3.12/doc/grilo/meson.build 2020-02-14 15:05:30.000000000 +0100 @@ -23,8 +23,8 @@ gnome.gtkdoc('grilo', main_sgml: 'grilo-docs.sgml', src_dir: [ - join_paths(meson.source_root(), 'src'), - join_paths(meson.source_root(), 'libs'), + join_paths(source_root, 'src'), + join_paths(source_root, 'libs'), ], dependencies: libgrl_dep, gobject_typesfile: types, @@ -37,10 +37,10 @@ 'quick-start.xml', 'writing-apps.xml', 'overview.xml', - join_paths(meson.source_root(), 'examples', 'configuring-plugins.c'), - join_paths(meson.source_root(), 'examples', 'browsing.c'), - join_paths(meson.source_root(), 'examples', 'searching.c'), - join_paths(meson.source_root(), 'examples', 'multivalues.c'), - join_paths(meson.source_root(), 'examples', 'efficient-metadata-resolution.c'), + join_paths(source_root, 'examples', 'configuring-plugins.c'), + join_paths(source_root, 'examples', 'browsing.c'), + join_paths(source_root, 'examples', 'searching.c'), + join_paths(source_root, 'examples', 'multivalues.c'), + join_paths(source_root, 'examples', 'efficient-metadata-resolution.c'), ] ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.10/libs/pls/grl-pls.c new/grilo-0.3.12/libs/pls/grl-pls.c --- old/grilo-0.3.10/libs/pls/grl-pls.c 2019-09-12 17:01:01.000000000 +0200 +++ new/grilo-0.3.12/libs/pls/grl-pls.c 2020-02-14 15:05:30.000000000 +0100 @@ -47,6 +47,10 @@ #include <totem-pl-parser.h> #include <totem-pl-parser-mini.h> +#ifndef TOTEM_PL_IS_PARSER(x) +#define TOTEM_PL_IS_PARSER(x) TOTEM_IS_PL_PARSER(x) +#endif /* TOTEM_PL_IS_PARSER */ + /* --------- Constants -------- */ #define GRL_DATA_PRIV_PLS_IS_PLAYLIST "priv:pls:is_playlist" @@ -465,7 +469,7 @@ GRL_DEBUG ("%s (parser=%p, uri=\"%s\", metadata=%p, user_data=%p)", __FUNCTION__, parser, uri, metadata, user_data); - g_return_if_fail (TOTEM_IS_PL_PARSER (parser)); + g_return_if_fail (TOTEM_PL_IS_PARSER (parser)); g_return_if_fail (uri); g_return_if_fail (metadata); g_return_if_fail (user_data); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.10/libs/pls/meson.build new/grilo-0.3.12/libs/pls/meson.build --- old/grilo-0.3.10/libs/pls/meson.build 2019-09-12 17:01:01.000000000 +0200 +++ new/grilo-0.3.12/libs/pls/meson.build 2020-02-14 15:05:30.000000000 +0100 @@ -19,6 +19,8 @@ install_headers(grlpls_headers, subdir: '@0@/pls'.format(grl_name)) +libgrlpls_inc = include_directories(['..']) + libgrlpls = shared_library('grlpls-@0@'.format(grl_majorminor), sources: grlpls_sources, install: true, @@ -28,6 +30,10 @@ dependencies: [totem_plparser_dep, libgrl_dep], include_directories: libgrl_inc) +libgrlpls_dep = declare_dependency(link_with: libgrlpls, + include_directories: [libgrl_inc, libgrlpls_inc], + dependencies: [totem_plparser_dep, libgrl_dep]) + grlpls_pc = pkgconfig.generate(libgrlpls, filebase: 'grilo-pls-@0@'.format(grl_majorminor), requires: libgrl, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.10/meson.build new/grilo-0.3.12/meson.build --- old/grilo-0.3.10/meson.build 2019-09-12 17:01:01.000000000 +0200 +++ new/grilo-0.3.12/meson.build 2020-02-14 15:05:30.000000000 +0100 @@ -6,7 +6,7 @@ # Copyright (C) 2016 Igalia S.L. All rights reserved. project('grilo', 'c', - version: '0.3.10', + version: '0.3.12', default_options: [ 'buildtype=debugoptimized', 'c_std=gnu99', @@ -72,6 +72,8 @@ oauth_dep = dependency('oauth', required: false) endif +source_root = meson.current_source_dir() + prefix = get_option('prefix') includedir = join_paths(prefix, get_option('includedir')) libdir = join_paths(prefix, get_option('libdir')) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.10/po/LINGUAS new/grilo-0.3.12/po/LINGUAS --- old/grilo-0.3.10/po/LINGUAS 2019-09-12 17:01:01.000000000 +0200 +++ new/grilo-0.3.12/po/LINGUAS 2020-02-14 15:05:30.000000000 +0100 @@ -25,6 +25,7 @@ lt lv ml +ms ne nl nb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.10/po/en_GB.po new/grilo-0.3.12/po/en_GB.po --- old/grilo-0.3.10/po/en_GB.po 2019-09-12 17:01:01.000000000 +0200 +++ new/grilo-0.3.12/po/en_GB.po 2020-02-14 15:05:30.000000000 +0100 @@ -2,196 +2,206 @@ # Copyright (C) 2016 grilo's COPYRIGHT HOLDER # This file is distributed under the same license as the grilo package. # Abigail Brady <[email protected]>, Bastien Nocera <[email protected]>, 2016. +# Zander Brown <[email protected]>, 2019. # msgid "" msgstr "" "Project-Id-Version: grilo master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"; -"product=grilo&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-09-14 19:51+0000\n" -"PO-Revision-Date: 2016-09-18 11:02+0200\n" -"Last-Translator: David King <[email protected]>\n" -"Language-Team: British English <[email protected]>\n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/grilo/issues\n"; +"POT-Creation-Date: 2018-07-27 21:05+0000\n" +"PO-Revision-Date: 2019-08-24 21:37+0100\n" +"Last-Translator: Zander Brown <[email protected]>\n" +"Language-Team: English - United Kingdom <[email protected]>\n" "Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);;\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Gtranslator 3.32.1\n" -#: ../libs/net/grl-net-mock.c:86 +#: libs/net/grl-net-mock.c:86 msgid "No mock definition found" msgstr "No mock definition found" -#: ../libs/net/grl-net-mock.c:98 +#: libs/net/grl-net-mock.c:98 #, c-format msgid "Could not find mock content %s" msgstr "Could not find mock content %s" -#: ../libs/net/grl-net-mock.c:116 +#: libs/net/grl-net-mock.c:116 #, c-format msgid "Could not access mock content: %s" msgstr "Could not access mock content: %s" -#: ../libs/net/grl-net-wc.c:449 +#: libs/net/grl-net-wc.c:442 msgid "Cannot connect to the server" msgstr "Cannot connect to the server" -#: ../libs/net/grl-net-wc.c:455 +#: libs/net/grl-net-wc.c:448 msgid "Cannot connect to the proxy server" msgstr "Cannot connect to the proxy server" -#: ../libs/net/grl-net-wc.c:462 +#: libs/net/grl-net-wc.c:455 #, c-format msgid "Invalid request URI or header: %s" msgstr "Invalid request URI or header: %s" -#: ../libs/net/grl-net-wc.c:469 +#: libs/net/grl-net-wc.c:462 #, c-format msgid "Authentication required: %s" msgstr "Authentication required: %s" -#: ../libs/net/grl-net-wc.c:474 +#: libs/net/grl-net-wc.c:467 #, c-format msgid "The requested resource was not found: %s" msgstr "The requested resource was not found: %s" -#: ../libs/net/grl-net-wc.c:481 +#: libs/net/grl-net-wc.c:474 #, c-format msgid "The entry has been modified since it was downloaded: %s" msgstr "The entry has been modified since it was downloaded: %s" -#: ../libs/net/grl-net-wc.c:487 ../libs/net/grl-net-wc.c:596 -#: ../libs/pls/grl-pls.c:490 ../src/grl-source.c:1828 ../src/grl-source.c:1928 -#: ../src/grl-source.c:2075 ../src/grl-source.c:2332 ../src/grl-source.c:2453 +#: libs/net/grl-net-wc.c:480 libs/net/grl-net-wc.c:592 libs/pls/grl-pls.c:490 +#: src/grl-source.c:1821 src/grl-source.c:1921 src/grl-source.c:2068 +#: src/grl-source.c:2325 src/grl-source.c:2446 #, c-format msgid "Operation was cancelled" msgstr "Operation was cancelled" -#: ../libs/net/grl-net-wc.c:490 -#, c-format -msgid "Unhandled status: %s" -msgstr "Unhandled status: %s" - -#: ../libs/net/grl-net-wc.c:600 ../libs/net/grl-net-wc.c:644 +#: libs/net/grl-net-wc.c:596 libs/net/grl-net-wc.c:640 msgid "Data not available" msgstr "Data not available" -#: ../libs/net/grl-net-wc.c:695 +#: libs/net/grl-net-wc.c:691 #, c-format msgid "Invalid URL %s" msgstr "Invalid URL %s" -#: ../src/grilo.c:218 +#: src/grilo.c:218 msgid "Semicolon-separated paths containing Grilo plugins" msgstr "Semicolon-separated paths containing Grilo plugins" -#: ../src/grilo.c:220 +#: src/grilo.c:220 msgid "Colon-separated paths containing Grilo plugins" msgstr "Colon-separated paths containing Grilo plugins" -#: ../src/grilo.c:223 +#: src/grilo.c:223 msgid "Colon-separated list of Grilo plugins to use" msgstr "Colon-separated list of Grilo plugins to use" -#: ../src/grilo.c:228 +#: src/grilo.c:228 msgid "Grilo Options" msgstr "Grilo Options" -#: ../src/grilo.c:229 +#: src/grilo.c:229 msgid "Show Grilo Options" msgstr "Show Grilo Options" -#: ../src/grl-multiple.c:134 +#: src/grl-multiple.c:134 #, c-format msgid "No searchable sources available" msgstr "No searchable sources available" -#: ../src/grl-multiple.c:511 +#: src/grl-multiple.c:511 #, c-format -msgid "Could not resolve media for URI '%s'" -msgstr "Could not resolve media for URI '%s'" +#| msgid "Could not resolve media for URI '%s'" +msgid "Could not resolve media for URI “%s”" +msgstr "Could not resolve media for URI “%s”" -#: ../src/grl-registry.c:464 ../src/grl-registry.c:1377 +#: src/grl-registry.c:457 src/grl-registry.c:1438 #, c-format -msgid "Plugin '%s' is already loaded" -msgstr "Plugin '%s' is already loaded" +#| msgid "Plugin '%s' is already loaded" +msgid "Plugin “%s” is already loaded" +msgstr "Plugin “%s” is already loaded" -#: ../src/grl-registry.c:488 +#: src/grl-registry.c:481 #, c-format msgid "Failed to initialize plugin from %s" msgstr "Failed to initialise plugin from %s" -#: ../src/grl-registry.c:530 +#: src/grl-registry.c:523 #, c-format -msgid "Metadata key '%s' already registered in different format" -msgstr "Metadata key '%s' already registered in different format" +#| msgid "Metadata key '%s' already registered in different format" +msgid "Metadata key “%s” already registered in different format" +msgstr "Metadata key “%s” already registered in different format" -#: ../src/grl-registry.c:543 +#: src/grl-registry.c:536 #, c-format -msgid "Metadata key '%s' cannot be registered" -msgstr "Metadata key '%s' cannot be registered" +#| msgid "Metadata key '%s' cannot be registered" +msgid "Metadata key “%s” cannot be registered" +msgstr "Metadata key “%s” cannot be registered" -#: ../src/grl-registry.c:983 +#: src/grl-registry.c:1044 #, c-format -msgid "Source with id '%s' was not found" -msgstr "Source with id '%s' was not found" +#| msgid "Source with id '%s' was not found" +msgid "Source with id “%s” was not found" +msgstr "Source with id “%s” was not found" -#: ../src/grl-registry.c:1057 +#: src/grl-registry.c:1118 #, c-format msgid "Failed to load plugin from %s" msgstr "Failed to load plugin from %s" -#: ../src/grl-registry.c:1066 +#: src/grl-registry.c:1127 #, c-format msgid "Invalid plugin file %s" msgstr "Invalid plugin file %s" -#: ../src/grl-registry.c:1077 +#: src/grl-registry.c:1138 #, c-format -msgid "'%s' is not a valid plugin file" -msgstr "'%s' is not a valid plugin file" +#| msgid "'%s' is not a valid plugin file" +msgid "“%s” is not a valid plugin file" +msgstr "“%s” is not a valid plugin file" -#: ../src/grl-registry.c:1096 +#: src/grl-registry.c:1157 #, c-format -msgid "Plugin '%s' already exists" -msgstr "Plugin '%s' already exists" +#| msgid "Plugin '%s' already exists" +msgid "Plugin “%s” already exists" +msgstr "Plugin “%s” already exists" -#: ../src/grl-registry.c:1259 +#: src/grl-registry.c:1320 #, c-format msgid "Invalid path %s" msgstr "Invalid path %s" -#: ../src/grl-registry.c:1326 +#: src/grl-registry.c:1387 #, c-format msgid "All configured plugin paths are invalid" msgstr "All configured plugin paths are invalid" -#: ../src/grl-registry.c:1366 +#: src/grl-registry.c:1427 #, c-format -msgid "Plugin '%s' not available" -msgstr "Plugin '%s' not available" +#| msgid "Plugin '%s' not available" +msgid "Plugin “%s” not available" +msgstr "Plugin “%s” not available" -#: ../src/grl-registry.c:1594 +#: src/grl-registry.c:1655 #, c-format -msgid "Plugin not found: '%s'" -msgstr "Plugin not found: '%s'" +#| msgid "Plugin not found: '%s'" +msgid "Plugin not found: “%s”" +msgstr "Plugin not found: “%s”" -#: ../src/grl-registry.c:1905 +#: src/grl-registry.c:1966 #, c-format -msgid "Plugin configuration does not contain 'plugin-id' reference" -msgstr "Plugin configuration does not contain 'plugin-id' reference" +#| msgid "Plugin configuration does not contain 'plugin-id' reference" +msgid "Plugin configuration does not contain “plugin-id” reference" +msgstr "Plugin configuration does not contain “plugin-id” reference" -#: ../src/grl-source.c:2782 +#: src/grl-source.c:2775 #, c-format msgid "Some keys could not be written" msgstr "Some keys could not be written" -#: ../src/grl-source.c:2855 +#: src/grl-source.c:2848 #, c-format msgid "None of the specified keys are writable" msgstr "None of the specified keys are writable" -#: ../src/grl-source.c:4198 +#: src/grl-source.c:4191 #, c-format -msgid "Media has no 'id', cannot remove" -msgstr "Media has no 'id', cannot remove" +#| msgid "Media has no 'id', cannot remove" +msgid "Media has no “id”, cannot remove" +msgstr "Media has no “id”, cannot remove" + +#~ msgid "Unhandled status: %s" +#~ msgstr "Unhandled status: %s" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.10/po/ja.po new/grilo-0.3.12/po/ja.po --- old/grilo-0.3.10/po/ja.po 2019-09-12 17:01:01.000000000 +0200 +++ new/grilo-0.3.12/po/ja.po 2020-02-14 15:05:30.000000000 +0100 @@ -1,15 +1,17 @@ # Japanese translation for grilo. -# Copyright (C) 2013 grilo's COPYRIGHT HOLDER +# Copyright (C) 2013, 2018, 2020 grilo's COPYRIGHT HOLDER # This file is distributed under the same license as the grilo package. # Nishio Futoshi <[email protected]>, 2013. +# Aefgh39622 <[email protected]>, 2018. +# sicklylife <[email protected]>, 2020. # msgid "" msgstr "" "Project-Id-Version: grilo master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=grilo&keywords=I18N+L10N&component=general\n"; -"POT-Creation-Date: 2013-07-25 07:42+0000\n" -"PO-Revision-Date: 2013-07-24 22:00+0900\n" -"Last-Translator: Nishio Futoshi <[email protected]>\n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/grilo/issues\n"; +"POT-Creation-Date: 2019-09-29 16:04+0000\n" +"PO-Revision-Date: 2020-01-28 00:00+0900\n" +"Last-Translator: sicklylife <[email protected]>\n" "Language-Team: Japanese <[email protected]>\n" "Language: ja\n" "MIME-Version: 1.0\n" @@ -18,170 +20,182 @@ "Plural-Forms: nplurals=1; plural=0;\n" # Mockをモックと訳出した。 -#: ../libs/net/grl-net-mock.c:79 +#: libs/net/grl-net-mock.c:86 msgid "No mock definition found" msgstr "モックの定義が見つかりません" -#: ../libs/net/grl-net-mock.c:91 +#: libs/net/grl-net-mock.c:98 #, c-format msgid "Could not find mock content %s" msgstr "モックのコンテンツ %s が見つかりません" -#: ../libs/net/grl-net-mock.c:111 -msgid "Could not access mock content" -msgstr "モックのコンテンツにアクセスできません" +#: libs/net/grl-net-mock.c:116 +#, c-format +msgid "Could not access mock content: %s" +msgstr "モックのコンテンツにアクセスできません: %s" -#: ../libs/net/grl-net-wc.c:468 +#: libs/net/grl-net-wc.c:442 msgid "Cannot connect to the server" msgstr "サーバーへ接続できません" -#: ../libs/net/grl-net-wc.c:474 +#: libs/net/grl-net-wc.c:448 msgid "Cannot connect to the proxy server" msgstr "プロキシサーバーへ接続できません" -#: ../libs/net/grl-net-wc.c:481 +#: libs/net/grl-net-wc.c:455 #, c-format msgid "Invalid request URI or header: %s" msgstr "要求された URI またはヘッダーが無効です: %s" -#: ../libs/net/grl-net-wc.c:488 +#: libs/net/grl-net-wc.c:462 #, c-format msgid "Authentication required: %s" msgstr "認証が必要です: %s" -#: ../libs/net/grl-net-wc.c:493 +#: libs/net/grl-net-wc.c:467 #, c-format msgid "The requested resource was not found: %s" msgstr "要求したリソースが見つかりませんでした: %s" -#: ../libs/net/grl-net-wc.c:500 +#: libs/net/grl-net-wc.c:474 #, c-format msgid "The entry has been modified since it was downloaded: %s" msgstr "その項目は、ダウンロード後に変更が加えられています: %s" # cancell を キャンセルと訳出した -#: ../libs/net/grl-net-wc.c:506 ../libs/net/grl-net-wc.c:614 -#: ../src/grl-source.c:1717 ../src/grl-source.c:1814 ../src/grl-source.c:1957 -#: ../src/grl-source.c:2201 ../src/grl-source.c:2323 +#: libs/net/grl-net-wc.c:480 libs/net/grl-net-wc.c:592 libs/pls/grl-pls.c:489 +#: src/grl-source.c:1821 src/grl-source.c:1921 src/grl-source.c:2068 +#: src/grl-source.c:2325 src/grl-source.c:2446 #, c-format msgid "Operation was cancelled" msgstr "操作がキャンセルされました" -#: ../libs/net/grl-net-wc.c:509 -#, c-format -msgid "Unhandled status: %s" -msgstr "扱えないステータス: %s" - -#: ../libs/net/grl-net-wc.c:618 ../libs/net/grl-net-wc.c:659 +#: libs/net/grl-net-wc.c:596 libs/net/grl-net-wc.c:640 msgid "Data not available" msgstr "データは利用できません" -#: ../src/grilo.c:181 +#: libs/net/grl-net-wc.c:691 +#, c-format +msgid "Invalid URL %s" +msgstr "URL %s は無効です" + +#: src/grilo.c:218 msgid "Semicolon-separated paths containing Grilo plugins" msgstr "Grilo プラグインを含むパスのリスト (セミコロン区切り)" -#: ../src/grilo.c:183 +#: src/grilo.c:220 msgid "Colon-separated paths containing Grilo plugins" msgstr "Grilo プラグインを含むパスのリスト (コロン区切り)" -#: ../src/grilo.c:186 +#: src/grilo.c:223 msgid "Colon-separated list of Grilo plugins to use" msgstr "使用する Grilo プラグインのリスト (コロン区切り)" -#: ../src/grilo.c:191 +#: src/grilo.c:228 msgid "Grilo Options" msgstr "Grilo のオプション" -#: ../src/grilo.c:192 +#: src/grilo.c:229 msgid "Show Grilo Options" msgstr "Grilo のオプションを表示する" -#: ../src/grl-multiple.c:130 +#: src/grl-multiple.c:134 #, c-format msgid "No searchable sources available" msgstr "利用できる検索可能なソースがありません" -#: ../src/grl-multiple.c:488 +#: src/grl-multiple.c:511 #, c-format -msgid "Could not resolve media for URI '%s'" -msgstr "URI '%s' に対応するメディアが判別できません" +msgid "Could not resolve media for URI “%s”" +msgstr "URI“%s”に対応するメディアが判別できません" -#: ../src/grl-registry.c:328 ../src/grl-registry.c:1002 +#: src/grl-registry.c:495 src/grl-registry.c:1476 #, c-format -msgid "Plugin '%s' is already loaded" -msgstr "プラグイン '%s' は既にロードされています" +msgid "Plugin “%s” is already loaded" +msgstr "プラグイン“%s”はすでにロードされています" -#: ../src/grl-registry.c:340 +#: src/grl-registry.c:519 #, c-format msgid "Failed to initialize plugin from %s" msgstr "%s のプラグインの初期化に失敗しました" -#: ../src/grl-registry.c:734 +#: src/grl-registry.c:561 +#, c-format +msgid "Metadata key “%s” already registered in different format" +msgstr "メタデーターのキー“%s”はすでに別の形式に登録されています" + +#: src/grl-registry.c:574 #, c-format -msgid "Source with id '%s' was not found" -msgstr "識別子 '%s' のソースが見つかりません" +msgid "Metadata key “%s” cannot be registered" +msgstr "メタデーターのキー“%s”は登録できません" -#: ../src/grl-registry.c:797 +#: src/grl-registry.c:1082 +#, c-format +msgid "Source with id “%s” was not found" +msgstr "識別子“%s”のソースが見つかりません" + +#: src/grl-registry.c:1156 #, c-format msgid "Failed to load plugin from %s" msgstr "%s のプラグインのロードに失敗しました" -#: ../src/grl-registry.c:806 +#: src/grl-registry.c:1165 #, c-format msgid "Invalid plugin file %s" msgstr "プラグインのファイル %s は無効です" -#: ../src/grl-registry.c:817 +#: src/grl-registry.c:1176 #, c-format -msgid "'%s' is not a valid plugin file" -msgstr "'%s' は有効なプラグインのファイルではありません" +msgid "“%s” is not a valid plugin file" +msgstr "“%s”は有効なプラグインのファイルではありません" -#: ../src/grl-registry.c:836 +#: src/grl-registry.c:1195 #, c-format -msgid "Unable to load plugin '%s'" -msgstr "プラグイン '%s' はロードできません" +msgid "Plugin “%s” already exists" +msgstr "プラグイン“%s”はすでに存在します" -#: ../src/grl-registry.c:847 +#: src/grl-registry.c:1358 #, c-format -msgid "Plugin '%s' already exists" -msgstr "プラグイン '%s' は既に存在します" +msgid "Invalid path %s" +msgstr "パス %s は無効です" -#: ../src/grl-registry.c:944 +#: src/grl-registry.c:1425 #, c-format msgid "All configured plugin paths are invalid" msgstr "設定されたプラグインのパスが全て無効です" -#: ../src/grl-registry.c:991 -#, c-format -msgid "Plugin '%s' not available" -msgstr "プラグイン '%s' は利用できません" - -#: ../src/grl-registry.c:1212 +#: src/grl-registry.c:1465 #, c-format -msgid "Plugin not found: '%s'" -msgstr "プラグインが見つかりません: '%s'" +msgid "Plugin “%s” not available" +msgstr "プラグイン“%s”は利用できません" -#: ../src/grl-registry.c:1294 +#: src/grl-registry.c:1693 #, c-format -msgid "Metadata key '%s' cannot be registered" -msgstr "メタデーターのキー '%s' は登録できません" +msgid "Plugin not found: “%s”" +msgstr "プラグインが見つかりません: “%s”" -#: ../src/grl-registry.c:1585 +#: src/grl-registry.c:2004 #, c-format -msgid "Plugin configuration does not contain 'plugin-id' reference" -msgstr "プラグインの設定に、'plugin-id' の参照が含まれていません" +msgid "Plugin configuration does not contain “plugin-id” reference" +msgstr "プラグインの設定に“plugin-id”の参照が含まれていません" -#: ../src/grl-source.c:2653 +#: src/grl-source.c:2775 #, c-format msgid "Some keys could not be written" msgstr "書き込めなかったキーがあります" -#: ../src/grl-source.c:2727 +#: src/grl-source.c:2848 #, c-format msgid "None of the specified keys are writable" msgstr "指定されたキーに書き込み可能なものはありません" -#: ../src/grl-source.c:4019 +#: src/grl-source.c:4191 #, c-format -msgid "Media has no 'id', cannot remove" -msgstr "メディアに 'id' がありません。移動できません" +msgid "Media has no “id”, cannot remove" +msgstr "メディアに“id”がないため移動できません" + +#~ msgid "Unhandled status: %s" +#~ msgstr "扱えないステータス: %s" + +#~ msgid "Unable to load plugin '%s'" +#~ msgstr "プラグイン '%s' はロードできません" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.10/po/ms.po new/grilo-0.3.12/po/ms.po --- old/grilo-0.3.10/po/ms.po 1970-01-01 01:00:00.000000000 +0100 +++ new/grilo-0.3.12/po/ms.po 2020-02-14 15:05:30.000000000 +0100 @@ -0,0 +1,191 @@ +# Malay translation for grilo. +# Copyright (C) 2019 grilo's COPYRIGHT HOLDER +# This file is distributed under the same license as the grilo package. +# abuyop <[email protected]>, 2019. +# +msgid "" +msgstr "" +"Project-Id-Version: grilo master\n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/grilo/issues\n"; +"POT-Creation-Date: 2019-11-12 18:49+0000\n" +"PO-Revision-Date: 2019-12-25 15:37+0800\n" +"Language-Team: Malay <[email protected]>\n" +"Language: ms\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Last-Translator: abuyop <[email protected]>\n" +"X-Generator: Poedit 2.0.6\n" + +#: libs/net/grl-net-mock.c:86 +msgid "No mock definition found" +msgstr "Tiada takrifan olokan ditemui" + +#: libs/net/grl-net-mock.c:98 +#, c-format +msgid "Could not find mock content %s" +msgstr "Tidak dapat mencari kandungan olokan %s" + +#: libs/net/grl-net-mock.c:116 +#, c-format +msgid "Could not access mock content: %s" +msgstr "Tidak dapat mencapai kandungan olokan: %s" + +#: libs/net/grl-net-wc.c:442 +msgid "Cannot connect to the server" +msgstr "Tidak dapat bersambung dengan pelayan" + +#: libs/net/grl-net-wc.c:448 +msgid "Cannot connect to the proxy server" +msgstr "Tidak dapat bersambung dengan pelayan proksi" + +#: libs/net/grl-net-wc.c:455 +#, c-format +msgid "Invalid request URI or header: %s" +msgstr "URI atau pengepala permintaan tidak sah: %s" + +#: libs/net/grl-net-wc.c:462 +#, c-format +msgid "Authentication required: %s" +msgstr "Pengesahihan diperlukan: %s" + +#: libs/net/grl-net-wc.c:467 +#, c-format +msgid "The requested resource was not found: %s" +msgstr "Sumber yang dipinta tidak ditemui: %s" + +#: libs/net/grl-net-wc.c:474 +#, c-format +msgid "The entry has been modified since it was downloaded: %s" +msgstr "Masukan telah diubah suai semenjak ia telah dimuat turun: %s" + +#: libs/net/grl-net-wc.c:480 libs/net/grl-net-wc.c:592 libs/pls/grl-pls.c:493 +#: src/grl-source.c:1821 src/grl-source.c:1921 src/grl-source.c:2068 +#: src/grl-source.c:2325 src/grl-source.c:2446 +#, c-format +msgid "Operation was cancelled" +msgstr "Operasi telah dibatalkan" + +#: libs/net/grl-net-wc.c:596 libs/net/grl-net-wc.c:640 +msgid "Data not available" +msgstr "Data tidak tersedia" + +#: libs/net/grl-net-wc.c:691 +#, c-format +msgid "Invalid URL %s" +msgstr "URL %s tidak sah" + +#: src/grilo.c:218 +msgid "Semicolon-separated paths containing Grilo plugins" +msgstr "Laluan diasing-tanda-titik-bertindih mengandungi pemalam Grilo" + +#: src/grilo.c:220 +msgid "Colon-separated paths containing Grilo plugins" +msgstr "Laluan diasing-tanda-dua-titik-bertindih mengandungi pemalam Grilo" + +#: src/grilo.c:223 +msgid "Colon-separated list of Grilo plugins to use" +msgstr "Senarai pemalam Grilo diasing-tanda-dua-titik-bertindih yang digunakan" + +#: src/grilo.c:228 +msgid "Grilo Options" +msgstr "Pilihan Grilo" + +#: src/grilo.c:229 +msgid "Show Grilo Options" +msgstr "Tunjuk Pilihan Grilo" + +#: src/grl-multiple.c:134 +#, c-format +msgid "No searchable sources available" +msgstr "Tiada sumber-sumber boleh gelintar yang tersedia" + +#: src/grl-multiple.c:511 +#, c-format +msgid "Could not resolve media for URI “%s”" +msgstr "Tiada media boleh lerai untuk URI \"%s\"" + +#: src/grl-registry.c:495 src/grl-registry.c:1476 +#, c-format +msgid "Plugin “%s” is already loaded" +msgstr "Pemalam \"%s\" sudah dimuatkan" + +#: src/grl-registry.c:519 +#, c-format +msgid "Failed to initialize plugin from %s" +msgstr "Gagal mengawalkan pemalam daripada %s" + +#: src/grl-registry.c:561 +#, c-format +msgid "Metadata key “%s” already registered in different format" +msgstr "Kunci data meta \"%s\" sudah berdaftar dalam format yang berlainan" + +#: src/grl-registry.c:574 +#, c-format +msgid "Metadata key “%s” cannot be registered" +msgstr "Kunci data meta \"%s\" tidak dapat didaftarkan" + +#: src/grl-registry.c:1082 +#, c-format +msgid "Source with id “%s” was not found" +msgstr "Sumber dengan id \"%s\" tidak ditemui" + +#: src/grl-registry.c:1156 +#, c-format +msgid "Failed to load plugin from %s" +msgstr "Gagal memuatkan pemalam daripada %s" + +#: src/grl-registry.c:1165 +#, c-format +msgid "Invalid plugin file %s" +msgstr "Fail pemalam %s tidak sah" + +#: src/grl-registry.c:1176 +#, c-format +msgid "“%s” is not a valid plugin file" +msgstr "\"%s\" bukanlah fail pemalam yang sah" + +#: src/grl-registry.c:1195 +#, c-format +msgid "Plugin “%s” already exists" +msgstr "Pemalam \"%s\" sudah wujud" + +#: src/grl-registry.c:1358 +#, c-format +msgid "Invalid path %s" +msgstr "Laluan %s tidak sah" + +#: src/grl-registry.c:1425 +#, c-format +msgid "All configured plugin paths are invalid" +msgstr "Semua laluan pemalam terkonfigur adalah tidak sah" + +#: src/grl-registry.c:1465 +#, c-format +msgid "Plugin “%s” not available" +msgstr "Pemalam \"%s\" tidak tersedia" + +#: src/grl-registry.c:1693 +#, c-format +msgid "Plugin not found: “%s”" +msgstr "Pemalam tidak ditemui: \"%s\"" + +#: src/grl-registry.c:2004 +#, c-format +msgid "Plugin configuration does not contain “plugin-id” reference" +msgstr "Konfigurasi pemalam tidak mengandungi rujukan \"plugin-id\"" + +#: src/grl-source.c:2775 +#, c-format +msgid "Some keys could not be written" +msgstr "Sesetengah kunci tidak dapat ditulis" + +#: src/grl-source.c:2848 +#, c-format +msgid "None of the specified keys are writable" +msgstr "Tiada kunci yang dinyatakan boleh ditulis" + +#: src/grl-source.c:4191 +#, c-format +msgid "Media has no “id”, cannot remove" +msgstr "Media tiada \"id\", tidak dapat buang" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.10/src/grl-source.h new/grilo-0.3.12/src/grl-source.h --- old/grilo-0.3.10/src/grl-source.h 2019-09-12 17:01:01.000000000 +0200 +++ new/grilo-0.3.12/src/grl-source.h 2020-02-14 15:05:30.000000000 +0100 @@ -199,7 +199,7 @@ /** * GrlSourceStoreCb: * @source: a source - * @media: (transfer full): a #GrlMedia transfer object + * @media: a #GrlMedia transfer object * @failed_keys: (element-type GrlKeyID) (transfer none): #GList of * keys that could not be updated, if any * @user_data: user data diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.10/tools/grilo-inspect/meson.build new/grilo-0.3.12/tools/grilo-inspect/meson.build --- old/grilo-0.3.10/tools/grilo-inspect/meson.build 2019-09-12 17:01:01.000000000 +0200 +++ new/grilo-0.3.12/tools/grilo-inspect/meson.build 2020-02-14 15:05:30.000000000 +0100 @@ -14,7 +14,7 @@ endif run_command(python, '@0@/generate_core_keys.py'.format(meson.current_source_dir()), - '@0@/src/grl-metadata-key.h'.format(meson.source_root()), + '@0@/src/grl-metadata-key.h'.format(source_root), '@0@/grl-core-keys.h'.format(meson.current_build_dir())) configure_file(output: 'config.h',
