Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package json-glib for openSUSE:Factory checked in at 2021-02-16 22:35:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/json-glib (Old) and /work/SRC/openSUSE:Factory/.json-glib.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "json-glib" Tue Feb 16 22:35:41 2021 rev:48 rq:870856 version:1.6.2 Changes: -------- --- /work/SRC/openSUSE:Factory/json-glib/json-glib.changes 2020-09-25 16:26:22.243615995 +0200 +++ /work/SRC/openSUSE:Factory/.json-glib.new.28504/json-glib.changes 2021-02-16 22:39:22.981887160 +0100 @@ -1,0 +2,8 @@ +Tue Feb 9 22:49:16 UTC 2021 - Bj??rn Lie <[email protected]> + +- Update to version 1.6.2: + + Fix build reproducibility. + + Fix parsing of UTF-16 surrogate pairs. + + Ignore UTF-8 BOM. + +------------------------------------------------------------------- Old: ---- json-glib-1.6.0.tar.xz New: ---- json-glib-1.6.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ json-glib.spec ++++++ --- /var/tmp/diff_new_pack.xbACZJ/_old 2021-02-16 22:39:23.629887936 +0100 +++ /var/tmp/diff_new_pack.xbACZJ/_new 2021-02-16 22:39:23.633887941 +0100 @@ -1,7 +1,7 @@ # # spec file for package json-glib # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2009 Dominique Leuenberger, Almere, The Netherlands. # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ Name: json-glib -Version: 1.6.0 +Version: 1.6.2 Release: 0 Summary: Library for JavaScript Object Notation format License: LGPL-2.1-or-later @@ -28,9 +28,9 @@ Source0: https://download.gnome.org/sources/json-glib/1.6/%{name}-%{version}.tar.xz Source99: baselibs.conf -BuildRequires: gtk-doc BuildRequires: glib2-devel >= 2.54 BuildRequires: gobject-introspection-devel +BuildRequires: gtk-doc BuildRequires: meson BuildRequires: pkgconfig BuildRequires: translation-update-upstream ++++++ json-glib-1.6.0.tar.xz -> json-glib-1.6.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/json-glib-1.6.0/NEWS new/json-glib-1.6.2/NEWS --- old/json-glib-1.6.0/NEWS 2020-09-11 17:43:12.945097700 +0200 +++ new/json-glib-1.6.2/NEWS 2021-02-09 17:32:17.397597600 +0100 @@ -23,6 +23,9 @@ ??? #46 - Document nullability of `json_from_string()` [Emmanuele Bassi] ??? #45 - Properly detect multiple top-level statements [Emmanuele Bassi] ??? #41, #22 - Fix library versions on Darwin [Tom Schoonjans] +??? Fix build reproducibility [!33, Alexander Kanavin] +??? #26 - Fix parsing of UTF-16 surrogate pairs [James Westman] +??? #56 - Ignore UTF-8 BOM [Jan-Michael Brummer] Overview of changes for 1.4 ============================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/json-glib-1.6.0/json-glib/json-enum-types.c.in new/json-glib-1.6.2/json-glib/json-enum-types.c.in --- old/json-glib-1.6.0/json-glib/json-enum-types.c.in 2020-09-11 17:43:12.947097800 +0200 +++ new/json-glib-1.6.2/json-glib/json-enum-types.c.in 2021-02-09 17:32:17.400597600 +0100 @@ -9,8 +9,8 @@ /*** BEGIN file-production ***/ -/* enumerations from "@filename@" */ -#include "@filename@" +/* enumerations from "@basename@" */ +#include "@basename@" /*** END file-production ***/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/json-glib-1.6.0/json-glib/json-parser.c new/json-glib-1.6.2/json-glib/json-parser.c --- old/json-glib-1.6.0/json-glib/json-parser.c 2020-09-11 17:43:12.950097800 +0200 +++ new/json-glib-1.6.2/json-glib/json-parser.c 2021-02-09 17:32:17.404597800 +0100 @@ -970,7 +970,7 @@ static gboolean json_parser_load (JsonParser *parser, - const gchar *data, + const gchar *input_data, gsize length, GError **error) { @@ -979,6 +979,7 @@ gboolean done; gboolean retval = TRUE; gint i; + gchar *data = input_data; json_parser_clear (parser); @@ -991,6 +992,19 @@ return FALSE; } + if (length >= 3) + { + /* Check for UTF-8 signature and skip it if necessary */ + if (((data[0] & 0xFF) == 0xEF) && + ((data[1] & 0xFF) == 0xBB) && + ((data[2] & 0xFF) == 0xBF)) + { + JSON_NOTE (PARSER, "Skipping BOM"); + data += 3; + length -= 3; + } + } + scanner = json_scanner_create (parser); json_scanner_input_text (scanner, data, length); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/json-glib-1.6.0/json-glib/json-scanner.c new/json-glib-1.6.2/json-glib/json-scanner.c --- old/json-glib-1.6.0/json-glib/json-scanner.c 2020-09-11 17:43:12.951097700 +0200 +++ new/json-glib-1.6.2/json-glib/json-scanner.c 2021-02-09 17:32:17.407597800 +0100 @@ -40,6 +40,10 @@ #include <io.h> /* For _read() */ #endif +enum { + JSON_ERR_MALFORMED_SURROGATE_PAIR = G_TOKEN_LAST + 1, +}; + struct _JsonScannerConfig { /* Character sets @@ -681,7 +685,11 @@ case G_ERR_DIGIT_RADIX: g_snprintf (token_string, token_string_len, "scanner: digit is beyond radix"); break; - + + case JSON_ERR_MALFORMED_SURROGATE_PAIR: + g_snprintf (token_string, token_string_len, "scanner: malformed surrogate pair"); + break; + case G_ERR_UNKNOWN: default: g_snprintf (token_string, token_string_len, "scanner: unknown error"); @@ -1066,7 +1074,7 @@ gstring = g_string_new (NULL); while ((ch = json_scanner_get_char (scanner, line_p, position_p)) != 0) { - if (ch == '"') + if (ch == '"' || token == G_TOKEN_ERROR) { in_string_dq = FALSE; break; @@ -1130,8 +1138,20 @@ units[0] = ucs; units[1] = json_scanner_get_unichar (scanner, line_p, position_p); - ucs = decode_utf16_surrogate_pair (units); - g_assert (g_unichar_validate (ucs)); + if (0xdc00 <= units[1] && units[1] <= 0xdfff && + 0xd800 <= units[0] && units[0] <= 0xdbff) + { + ucs = decode_utf16_surrogate_pair (units); + g_assert (g_unichar_validate (ucs)); + } + else + { + token = G_TOKEN_ERROR; + value.v_error = JSON_ERR_MALFORMED_SURROGATE_PAIR; + gstring = NULL; + break; + } + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/json-glib-1.6.0/json-glib/tests/invalid.c new/json-glib-1.6.2/json-glib/tests/invalid.c --- old/json-glib-1.6.0/json-glib/tests/invalid.c 2020-09-11 17:43:12.954097700 +0200 +++ new/json-glib-1.6.2/json-glib/tests/invalid.c 2021-02-09 17:32:17.412597700 +0100 @@ -212,6 +212,9 @@ /* values */ { "values-1", "[ -false ]", test_invalid_value }, + { "values-2", "[\"\\uD800\\uD800\"]", test_invalid_value }, + { "values-3", "[\"\\uDB00\\uD800\"]", test_invalid_value }, + { "values-4", "[\"\\uDB00\"]", test_invalid_value }, /* assignment */ { "assignment-1", "var foo", test_invalid_assignment }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/json-glib-1.6.0/json-glib/tests/meson.build new/json-glib-1.6.2/json-glib/tests/meson.build --- old/json-glib-1.6.0/json-glib/tests/meson.build 2020-09-11 17:43:12.954097700 +0200 +++ new/json-glib-1.6.2/json-glib/tests/meson.build 2021-02-09 17:32:17.412597700 +0100 @@ -17,6 +17,7 @@ test_data = [ 'invalid.json', + 'skip-bom.json', 'stream-load.json', ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/json-glib-1.6.0/json-glib/tests/reader.c new/json-glib-1.6.2/json-glib/tests/reader.c --- old/json-glib-1.6.0/json-glib/tests/reader.c 2020-09-11 17:43:12.955098000 +0200 +++ new/json-glib-1.6.2/json-glib/tests/reader.c 2021-02-09 17:32:17.413597800 +0100 @@ -212,6 +212,32 @@ g_object_unref (parser); } +/* test_reader_skip_bom: Ensure that a BOM Unicode character is skipped when parsing */ +static void +test_reader_skip_bom (void) +{ + JsonParser *parser = json_parser_new (); + JsonReader *reader = json_reader_new (NULL); + GError *error = NULL; + char *path; + + path = g_test_build_filename (G_TEST_DIST, "skip-bom.json", NULL); + + json_parser_load_from_mapped_file (parser, path, &error); + g_assert_no_error (error); + + json_reader_set_root (reader, json_parser_get_root (parser)); + + json_reader_read_member (reader, "appName"); + g_assert_true (json_reader_is_value (reader)); + g_assert_no_error (json_reader_get_error (reader)); + g_assert_cmpstr (json_reader_get_string_value (reader), ==, "String starts with BOM"); + + g_free (path); + g_object_unref (reader); + g_object_unref (parser); +} + int main (int argc, char *argv[]) @@ -223,6 +249,7 @@ g_test_add_func ("/reader/base-object", test_base_object); g_test_add_func ("/reader/level", test_reader_level); g_test_add_func ("/reader/null-value", test_reader_null_value); + g_test_add_func ("/reader/bom", test_reader_skip_bom); return g_test_run (); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/json-glib-1.6.0/json-glib/tests/skip-bom.json new/json-glib-1.6.2/json-glib/tests/skip-bom.json --- old/json-glib-1.6.0/json-glib/tests/skip-bom.json 1970-01-01 01:00:00.000000000 +0100 +++ new/json-glib-1.6.2/json-glib/tests/skip-bom.json 2021-02-09 17:32:17.414597700 +0100 @@ -0,0 +1,3 @@ +???{ + "appName": "String starts with BOM" +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/json-glib-1.6.0/meson.build new/json-glib-1.6.2/meson.build --- old/json-glib-1.6.0/meson.build 2020-09-11 17:43:12.956097800 +0200 +++ new/json-glib-1.6.2/meson.build 2021-02-09 17:32:17.414597700 +0100 @@ -1,4 +1,4 @@ -project('json-glib', 'c', version: '1.6.0', +project('json-glib', 'c', version: '1.6.2', license: 'LGPLv2.1+', default_options: [ 'warning_level=1', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/json-glib-1.6.0/po/LINGUAS new/json-glib-1.6.2/po/LINGUAS --- old/json-glib-1.6.0/po/LINGUAS 2020-09-11 17:43:12.956097800 +0200 +++ new/json-glib-1.6.2/po/LINGUAS 2021-02-09 17:32:17.415597700 +0100 @@ -1,4 +1,5 @@ as +be bg bn_IN bs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/json-glib-1.6.0/po/be.po new/json-glib-1.6.2/po/be.po --- old/json-glib-1.6.0/po/be.po 1970-01-01 01:00:00.000000000 +0100 +++ new/json-glib-1.6.2/po/be.po 2021-02-09 17:32:17.417597800 +0100 @@ -0,0 +1,278 @@ +msgid "" +msgstr "" +"Project-Id-Version: 98e6872775a91bf27122ff608b6db605\n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/json-glib/issues\n"; +"POT-Creation-Date: 2020-10-03 17:18+0000\n" +"PO-Revision-Date: 2020-10-07 11:06\n" +"Last-Translator: Zander Brown <[email protected]>\n" +"Language-Team: Belarusian\n" +"Language: be_BY\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || n%10>=5 && n%10<=9 || n" +"%100>=11 && n%100<=14 ? 2 : 3);\n" +"X-Generator: Gtranslator 3.32.1\n" +"X-Crowdin-Project: 98e6872775a91bf27122ff608b6db605\n" +"X-Crowdin-Project-ID: 2\n" +"X-Crowdin-Language: be\n" +"X-Crowdin-File: /master/sources/json-glib-1.0/en_GB.po\n" +"X-Crowdin-File-ID: 130\n" + +#: json-glib/json-glib-format.c:58 +msgid "Prettify output" +msgstr "?????????????????? ?????????????? ?????? ??????????????" + +#: json-glib/json-glib-format.c:59 +msgid "Indentation spaces" +msgstr "????????????????" + +#: json-glib/json-glib-format.c:59 +msgid "SPACES" +msgstr "??????????????" + +#: json-glib/json-glib-format.c:60 +msgid "Output file" +msgstr "?????????????? ????????" + +#: json-glib/json-glib-format.c:60 json-glib/json-glib-validate.c:115 +msgid "FILE" +msgstr "????????" + +#: json-glib/json-glib-format.c:61 +msgid "FILE???" +msgstr "???????????" + +#. Translators: the first %s is the program name, the second one +#. * is the URI of the file, the third is the error message. +#. +#: json-glib/json-glib-format.c:87 json-glib/json-glib-format.c:123 +#: json-glib/json-glib-validate.c:63 +#, c-format +msgid "%s: %s: error opening file: %s\n" +msgstr "%s: %s: ???? ???????????????????? ?????????????? ????????: %s\n" + +#. Translators: the first %s is the program name, the second one +#. * is the URI of the file, the third is the error message. +#. +#: json-glib/json-glib-format.c:101 json-glib/json-glib-validate.c:75 +#, c-format +msgid "%s: %s: error parsing file: %s\n" +msgstr "%s: %s: ???? ???????????????????? ?????????????????? ????????: %s\n" + +#. Translators: the first %s is the program name, the +#. * second one is the URI of the file. +#. +#: json-glib/json-glib-format.c:143 +#, c-format +msgid "%s: %s: error writing to stdout" +msgstr "%s: %s: ???? ???????????????????? ???????????????? ?? stdout" + +#. Translators: the first %s is the program name, the second one +#. * is the URI of the file, the third is the error message. +#. +#: json-glib/json-glib-format.c:167 json-glib/json-glib-validate.c:87 +#, c-format +msgid "%s: %s: error closing: %s\n" +msgstr "%s: %s: ???? ???????????????????? ??????????????: %s\n" + +#. Translators: this message will appear after the usage string +#. and before the list of options. +#: json-glib/json-glib-format.c:203 +msgid "Format JSON files." +msgstr "???????????? ???????????? JSON." + +#: json-glib/json-glib-format.c:204 +msgid "json-glib-format formats JSON resources." +msgstr "json-glib-format ???????????????? ?????????????? JSON." + +#. Translators: the %s is the program name. This error message +#. * means the user is calling json-glib-validate without any +#. * argument. +#. +#: json-glib/json-glib-format.c:219 json-glib/json-glib-validate.c:136 +#, c-format +msgid "Error parsing commandline options: %s\n" +msgstr "???? ???????????????????? ?????????????????? ?????????????????? ?????????????????? ??????????: %s\n" + +#: json-glib/json-glib-format.c:221 json-glib/json-glib-format.c:235 +#: json-glib/json-glib-validate.c:138 json-glib/json-glib-validate.c:152 +#, c-format +msgid "Try ???%s --help??? for more information." +msgstr "???????????????????????? ???%s --help???, ?????? ???????????????? ?????????? ?????????????????????? ????????????????????." + +#. Translators: the %s is the program name. This error message +#. * means the user is calling json-glib-validate without any +#. * argument. +#. +#: json-glib/json-glib-format.c:233 json-glib/json-glib-validate.c:150 +#, c-format +msgid "%s: missing files" +msgstr "%s: ???????????????????????? ??????????" + +#. Translators: this message will appear after the usage string +#. and before the list of options. +#: json-glib/json-glib-validate.c:118 +msgid "Validate JSON files." +msgstr "???????????????? ???????????? JSON." + +#: json-glib/json-glib-validate.c:119 +msgid "json-glib-validate validates JSON data at the given URI." +msgstr "json-glib-validate ???????????????? ?????????? JSON ???? ?????????????????????? URI." + +#. translators: the %s is the name of the data structure +#: json-glib/json-gobject.c:935 +#, c-format +msgid "Expecting a JSON object, but the root node is of type ???%s???" +msgstr "?????????????? ????????????? JSON object, ?????? ???????????????? ?????????? ?????? ?????? ???%s???" + +#. translators: the '%s' is the type name +#: json-glib/json-gvariant.c:524 +#, c-format +msgid "Unexpected type ???%s??? in JSON node" +msgstr "???????????????? ?????? ???%s??? ?? ?????????? JSON" + +#: json-glib/json-gvariant.c:594 +msgid "Missing elements in JSON array to conform to a tuple" +msgstr "?? ???????????? JSON ???????????????????????? ???????????????? ?????? ???????????????????????? ??????????????" + +#: json-glib/json-gvariant.c:622 +msgid "Missing closing symbol ???)??? in the GVariant tuple type" +msgstr "?? ???????? ?????????????? GVariant ???????????????????? ?????????????????? ?????????? \")\"" + +#: json-glib/json-gvariant.c:630 +msgid "Unexpected extra elements in JSON array" +msgstr "?????????????????? ???????????????????? ???????????????? ?? ???????????? JSON" + +#: json-glib/json-gvariant.c:931 +msgid "Invalid string value converting to GVariant" +msgstr "???????????? ???????????????? ?????????? ?????? ?????????????????????????? ?? GVariant" + +#: json-glib/json-gvariant.c:986 +msgid "" +"A GVariant dictionary entry expects a JSON object with exactly one member" +msgstr "?????????? ???????????????? GVariant ???????????? ???????? ????????????????? JSON ?? ?????????????? ????????????????????" + +#: json-glib/json-gvariant.c:1264 +#, c-format +msgid "GVariant class ???%c??? not supported" +msgstr "???????? GVariant ???%c??? ???? ??????????????????????????????" + +#: json-glib/json-gvariant.c:1312 +msgid "Invalid GVariant signature" +msgstr "?????????? ???????????? GVariant" + +#: json-glib/json-gvariant.c:1360 +msgid "JSON data is empty" +msgstr "?????????? JSON ????????????????????????" + +#. translators: %s: is the file name, the first %d is the line +#. * number, the second %d is the position on the line, and %s is +#. * the error message +#. +#: json-glib/json-parser.c:906 +#, c-format +msgid "%s:%d:%d: Parse error: %s" +msgstr "%s:%d:%d: ???? ???????????????????? ??????????????????: %s" + +#: json-glib/json-parser.c:989 +msgid "JSON data must be UTF-8 encoded" +msgstr "?????????? JSON ???????????? ???????? ?????????????????????? ?? UTF-8" + +#: json-glib/json-path.c:389 +msgid "Only one root node is allowed in a JSONPath expression" +msgstr "?? ???????????? JSONPath ???????????? ???????? ???????????? ?????????? ???????????????? ??????????" + +#. translators: the %c is the invalid character +#: json-glib/json-path.c:398 +#, c-format +msgid "Root node followed by invalid character ???%c???" +msgstr "???? ?????????????????? ???????????? ???????? ?????????? ???????????? ???%c???" + +#: json-glib/json-path.c:438 +msgid "Missing member name or wildcard after . character" +msgstr "?????????? ?????????????? \".\" ???????????????????? ?????????? ?????????????????? ?????????? ????????????" + +#: json-glib/json-path.c:512 +#, c-format +msgid "Malformed slice expression ???%*s???" +msgstr "?????????? ?????????? ???????????? ???%*s???" + +#: json-glib/json-path.c:556 +#, c-format +msgid "Invalid set definition ???%*s???" +msgstr "???????????? ???????????????????? ???????????? ???%*s???" + +#: json-glib/json-path.c:609 +#, c-format +msgid "Invalid slice definition ???%*s???" +msgstr "???????????? ???????????????????? ???????????? ???%*s???" + +#: json-glib/json-path.c:637 +#, c-format +msgid "Invalid array index definition ???%*s???" +msgstr "???????????? ???????????????????? ?????????????? ???????????? ???%*s???" + +#: json-glib/json-path.c:656 +#, c-format +msgid "Invalid first character ???%c???" +msgstr "?????????? ?????????? ???????????? ???%c???" + +#: json-glib/json-reader.c:474 +#, c-format +msgid "" +"The current node is of type ???%s???, but an array or an object was expected." +msgstr "?? ???????????????? ?????????? ?????? ???%s???, ?? ?????????????? ????????????? ?????????? ??????????." + +#: json-glib/json-reader.c:486 +#, c-format +msgid "" +"The index ???%d??? is greater than the size of the array at the current position." +msgstr "???????????? ???%d??? ???????????? ???? ?????????? ???????????? ???? ?????????????? ??????????????." + +#: json-glib/json-reader.c:503 +#, c-format +msgid "" +"The index ???%d??? is greater than the size of the object at the current " +"position." +msgstr "???????????? ???%d??? ???????????? ???? ?????????? ??????????????? ???? ?????????????? ??????????????." + +#: json-glib/json-reader.c:585 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:799 json-glib/json-reader.c:837 +#: json-glib/json-reader.c:875 json-glib/json-reader.c:913 +#: json-glib/json-reader.c:951 json-glib/json-reader.c:996 +#: json-glib/json-reader.c:1032 json-glib/json-reader.c:1058 +msgid "No node available at the current position" +msgstr "???? ?????????????? ?????????????? ???????? ?????????????????? ????????????" + +#: json-glib/json-reader.c:592 +#, c-format +msgid "The current position holds a ???%s??? and not an array" +msgstr "???? ?????????????? ?????????????? ?????????????????????? ???%s???, ?? ???? ??????????" + +#: json-glib/json-reader.c:668 +#, c-format +msgid "The current node is of type ???%s???, but an object was expected." +msgstr "?? ???????????????? ?????????? ?????? ???%s???, ?? ?????????????? ?????????????." + +#: json-glib/json-reader.c:675 +#, c-format +msgid "The member ???%s??? is not defined in the object at the current position." +msgstr "???????????????? \"%s\" ???? ?????????????????? ?? ??????????????? ???? ?????????????? ??????????????." + +#: json-glib/json-reader.c:758 json-glib/json-reader.c:806 +#, c-format +msgid "The current position holds a ???%s??? and not an object" +msgstr "???? ?????????????? ?????????????? ?????????????????????? ???%s???, ?? ???? ?????????????" + +#: json-glib/json-reader.c:846 json-glib/json-reader.c:884 +#: json-glib/json-reader.c:922 json-glib/json-reader.c:960 +#: json-glib/json-reader.c:1005 +#, c-format +msgid "The current position holds a ???%s??? and not a value" +msgstr "???? ?????????????? ?????????????? ?????????????????????? ???%s???, ?? ???? ????????????????" + +#: json-glib/json-reader.c:968 +msgid "The current position does not hold a string type" +msgstr "?????????????? ?????????????? ???? ?????????????? ???????? ??????????" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/json-glib-1.6.0/po/pt.po new/json-glib-1.6.2/po/pt.po --- old/json-glib-1.6.0/po/pt.po 2020-09-11 17:43:12.959097900 +0200 +++ new/json-glib-1.6.2/po/pt.po 2021-02-09 17:32:17.420597800 +0100 @@ -4,35 +4,53 @@ # Duarte Loreto <[email protected]>, 2012, 2013, 2014. # # Pedro Albuquerque <[email protected]>, 2015. +# Juliano de Souza Camargo <[email protected]>, 2020. # msgid "" msgstr "" "Project-Id-Version: 3.12\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-"; -"glib&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-06-07 22:10+0000\n" -"PO-Revision-Date: 2015-06-25 09:43+0100\n" -"Last-Translator: Pedro Albuquerque <[email protected]>\n" -"Language-Team: Portugu??s <[email protected]>\n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/json-glib/issues\n"; +"POT-Creation-Date: 2020-06-16 13:37+0000\n" +"PO-Revision-Date: 2020-09-11 20:45-0300\n" +"Last-Translator: Juliano de Souza Camargo <[email protected]>\n" +"Language-Team: Portuguese <>\n" "Language: pt\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" -"X-Generator: Gtranslator 2.91.6\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"X-Generator: Gtranslator 3.36.0\n" -#: ../json-glib/json-glib-format.c:50 +#: json-glib/json-glib-format.c:58 msgid "Prettify output" msgstr "Embelezar resultado" -#: ../json-glib/json-glib-format.c:51 +#: json-glib/json-glib-format.c:59 msgid "Indentation spaces" msgstr "Espa??os da indenta????o" +#: json-glib/json-glib-format.c:59 +msgid "SPACES" +msgstr "ESPA??OS" + +#: json-glib/json-glib-format.c:60 +msgid "Output file" +msgstr "Ficheiro de sa??da" + +#: json-glib/json-glib-format.c:60 json-glib/json-glib-validate.c:115 +msgid "FILE" +msgstr "FICHEIRO" + +#: json-glib/json-glib-format.c:61 +#| msgid "FILE" +msgid "FILE???" +msgstr "FICHEIRO..." + #. Translators: the first %s is the program name, the second one #. * is the URI of the file, the third is the error message. #. -#: ../json-glib/json-glib-format.c:77 ../json-glib/json-glib-validate.c:63 +#: json-glib/json-glib-format.c:87 json-glib/json-glib-format.c:120 +#: json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" msgstr "%s: %s: erro ao abrir ficheiro: %s\n" @@ -40,7 +58,7 @@ #. Translators: the first %s is the program name, the second one #. * is the URI of the file, the third is the error message. #. -#: ../json-glib/json-glib-format.c:89 ../json-glib/json-glib-validate.c:75 +#: json-glib/json-glib-format.c:99 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "%s: %s: erro ao processar ficheiro: %s\n" @@ -48,7 +66,7 @@ #. Translators: the first %s is the program name, the #. * second one is the URI of the file. #. -#: ../json-glib/json-glib-format.c:108 +#: json-glib/json-glib-format.c:138 #, c-format msgid "%s: %s: error writing to stdout" msgstr "%s: %s: erro ao escrever para stdout" @@ -56,22 +74,18 @@ #. Translators: the first %s is the program name, the second one #. * is the URI of the file, the third is the error message. #. -#: ../json-glib/json-glib-format.c:128 ../json-glib/json-glib-validate.c:87 +#: json-glib/json-glib-format.c:159 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" msgstr "%s: %s: erro ao fechar: %s\n" -#: ../json-glib/json-glib-format.c:157 ../json-glib/json-glib-validate.c:115 -msgid "FILE" -msgstr "FICHEIRO" - #. Translators: this message will appear after the usage string #. and before the list of options. -#: ../json-glib/json-glib-format.c:160 +#: json-glib/json-glib-format.c:192 msgid "Format JSON files." msgstr "Formatar ficheiros JSON." -#: ../json-glib/json-glib-format.c:161 +#: json-glib/json-glib-format.c:193 msgid "json-glib-format formats JSON resources." msgstr "json-glib-format formata recursos JSON." @@ -79,183 +93,215 @@ #. * means the user is calling json-glib-validate without any #. * argument. #. -#: ../json-glib/json-glib-format.c:178 ../json-glib/json-glib-validate.c:136 +#: json-glib/json-glib-format.c:208 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" msgstr "Erro ao processar op????es de linha de comandos: %s\n" -#: ../json-glib/json-glib-format.c:180 ../json-glib/json-glib-format.c:194 -#: ../json-glib/json-glib-validate.c:138 ../json-glib/json-glib-validate.c:152 +#: json-glib/json-glib-format.c:210 json-glib/json-glib-format.c:224 +#: json-glib/json-glib-validate.c:138 json-glib/json-glib-validate.c:152 #, c-format -msgid "Try \"%s --help\" for more information." -msgstr "Tente \"%s --help\" para mais informa????es." +#| msgid "Try \"%s --help\" for more information." +msgid "Try ???%s --help??? for more information." +msgstr "Tente ???%s --help??? para mais informa????es." #. Translators: the %s is the program name. This error message #. * means the user is calling json-glib-validate without any #. * argument. #. -#: ../json-glib/json-glib-format.c:192 ../json-glib/json-glib-validate.c:150 +#: json-glib/json-glib-format.c:222 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "%s: faltam ficheiros" #. Translators: this message will appear after the usage string #. and before the list of options. -#: ../json-glib/json-glib-validate.c:118 +#: json-glib/json-glib-validate.c:118 msgid "Validate JSON files." msgstr "Validar ficheiros JSON." -#: ../json-glib/json-glib-validate.c:119 +#: json-glib/json-glib-validate.c:119 msgid "json-glib-validate validates JSON data at the given URI." msgstr "json-glib-validate valida dados JSON no URI indicado." -#: ../json-glib/json-gobject.c:943 +#. translators: the %s is the name of the data structure +#: json-glib/json-gobject.c:940 #, c-format -msgid "Expecting a JSON object, but the root node is of type `%s'" -msgstr "Esperado um objeto JSON, mas o n?? raiz ?? do tipo \"%s\"" +#| msgid "Expecting a JSON object, but the root node is of type `%s'" +msgid "Expecting a JSON object, but the root node is of type ???%s???" +msgstr "Esperado um objeto JSON, mas o n?? raiz ?? do tipo ???%s???" -#: ../json-glib/json-gvariant.c:523 +#. translators: the '%s' is the type name +#: json-glib/json-gvariant.c:524 #, c-format -msgid "Unexpected type '%s' in JSON node" -msgstr "Tipo \"%s\" inesperado no n?? JSON" +#| msgid "Unexpected type '%s' in JSON node" +msgid "Unexpected type ???%s??? in JSON node" +msgstr "Tipo ???%s??? inesperado no n?? JSON" -#: ../json-glib/json-gvariant.c:593 +#: json-glib/json-gvariant.c:594 msgid "Missing elements in JSON array to conform to a tuple" msgstr "Elementos em falta na matriz JSON para respeitar um conjunto" -#: ../json-glib/json-gvariant.c:621 -msgid "Missing closing symbol ')' in the GVariant tuple type" -msgstr "Falta o s??mbolo de fecho \")\" no tipo de conjunto GVariant" +#: json-glib/json-gvariant.c:622 +#| msgid "Missing closing symbol ')' in the GVariant tuple type" +msgid "Missing closing symbol ???)??? in the GVariant tuple type" +msgstr "Falta o s??mbolo de fecho ???)??? no tipo de conjunto GVariant" -#: ../json-glib/json-gvariant.c:629 +#: json-glib/json-gvariant.c:630 msgid "Unexpected extra elements in JSON array" msgstr "Elementos extra inesperados na matriz JSON" -#: ../json-glib/json-gvariant.c:908 +#: json-glib/json-gvariant.c:931 msgid "Invalid string value converting to GVariant" msgstr "Valor inv??lido de cadeia ao converter em GVariant" -#: ../json-glib/json-gvariant.c:964 +#: json-glib/json-gvariant.c:986 msgid "" "A GVariant dictionary entry expects a JSON object with exactly one member" msgstr "" "Uma entrada de dicion??rio GVariant espera um objeto JSON com exatamente um " "membro" -#: ../json-glib/json-gvariant.c:1248 +#: json-glib/json-gvariant.c:1264 #, c-format -msgid "GVariant class '%c' not supported" -msgstr "Classe GVariant \"%c\" n??o suportada" +#| msgid "GVariant class '%c' not supported" +msgid "GVariant class ???%c??? not supported" +msgstr "Classe GVariant ???%c??? n??o suportada" -#: ../json-glib/json-gvariant.c:1296 +#: json-glib/json-gvariant.c:1312 msgid "Invalid GVariant signature" msgstr "Assinatura GVariant inv??lida" -#: ../json-glib/json-gvariant.c:1344 +#: json-glib/json-gvariant.c:1360 msgid "JSON data is empty" msgstr "Dados JSON est??o vazios" -#: ../json-glib/json-parser.c:815 +#. translators: %s: is the file name, the first %d is the line +#. * number, the second %d is the position on the line, and %s is +#. * the error message +#. +#: json-glib/json-parser.c:909 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: erro de processamento: %s" -#: ../json-glib/json-parser.c:883 +#: json-glib/json-parser.c:992 msgid "JSON data must be UTF-8 encoded" msgstr "Dados JSON t??m de estar codificados em UTF-8" -#: ../json-glib/json-path.c:388 +#: json-glib/json-path.c:389 msgid "Only one root node is allowed in a JSONPath expression" msgstr "S?? um n?? raiz ?? permitido numa express??o JSONPath" -#: ../json-glib/json-path.c:397 +#. translators: the %c is the invalid character +#: json-glib/json-path.c:398 #, c-format -msgid "Root node followed by invalid character '%c'" -msgstr "N?? raiz seguido do car??cter inv??lido \"%c\"" +#| msgid "Root node followed by invalid character '%c'" +msgid "Root node followed by invalid character ???%c???" +msgstr "N?? raiz seguido do car??cter inv??lido ???%c???" -#: ../json-glib/json-path.c:437 +#: json-glib/json-path.c:438 msgid "Missing member name or wildcard after . character" msgstr "Falta nome de membro ou car??ter global ap??s car??ter \".\"" -#: ../json-glib/json-path.c:511 +#: json-glib/json-path.c:512 #, c-format -msgid "Malformed slice expression '%*s'" -msgstr "Express??o \"%*s\" de fatia mal formada" +#| msgid "Malformed slice expression '%*s'" +msgid "Malformed slice expression ???%*s???" +msgstr "Express??o ???%*s??? de fatia mal formada" -#: ../json-glib/json-path.c:555 +#: json-glib/json-path.c:556 #, c-format -msgid "Invalid set definition '%*s'" -msgstr "Defini????o inv??lida de conjunto \"%*s\"" +#| msgid "Invalid set definition '%*s'" +msgid "Invalid set definition ???%*s???" +msgstr "Defini????o inv??lida de conjunto ???%*s???" -#: ../json-glib/json-path.c:608 +#: json-glib/json-path.c:609 #, c-format -msgid "Invalid slice definition '%*s'" -msgstr "Defini????o inv??lida de fatia \"%*s\"" +#| msgid "Invalid slice definition '%*s'" +msgid "Invalid slice definition ???%*s???" +msgstr "Defini????o inv??lida de fatia ???%*s???" -#: ../json-glib/json-path.c:636 +#: json-glib/json-path.c:637 #, c-format -msgid "Invalid array index definition '%*s'" -msgstr "Defini????o inv??lida de ??ndice de matriz \"%*s\"" +#| msgid "Invalid array index definition '%*s'" +msgid "Invalid array index definition ???%*s???" +msgstr "Defini????o inv??lida de ??ndice de matriz ???%*s???" -#: ../json-glib/json-path.c:655 +#: json-glib/json-path.c:656 #, c-format -msgid "Invalid first character '%c'" -msgstr "Primeiro car??cter \"%c\" inv??lido" +#| msgid "Invalid first character '%c'" +msgid "Invalid first character ???%c???" +msgstr "Primeiro car??cter ???%c??? inv??lido" -#: ../json-glib/json-reader.c:459 +#: json-glib/json-reader.c:474 #, c-format +#| msgid "" +#| "The current node is of type '%s', but an array or an object was expected." msgid "" -"The current node is of type '%s', but an array or an object was expected." -msgstr "O n?? atual ?? do tipo \"%s\", mas era esperada uma matriz ou um objeto." +"The current node is of type ???%s???, but an array or an object was expected." +msgstr "O n?? atual ?? do tipo ???%s???, mas era esperada uma matriz ou um objeto." -#: ../json-glib/json-reader.c:471 +#: json-glib/json-reader.c:486 #, c-format +#| msgid "" +#| "The index '%d' is greater than the size of the array at the current " +#| "position." msgid "" -"The index '%d' is greater than the size of the array at the current position." -msgstr "O ??ndice \"%d\" ?? maior do que o tamanho da matriz na posi????o atual." +"The index ???%d??? is greater than the size of the array at the current position." +msgstr "O ??ndice ???%d??? ?? maior do que o tamanho da matriz na posi????o atual." -#: ../json-glib/json-reader.c:488 +#: json-glib/json-reader.c:503 #, c-format +#| msgid "" +#| "The index '%d' is greater than the size of the object at the current " +#| "position." msgid "" -"The index '%d' is greater than the size of the object at the current " +"The index ???%d??? is greater than the size of the object at the current " "position." -msgstr "O ??ndice \"%d\" ?? maior do que o tamanho do objeto na posi????o atual." +msgstr "O ??ndice ???%d??? ?? maior do que o tamanho do objeto na posi????o atual." -#: ../json-glib/json-reader.c:572 ../json-glib/json-reader.c:723 -#: ../json-glib/json-reader.c:774 ../json-glib/json-reader.c:812 -#: ../json-glib/json-reader.c:850 ../json-glib/json-reader.c:888 -#: ../json-glib/json-reader.c:926 ../json-glib/json-reader.c:971 -#: ../json-glib/json-reader.c:1007 ../json-glib/json-reader.c:1033 +#: json-glib/json-reader.c:585 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:799 json-glib/json-reader.c:837 +#: json-glib/json-reader.c:875 json-glib/json-reader.c:913 +#: json-glib/json-reader.c:951 json-glib/json-reader.c:996 +#: json-glib/json-reader.c:1032 json-glib/json-reader.c:1058 msgid "No node available at the current position" msgstr "Nenhum n?? dispon??vel na posi????o atual" -#: ../json-glib/json-reader.c:579 +#: json-glib/json-reader.c:592 #, c-format -msgid "The current position holds a '%s' and not an array" -msgstr "A posi????o atual cont??m um \"%s\" e n??o uma matriz" +#| msgid "The current position holds a '%s' and not an array" +msgid "The current position holds a ???%s??? and not an array" +msgstr "A posi????o atual cont??m um ???%s??? e n??o uma matriz" -#: ../json-glib/json-reader.c:642 +#: json-glib/json-reader.c:668 #, c-format -msgid "The current node is of type '%s', but an object was expected." -msgstr "O n?? atual ?? do tipo \"%s\", mas era esperado um objeto." +#| msgid "The current node is of type '%s', but an object was expected." +msgid "The current node is of type ???%s???, but an object was expected." +msgstr "O n?? atual ?? do tipo ???%s???, mas era esperado um objeto." -#: ../json-glib/json-reader.c:649 +#: json-glib/json-reader.c:675 #, c-format -msgid "The member '%s' is not defined in the object at the current position." -msgstr "O membro \"%s\" n??o est?? definido no objeto da posi????o atual." +#| msgid "" +#| "The member '%s' is not defined in the object at the current position." +msgid "The member ???%s??? is not defined in the object at the current position." +msgstr "O membro ???%s??? n??o est?? definido no objeto da posi????o atual." -#: ../json-glib/json-reader.c:730 ../json-glib/json-reader.c:781 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:806 #, c-format -msgid "The current position holds a '%s' and not an object" -msgstr "A posi????o atual cont??m um \"%s\" e n??o um objeto" +#| msgid "The current position holds a '%s' and not an object" +msgid "The current position holds a ???%s??? and not an object" +msgstr "A posi????o atual cont??m um ???%s??? e n??o um objeto" -#: ../json-glib/json-reader.c:821 ../json-glib/json-reader.c:859 -#: ../json-glib/json-reader.c:897 ../json-glib/json-reader.c:935 -#: ../json-glib/json-reader.c:980 +#: json-glib/json-reader.c:846 json-glib/json-reader.c:884 +#: json-glib/json-reader.c:922 json-glib/json-reader.c:960 +#: json-glib/json-reader.c:1005 #, c-format -msgid "The current position holds a '%s' and not a value" -msgstr "A posi????o atual cont??m um \"%s\" e n??o um valor" +#| msgid "The current position holds a '%s' and not a value" +msgid "The current position holds a ???%s??? and not a value" +msgstr "A posi????o atual cont??m um ???%s??? e n??o um valor" -#: ../json-glib/json-reader.c:943 +#: json-glib/json-reader.c:968 msgid "The current position does not hold a string type" msgstr "A posi????o atual n??o cont??m um tipo cadeia"
