diff options
33 files changed, 1116 insertions, 723 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5d0b19a..0b7c477 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,7 +59,7 @@ fedora-x86_64: python3-pip python3-wheel redhat-rpm-config - MESON_VERSION: "0.55.3" + MESON_VERSION: "0.62" MESON_EXTRA_FLAGS: "--buildtype=debug --default-library=both -Dwerror=true -Dglib:werror=false -Dintrospection=enabled" reference: @@ -74,7 +74,7 @@ reference: git glib2-devel libxslt - MESON_VERSION: "0.55.3" + MESON_VERSION: "0.62" MESON_EXTRA_FLAGS: "-Dman=true -Dintrospection=enabled" DOCS_FLAGS: -Dgtk_doc=enabled DOCS_PATH: doc/json-glib-1.0 @@ -42,8 +42,8 @@ Build and installation To build JSON-GLib just run: ```sh - $ meson _build . - $ meson -C _build + $ meson setup _build . + $ meson compile -C _build $ meson test -C _build $ meson install -C _build ``` diff --git a/json-glib/json-array.c b/json-glib/json-array.c index b242ce7..200cd92 100644 --- a/json-glib/json-array.c +++ b/json-glib/json-array.c @@ -731,12 +731,10 @@ json_array_foreach_element (JsonArray *array, JsonArrayForeach func, gpointer data) { - gint i; - g_return_if_fail (array != NULL); g_return_if_fail (func != NULL); - for (i = 0; i < array->elements->len; i++) + for (guint i = 0; i < array->elements->len; i++) { JsonNode *element_node; diff --git a/json-glib/json-generator.c b/json-glib/json-generator.c index fc8dcfc..40e9b02 100644 --- a/json-glib/json-generator.c +++ b/json-glib/json-generator.c @@ -61,7 +61,6 @@ enum }; static void dump_value (GString *buffer, - gint level, JsonNode *node); static void dump_array (JsonGenerator *generator, GString *buffer, @@ -316,7 +315,7 @@ dump_node (JsonGenerator *generator, break; case JSON_NODE_VALUE: - dump_value (buffer, level, node); + dump_value (buffer, node); break; case JSON_NODE_ARRAY: @@ -333,7 +332,6 @@ dump_node (JsonGenerator *generator, static void dump_value (GString *buffer, - gint level, JsonNode *node) { const JsonValue *value; diff --git a/json-glib/json-gobject.c b/json-glib/json-gobject.c index 5b7331c..f783209 100644 --- a/json-glib/json-gobject.c +++ b/json-glib/json-gobject.c @@ -406,7 +406,7 @@ json_gobject_dump (GObject *gobject) gboolean json_deserialize_pspec (GValue *value, - GParamSpec *pspec, + GParamSpec *pspec G_GNUC_UNUSED, JsonNode *node) { GValue node_value = { 0, }; @@ -655,7 +655,7 @@ json_deserialize_pspec (GValue *value, JsonNode * json_serialize_pspec (const GValue *real_value, - GParamSpec *pspec) + GParamSpec *pspec G_GNUC_UNUSED) { JsonNode *retval = NULL; JsonNodeType node_type; @@ -838,11 +838,11 @@ json_gobject_serialize (GObject *gobject) * json_construct_gobject: * @gtype: the type of the object to construct * @data: a JSON data stream - * @length: length of the data stream + * @length: length of the data stream (unused) * @error: return location for a #GError, or %NULL * * Deserializes a JSON data stream and creates an instance of the given - * type + * type. * * If the given type implements the [iface@Json.Serializable] interface, it * will be asked to deserialize all the JSON members into their respective @@ -851,7 +851,11 @@ json_gobject_serialize (GObject *gobject) * * **Note**: the JSON data stream must be an object. * - * Return value: (transfer full) (nullable): a new object instance of the given type + * For historical reasons, the `length` argument is unused. The given `data` + * must be a `NUL`-terminated string. + * + * Returns: (transfer full) (nullable): a new object instance of the given + * type * * Since: 0.4 * @@ -860,7 +864,7 @@ json_gobject_serialize (GObject *gobject) GObject * json_construct_gobject (GType gtype, const gchar *data, - gsize length, + gsize length G_GNUC_UNUSED, GError **error) { return json_gobject_from_data (gtype, data, strlen (data), error); diff --git a/json-glib/json-gvariant.c b/json-glib/json-gvariant.c index 15f03f5..2af98e7 100644 --- a/json-glib/json-gvariant.c +++ b/json-glib/json-gvariant.c @@ -490,24 +490,27 @@ json_node_assert_type (JsonNode *json_node, } static void -json_to_gvariant_foreach_add (gpointer data, gpointer user_data) +json_to_gvariant_foreach_add (gpointer data, + gpointer user_data) { - GVariantBuilder *builder = (GVariantBuilder *) user_data; - GVariant *child = (GVariant *) data; + GVariantBuilder *builder = user_data; + GVariant *child = data; g_variant_builder_add_value (builder, child); } static void -json_to_gvariant_foreach_free (gpointer data, gpointer user_data) +json_to_gvariant_foreach_free (gpointer data, + gpointer user_data G_GNUC_UNUSED) { - GVariant *child = (GVariant *) data; + GVariant *child = data; g_variant_unref (child); } static GVariant * -json_to_gvariant_build_from_glist (GList *list, const gchar *signature) +json_to_gvariant_build_from_glist (GList *list, + const char *signature) { GVariantBuilder *builder; GVariant *result; @@ -529,7 +532,7 @@ json_to_gvariant_tuple (JsonNode *json_node, { GVariant *variant = NULL; JsonArray *array; - gint i; + guint i; GList *children = NULL; gboolean roll_back = FALSE; const gchar *initial_signature; @@ -737,7 +740,7 @@ json_to_gvariant_array (JsonNode *json_node, if (json_array_get_length (array) > 0) { - gint i; + guint i; guint len; len = json_array_get_length (array); diff --git a/json-glib/json-parser.c b/json-glib/json-parser.c index c5e58f4..3024a25 100644 --- a/json-glib/json-parser.c +++ b/json-glib/json-parser.c @@ -950,7 +950,6 @@ static JsonScanner * json_scanner_create (JsonParser *parser) { JsonScanner *scanner; - gint i; scanner = json_scanner_new (); scanner->msg_handler = json_scanner_msg_handler; @@ -960,7 +959,7 @@ json_scanner_create (JsonParser *parser) * we cannot move them into JsonScanner without moving a bunch of code * as well */ - for (i = 0; i < n_symbols; i++) + for (guint i = 0; i < n_symbols; i++) { json_scanner_scope_add_symbol (scanner, 0, symbol_names + symbols[i].name_offset, @@ -1011,7 +1010,6 @@ json_parser_load (JsonParser *parser, JsonScanner *scanner; gboolean done; gboolean retval = TRUE; - gint i; gchar *data = input_data; json_parser_clear (parser); @@ -1053,7 +1051,7 @@ json_parser_load (JsonParser *parser, else { guint expected_token; - gint cur_token; + guint cur_token; /* we try to show the expected token, if possible */ expected_token = json_parse_statement (parser, scanner); @@ -1071,7 +1069,7 @@ json_parser_load (JsonParser *parser, if (expected_token > JSON_TOKEN_INVALID && expected_token < JSON_TOKEN_LAST) { - for (i = 0; i < n_symbols; i++) + for (guint i = 0; i < n_symbols; i++) if (symbols[i].token == expected_token) symbol_name = symbol_names + symbols[i].name_offset; @@ -1084,7 +1082,7 @@ json_parser_load (JsonParser *parser, { symbol_name = "???"; - for (i = 0; i < n_symbols; i++) + for (guint i = 0; i < n_symbols; i++) if (symbols[i].token == cur_token) symbol_name = symbol_names + symbols[i].name_offset; } @@ -1558,7 +1556,7 @@ json_parser_load_from_stream_finish (JsonParser *parser, static void read_from_stream (GTask *task, - gpointer source_obj, + gpointer source_obj G_GNUC_UNUSED, gpointer task_data, GCancellable *cancellable) { diff --git a/json-glib/json-path.c b/json-glib/json-path.c index 86fe97f..5e4c0ef 100644 --- a/json-glib/json-path.c +++ b/json-glib/json-path.c @@ -199,7 +199,7 @@ struct _PathNode union { /* JSON_PATH_NODE_CHILD_ELEMENT */ - int element_index; + guint element_index; /* JSON_PATH_NODE_CHILD_MEMBER */ char *member_name; @@ -258,7 +258,7 @@ json_path_class_init (JsonPathClass *klass) } static void -json_path_init (JsonPath *self) +json_path_init (JsonPath *self G_GNUC_UNUSED) { } @@ -302,7 +302,7 @@ json_path_foreach_print (gpointer data, break; case JSON_PATH_NODE_CHILD_ELEMENT: - g_string_append_printf (buf, "<element '%d'", cur_node->data.element_index); + g_string_append_printf (buf, "<element '%u'", cur_node->data.element_index); break; case JSON_PATH_NODE_RECURSIVE_DESCENT: @@ -781,7 +781,7 @@ walk_path_node (GList *path, { JsonArray *array = json_node_get_array (root); GList *members, *l; - int i; + guint i; members = json_array_get_elements (array); for (l = members, i = 0; l != NULL; l = l->next, i += 1) diff --git a/json-glib/json-reader.c b/json-glib/json-reader.c index cc10cc8..3e58853 100644 --- a/json-glib/json-reader.c +++ b/json-glib/json-reader.c @@ -1117,3 +1117,22 @@ json_reader_get_member_name (JsonReader *reader) return g_ptr_array_index (reader->priv->members, reader->priv->members->len - 1); } + +/** + * json_reader_get_current_node: + * @reader: a reader + * + * Retrieves the reader node at the current position. + * + * Return value: (nullable) (transfer none): the current node of the reader + * + * Since: 1.8 + */ +JsonNode * +json_reader_get_current_node (JsonReader *reader) +{ + g_return_val_if_fail (JSON_IS_READER (reader), NULL); + json_reader_return_val_if_error_set (reader, NULL); + + return reader->priv->current_node; +} diff --git a/json-glib/json-reader.h b/json-glib/json-reader.h index 105e88c..9efe36c 100644 --- a/json-glib/json-reader.h +++ b/json-glib/json-reader.h @@ -152,6 +152,8 @@ JSON_AVAILABLE_IN_1_0 gboolean json_reader_get_boolean_value (JsonReader *reader); JSON_AVAILABLE_IN_1_0 gboolean json_reader_get_null_value (JsonReader *reader); +JSON_AVAILABLE_IN_1_8 +JsonNode * json_reader_get_current_node (JsonReader *reader); #ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC G_DEFINE_AUTOPTR_CLEANUP_FUNC (JsonReader, g_object_unref) diff --git a/json-glib/json-scanner.c b/json-glib/json-scanner.c index e9a58be..73a510e 100644 --- a/json-glib/json-scanner.c +++ b/json-glib/json-scanner.c @@ -85,41 +85,42 @@ struct _JsonScannerConfig static JsonScannerConfig json_scanner_config_template = { - ( " \t\r\n" ) /* cset_skip_characters */, - ( - "_" - G_CSET_a_2_z - G_CSET_A_2_Z - ) /* cset_identifier_first */, - ( - G_CSET_DIGITS - "-_" - G_CSET_a_2_z - G_CSET_A_2_Z - ) /* cset_identifier_nth */, - ( "//\n" ) /* cpair_comment_single */, - TRUE /* case_sensitive */, - TRUE /* skip_comment_multi */, - TRUE /* skip_comment_single */, - FALSE /* scan_comment_multi */, - TRUE /* scan_identifier */, - TRUE /* scan_identifier_1char */, - FALSE /* scan_identifier_NULL */, - TRUE /* scan_symbols */, - TRUE /* scan_binary */, - TRUE /* scan_octal */, - TRUE /* scan_float */, - TRUE /* scan_hex */, - TRUE /* scan_hex_dollar */, - TRUE /* scan_string_sq */, - TRUE /* scan_string_dq */, - TRUE /* numbers_2_int */, - FALSE /* int_2_float */, - FALSE /* identifier_2_string */, - TRUE /* char_2_token */, - TRUE /* symbol_2_token */, - FALSE /* scope_0_fallback */, - TRUE /* store_int64 */ + .cset_skip_characters = ( " \t\r\n" ), + .cset_identifier_first = ( + "_" + G_CSET_a_2_z + G_CSET_A_2_Z + ), + .cset_identifier_nth = ( + G_CSET_DIGITS + "-_" + G_CSET_a_2_z + G_CSET_A_2_Z + ), + .cpair_comment_single = ( "//\n" ), + .case_sensitive = TRUE, + .skip_comment_multi = TRUE, + .skip_comment_single = TRUE, + .scan_comment_multi = FALSE, + .scan_identifier = TRUE, + .scan_identifier_1char = TRUE, + .scan_identifier_NULL = FALSE, + .scan_symbols = TRUE, + .scan_binary = TRUE, + .scan_octal = TRUE, + .scan_float = TRUE, + .scan_hex = TRUE, + .scan_hex_dollar = TRUE, + .scan_string_sq = TRUE, + .scan_string_dq = TRUE, + .numbers_2_int = TRUE, + .int_2_float = FALSE, + .identifier_2_string = FALSE, + .char_2_token = TRUE, + .symbol_2_token = TRUE, + .scope_0_fallback = FALSE, + .store_int64 = TRUE, + .padding_dummy = 0, }; /* --- defines --- */ @@ -282,8 +283,8 @@ json_scanner_free_value (GTokenType *token_p, static void json_scanner_destroy_symbol_table_entry (gpointer _key, - gpointer _value, - gpointer _data) + gpointer _value G_GNUC_UNUSED, + gpointer _data G_GNUC_UNUSED) { JsonScannerKey *key = _key; diff --git a/json-glib/json-serializable.c b/json-glib/json-serializable.c index de6c1c4..e19670b 100644 --- a/json-glib/json-serializable.c +++ b/json-glib/json-serializable.c @@ -113,8 +113,8 @@ json_serializable_deserialize_property (JsonSerializable *serializable, } static gboolean -json_serializable_real_deserialize (JsonSerializable *serializable, - const gchar *name, +json_serializable_real_deserialize (JsonSerializable *serializable G_GNUC_UNUSED, + const gchar *name G_GNUC_UNUSED, GValue *value, GParamSpec *pspec, JsonNode *node) @@ -128,8 +128,8 @@ json_serializable_real_deserialize (JsonSerializable *serializable, } static JsonNode * -json_serializable_real_serialize (JsonSerializable *serializable, - const gchar *name, +json_serializable_real_serialize (JsonSerializable *serializable G_GNUC_UNUSED, + const gchar *name G_GNUC_UNUSED, const GValue *value, GParamSpec *pspec) { diff --git a/json-glib/json-version-macros.h b/json-glib/json-version-macros.h index 75ac770..a961be3 100644 --- a/json-glib/json-version-macros.h +++ b/json-glib/json-version-macros.h @@ -45,6 +45,8 @@ * JSON_VERSION_1_0: * * The encoded representation of JSON-GLib version "1.0". + * + * Since: 1.0 */ #define JSON_VERSION_1_0 (G_ENCODE_VERSION (1, 0)) @@ -52,6 +54,8 @@ * JSON_VERSION_1_2: * * The encoded representation of JSON-GLib version "1.2". + * + * Since: 1.2 */ #define JSON_VERSION_1_2 (G_ENCODE_VERSION (1, 2)) @@ -59,6 +63,8 @@ * JSON_VERSION_1_4: * * The encoded representation of JSON-GLib version "1.4". + * + * Since: 1.4 */ #define JSON_VERSION_1_4 (G_ENCODE_VERSION (1, 4)) @@ -66,9 +72,20 @@ * JSON_VERSION_1_6: * * The encoded representation of JSON-GLib version "1.6". + * + * Since: 1.6 */ #define JSON_VERSION_1_6 (G_ENCODE_VERSION (1, 6)) +/** + * JSON_VERSION_1_8: + * + * The encoded representation of JSON-GLib version "1.8". + * + * Since: 1.8 + */ +#define JSON_VERSION_1_8 (G_ENCODE_VERSION (1, 8)) + /* evaluates to the current stable version; for development cycles, * this means the next stable target */ @@ -205,4 +222,19 @@ # define JSON_AVAILABLE_IN_1_6 _JSON_EXTERN #endif +/* 1.8 */ +#if JSON_VERSION_MIN_REQUIRED >= JSON_VERSION_1_8 +# define JSON_DEPRECATED_IN_1_8 JSON_DEPRECATED +# define JSON_DEPRECATED_IN_1_8_FOR(f) JSON_DEPRECATED_FOR(f) +#else +# define JSON_DEPRECATED_IN_1_8 _JSON_EXTERN +# define JSON_DEPRECATED_IN_1_8_FOR(f) _JSON_EXTERN +#endif + +#if JSON_VERSION_MAX_ALLOWED < JSON_VERSION_1_8 +# define JSON_AVAILABLE_IN_1_8 JSON_UNAVAILABLE(1, 8) +#else +# define JSON_AVAILABLE_IN_1_8 _JSON_EXTERN +#endif + #endif /* __JSON_VERSION_MACROS_H__ */ diff --git a/json-glib/tests/array.c b/json-glib/tests/array.c index 426cd72..421d333 100644 --- a/json-glib/tests/array.c +++ b/json-glib/tests/array.c @@ -6,7 +6,7 @@ test_empty_array (void) JsonArray *array = json_array_new (); g_assert_cmpint (json_array_get_length (array), ==, 0); - g_assert (json_array_get_elements (array) == NULL); + g_assert_null (json_array_get_elements (array)); json_array_unref (array); } @@ -24,7 +24,7 @@ test_add_element (void) node = json_array_get_element (array, 0); g_assert_cmpint (JSON_NODE_TYPE (node), ==, JSON_NODE_NULL); - g_assert (json_array_get_null_element (array, 0)); + g_assert_true (json_array_get_null_element (array, 0)); json_array_add_int_element (array, 42); g_assert_cmpint (json_array_get_length (array), ==, 2); @@ -36,7 +36,7 @@ test_add_element (void) json_array_add_boolean_element (array, TRUE); g_assert_cmpint (json_array_get_length (array), ==, 4); - g_assert (json_array_get_boolean_element (array, 3)); + g_assert_true (json_array_get_boolean_element (array, 3)); json_array_add_string_element (array, "Hello"); g_assert_cmpint (json_array_get_length (array), ==, 5); @@ -44,20 +44,20 @@ test_add_element (void) json_array_add_string_element (array, NULL); g_assert_cmpint (json_array_get_length (array), ==, 6); - g_assert (json_array_get_string_element (array, 5) == NULL); - g_assert (json_array_get_element (array, 5) != NULL); - g_assert (json_array_get_null_element (array, 5)); + g_assert_null (json_array_get_string_element (array, 5)); + g_assert_nonnull (json_array_get_element (array, 5)); + g_assert_true (json_array_get_null_element (array, 5)); json_array_add_array_element (array, NULL); - g_assert (json_array_get_array_element (array, 6) == NULL); - g_assert (json_array_get_null_element (array, 6)); + g_assert_null (json_array_get_array_element (array, 6)); + g_assert_true (json_array_get_null_element (array, 6)); json_array_add_object_element (array, json_object_new ()); - g_assert (json_array_get_object_element (array, 7) != NULL); + g_assert_nonnull (json_array_get_object_element (array, 7)); json_array_add_object_element (array, NULL); - g_assert (json_array_get_object_element (array, 8) == NULL); - g_assert (json_array_get_null_element (array, 8)); + g_assert_null (json_array_get_object_element (array, 8)); + g_assert_true (json_array_get_null_element (array, 8)); json_array_unref (array); } @@ -94,16 +94,16 @@ static const struct { }; static void -verify_foreach (JsonArray *array, +verify_foreach (JsonArray *array G_GNUC_UNUSED, guint index_, JsonNode *element_node, gpointer user_data) { TestForeachFixture *fixture = user_data; - g_assert (g_list_find (fixture->elements, element_node)); - g_assert (json_node_get_node_type (element_node) == type_verify[index_].element_type); - g_assert (json_node_get_value_type (element_node) == type_verify[index_].element_gtype); + g_assert_nonnull (g_list_find (fixture->elements, element_node)); + g_assert_true (json_node_get_node_type (element_node) == type_verify[index_].element_type); + g_assert_true (json_node_get_value_type (element_node) == type_verify[index_].element_gtype); fixture->iterations += 1; } @@ -120,7 +120,7 @@ test_foreach_element (void) json_array_add_null_element (array); fixture.elements = json_array_get_elements (array); - g_assert (fixture.elements != NULL); + g_assert_nonnull (fixture.elements); fixture.n_elements = json_array_get_length (array); g_assert_cmpint (fixture.n_elements, ==, g_list_length (fixture.elements)); diff --git a/json-glib/tests/boxed.c b/json-glib/tests/boxed.c index 6e52e2a..e9facff 100644 --- a/json-glib/tests/boxed.c +++ b/json-glib/tests/boxed.c @@ -243,9 +243,9 @@ test_deserialize_boxed (void) GObject *obj; obj = json_gobject_from_data (TEST_TYPE_OBJECT, serialize_data, -1, NULL); - g_assert (TEST_IS_OBJECT (obj)); + g_assert_true (TEST_IS_OBJECT (obj)); g_assert_cmpint (TEST_OBJECT (obj)->blah.foo, ==, 42); - g_assert (TEST_OBJECT (obj)->blah.bar); + g_assert_true (TEST_OBJECT (obj)->blah.bar); g_object_unref (obj); } diff --git a/json-glib/tests/builder.c b/json-glib/tests/builder.c index b3e07d6..42569d7 100644 --- a/json-glib/tests/builder.c +++ b/json-glib/tests/builder.c @@ -134,7 +134,7 @@ test_builder_reset (void) node = json_builder_get_root (builder); json_generator_set_root (generator, node); data = json_generator_to_data (generator, &length); - g_assert (strncmp (data, reset_object, length) == 0); + g_assert_true (strncmp (data, reset_object, length) == 0); g_free (data); json_node_free (node); @@ -148,7 +148,7 @@ test_builder_reset (void) node = json_builder_get_root (builder); json_generator_set_root (generator, node); data = json_generator_to_data (generator, &length); - g_assert (strncmp (data, reset_array, length) == 0); + g_assert_true (strncmp (data, reset_array, length) == 0); g_free (data); json_node_free (node); diff --git a/json-glib/tests/generator.c b/json-glib/tests/generator.c index 84995f8..f6ac0f1 100644 --- a/json-glib/tests/generator.c +++ b/json-glib/tests/generator.c @@ -84,7 +84,7 @@ test_empty_array (void) g_assert_cmpint (len, ==, strlen (empty_array)); g_assert_cmpstr (data, ==, empty_array); - g_assert (json_generator_get_pretty (gen) == FALSE); + g_assert_false (json_generator_get_pretty (gen)); g_assert_cmpint (json_generator_get_indent (gen), ==, 0); g_assert_cmpint (json_generator_get_indent_char (gen), ==, ' '); @@ -297,7 +297,6 @@ test_decimal_separator (void) JsonNode *node = json_node_new (JSON_NODE_VALUE); JsonGenerator *generator = json_generator_new (); gchar *old_locale; - gint i; json_node_set_double (node, 3.14); @@ -305,7 +304,7 @@ test_decimal_separator (void) old_locale = setlocale (LC_NUMERIC, NULL); - for (i = 0; i < G_N_ELEMENTS (decimal_separator); i++) + for (guint i = 0; i < G_N_ELEMENTS (decimal_separator); i++) { gchar *str, *expected; @@ -319,12 +318,12 @@ test_decimal_separator (void) json_node_get_double (node), str); - g_assert (str != NULL); + g_assert_nonnull (str); expected = strstr (str, decimal_separator[i].sep); if (decimal_separator[i].matches) - g_assert (expected != NULL); + g_assert_nonnull (expected); else - g_assert (expected == NULL); + g_assert_null (expected); g_free (str); } @@ -373,10 +372,10 @@ test_pretty (void) char *data; gsize len; - g_assert (json_parser_load_from_data (parser, pretty_examples[i], -1, NULL)); + g_assert_true (json_parser_load_from_data (parser, pretty_examples[i], -1, NULL)); root = json_parser_get_root (parser); - g_assert (root != NULL); + g_assert_nonnull (root); json_generator_set_root (generator, root); @@ -434,10 +433,6 @@ int main (int argc, char *argv[]) { - gchar *escaped; - gchar *name; - gint i; - g_test_init (&argc, &argv, NULL); g_test_add_func ("/generator/empty-array", test_empty_array); @@ -450,10 +445,10 @@ main (int argc, g_test_add_func ("/generator/double-stays-double", test_double_stays_double); g_test_add_func ("/generator/pretty", test_pretty); - for (i = 0; i < G_N_ELEMENTS (string_fixtures); i++) + for (guint i = 0; i < G_N_ELEMENTS (string_fixtures); i++) { - escaped = g_strescape (string_fixtures[i].str, NULL); - name = g_strdup_printf ("/generator/string/%s", escaped); + char *escaped = g_strescape (string_fixtures[i].str, NULL); + char *name = g_strdup_printf ("/generator/string/%s", escaped); g_test_add_data_func (name, string_fixtures + i, test_string_encode); g_free (escaped); g_free (name); diff --git a/json-glib/tests/gvariant.c b/json-glib/tests/gvariant.c index e88b1b9..805da00 100644 --- a/json-glib/tests/gvariant.c +++ b/json-glib/tests/gvariant.c @@ -176,7 +176,7 @@ test_gvariant_to_json (gconstpointer test_data) NULL); json_data = json_gvariant_serialize_data (variant, &len); - g_assert (json_data != NULL); + g_assert_nonnull (json_data); g_assert_cmpstr (test_case->json_data, ==, json_data); @@ -216,17 +216,13 @@ test_json_to_gvariant (gconstpointer test_data) gint main (gint argc, gchar *argv[]) { - gint i; - TestCase test_case; - gchar *test_name; - g_test_init (&argc, &argv, NULL); /* GVariant to JSON */ - for (i = 0; i < G_N_ELEMENTS (two_way_test_cases); i++) + for (guint i = 0; i < G_N_ELEMENTS (two_way_test_cases); i++) { - test_case = two_way_test_cases[i]; - test_name = g_strdup_printf ("/gvariant/to-json/%s", test_case.test_name); + TestCase test_case = two_way_test_cases[i]; + char *test_name = g_strdup_printf ("/gvariant/to-json/%s", test_case.test_name); g_test_add_data_func (test_name, &two_way_test_cases[i], test_gvariant_to_json); @@ -234,10 +230,10 @@ main (gint argc, gchar *argv[]) } /* JSON to GVariant */ - for (i = 0; i < G_N_ELEMENTS (two_way_test_cases); i++) + for (guint i = 0; i < G_N_ELEMENTS (two_way_test_cases); i++) { - test_case = two_way_test_cases[i]; - test_name = g_strdup_printf ("/gvariant/from-json/%s", test_case.test_name); + TestCase test_case = two_way_test_cases[i]; + char *test_name = g_strdup_printf ("/gvariant/from-json/%s", test_case.test_name); g_test_add_data_func (test_name, &two_way_test_cases[i], test_json_to_gvariant); @@ -245,10 +241,10 @@ main (gint argc, gchar *argv[]) } /* JSON to GVariant one way tests */ - for (i = 0; i < G_N_ELEMENTS (json_to_gvariant_test_cases); i++) + for (guint i = 0; i < G_N_ELEMENTS (json_to_gvariant_test_cases); i++) { - test_case = json_to_gvariant_test_cases[i]; - test_name = g_strdup_printf ("/gvariant/from-json/%s", test_case.test_name); + TestCase test_case = json_to_gvariant_test_cases[i]; + char *test_name = g_strdup_printf ("/gvariant/from-json/%s", test_case.test_name); g_test_add_data_func (test_name, &json_to_gvariant_test_cases[i], test_json_to_gvariant); diff --git a/json-glib/tests/invalid.c b/json-glib/tests/invalid.c index cb5f818..3cab2c2 100644 --- a/json-glib/tests/invalid.c +++ b/json-glib/tests/invalid.c @@ -16,14 +16,14 @@ test_invalid_bareword (gconstpointer user_data) gboolean res; parser = json_parser_new (); - g_assert (JSON_IS_PARSER (parser)); + g_assert_true (JSON_IS_PARSER (parser)); if (g_test_verbose ()) g_print ("invalid data: '%s'...", json); res = json_parser_load_from_data (parser, json, -1, &error); - g_assert (!res); + g_assert_false (res); g_assert_error (error, JSON_PARSER_ERROR, JSON_PARSER_ERROR_INVALID_BAREWORD); if (g_test_verbose ()) @@ -43,15 +43,15 @@ test_invalid_assignment (gconstpointer user_data) gboolean res; parser = json_parser_new (); - g_assert (JSON_IS_PARSER (parser)); + g_assert_true (JSON_IS_PARSER (parser)); if (g_test_verbose ()) g_print ("invalid data: '%s'...", json); res = json_parser_load_from_data (parser, json, -1, &error); - g_assert (!res); - g_assert (error != NULL); + g_assert_false (res); + g_assert_nonnull (error); if (g_test_verbose ()) g_print ("expected error: %s\n", error->message); @@ -70,15 +70,15 @@ test_invalid_value (gconstpointer user_data) gboolean res; parser = json_parser_new (); - g_assert (JSON_IS_PARSER (parser)); + g_assert_true (JSON_IS_PARSER (parser)); if (g_test_verbose ()) g_print ("invalid data: '%s'...", json); res = json_parser_load_from_data (parser, json, -1, &error); - g_assert (!res); - g_assert (error != NULL); + g_assert_false (res); + g_assert_nonnull (error); if (g_test_verbose ()) g_print ("expected error: %s\n", error->message); @@ -97,15 +97,15 @@ test_invalid_array (gconstpointer user_data) gboolean res; parser = json_parser_new (); - g_assert (JSON_IS_PARSER (parser)); + g_assert_true (JSON_IS_PARSER (parser)); if (g_test_verbose ()) g_print ("invalid data: '%s'...", json); res = json_parser_load_from_data (parser, json, -1, &error); - g_assert (!res); - g_assert (error != NULL); + g_assert_false (res); + g_assert_nonnull (error); if (g_test_verbose ()) g_print ("expected error: %s\n", error->message); @@ -124,15 +124,15 @@ test_invalid_object (gconstpointer user_data) gboolean res; parser = json_parser_new (); - g_assert (JSON_IS_PARSER (parser)); + g_assert_true (JSON_IS_PARSER (parser)); if (g_test_verbose ()) g_print ("invalid data: '%s'...", json); res = json_parser_load_from_data (parser, json, -1, &error); - g_assert (!res); - g_assert (error != NULL); + g_assert_false (res); + g_assert_nonnull (error); if (g_test_verbose ()) g_print ("expected error: %s\n", error->message); @@ -151,14 +151,14 @@ test_missing_comma (gconstpointer user_data) gboolean res; parser = json_parser_new (); - g_assert (JSON_IS_PARSER (parser)); + g_assert_true (JSON_IS_PARSER (parser)); if (g_test_verbose ()) g_print ("invalid data: '%s'...", json); res = json_parser_load_from_data (parser, json, -1, &error); - g_assert (!res); + g_assert_false (res); g_assert_error (error, JSON_PARSER_ERROR, JSON_PARSER_ERROR_MISSING_COMMA); if (g_test_verbose ()) @@ -178,14 +178,14 @@ test_trailing_comma (gconstpointer user_data) gboolean res; parser = json_parser_new (); - g_assert (JSON_IS_PARSER (parser)); + g_assert_true (JSON_IS_PARSER (parser)); if (g_test_verbose ()) g_print ("invalid data: '%s'...", json); res = json_parser_load_from_data (parser, json, -1, &error); - g_assert (!res); + g_assert_false (res); g_assert_error (error, JSON_PARSER_ERROR, JSON_PARSER_ERROR_TRAILING_COMMA); if (g_test_verbose ()) @@ -252,11 +252,9 @@ int main (int argc, char *argv[]) { - int i; - g_test_init (&argc, &argv, NULL); - for (i = 0; i < n_test_invalid; i++) + for (guint i = 0; i < n_test_invalid; i++) { char *test_path = g_strconcat ("/invalid/json/", test_invalid[i].path, NULL); diff --git a/json-glib/tests/node.c b/json-glib/tests/node.c index 7d536f1..764ea36 100644 --- a/json-glib/tests/node.c +++ b/json-glib/tests/node.c @@ -28,7 +28,7 @@ test_init_boolean (void) JsonNode *node = json_node_new (JSON_NODE_VALUE); json_node_set_boolean (node, TRUE); - g_assert (json_node_get_boolean (node)); + g_assert_true (json_node_get_boolean (node)); json_node_free (node); } @@ -107,7 +107,7 @@ test_copy_object (void) copy = json_node_copy (node); g_assert_cmpint (json_node_get_node_type (node), ==, json_node_get_node_type (copy)); - g_assert (json_node_get_object (node) == json_node_get_object (copy)); + g_assert_true (json_node_get_object (node) == json_node_get_object (copy)); json_node_free (copy); json_node_free (node); @@ -118,8 +118,8 @@ test_null (void) { JsonNode *node = json_node_new (JSON_NODE_NULL); - g_assert (JSON_NODE_HOLDS_NULL (node)); - g_assert (json_node_is_null (node)); + g_assert_true (JSON_NODE_HOLDS_NULL (node)); + g_assert_true (json_node_is_null (node)); g_assert_cmpint (json_node_get_value_type (node), ==, G_TYPE_INVALID); g_assert_cmpstr (json_node_type_name (node), ==, "NULL"); @@ -134,14 +134,14 @@ test_get_int (void) json_node_set_int (node, 0); g_assert_cmpint (json_node_get_int (node), ==, 0); json_assert_almost_equals (json_node_get_double (node), 0.0); - g_assert (!json_node_get_boolean (node)); - g_assert (!json_node_is_null (node)); + g_assert_false (json_node_get_boolean (node)); + g_assert_false (json_node_is_null (node)); json_node_set_int (node, 42); g_assert_cmpint (json_node_get_int (node), ==, 42); json_assert_almost_equals (json_node_get_double (node), 42.0); - g_assert (json_node_get_boolean (node)); - g_assert (!json_node_is_null (node)); + g_assert_true (json_node_get_boolean (node)); + g_assert_false (json_node_is_null (node)); json_node_free (node); } @@ -154,7 +154,7 @@ test_get_double (void) json_node_set_double (node, 3.14); json_assert_fuzzy_equals (json_node_get_double (node), 3.14, 0.001); g_assert_cmpint (json_node_get_int (node), ==, 3); - g_assert (json_node_get_boolean (node)); + g_assert_true (json_node_get_boolean (node)); json_node_free (node); } diff --git a/json-glib/tests/object.c b/json-glib/tests/object.c index fa2efd2..bc30841 100644 --- a/json-glib/tests/object.c +++ b/json-glib/tests/object.c @@ -11,7 +11,7 @@ test_empty_object (void) JsonObject *object = json_object_new (); g_assert_cmpint (json_object_get_size (object), ==, 0); - g_assert (json_object_get_members (object) == NULL); + g_assert_null (json_object_get_members (object)); json_object_unref (object); } @@ -62,10 +62,10 @@ test_set_member (void) g_assert_cmpint (JSON_NODE_TYPE (json_object_get_member (object, "Array")), ==, JSON_NODE_NULL); json_object_set_object_member (object, "Object", NULL); - g_assert (json_object_get_null_member (object, "Object") == TRUE); + g_assert_true (json_object_get_null_member (object, "Object")); json_object_set_object_member (object, "", NULL); - g_assert (json_object_get_null_member (object, "") == TRUE); + g_assert_true (json_object_get_null_member (object, "")); json_object_unref (object); } @@ -123,7 +123,7 @@ static const struct { }; static void -verify_foreach (JsonObject *object, +verify_foreach (JsonObject *object G_GNUC_UNUSED, const gchar *member_name, JsonNode *member_node, gpointer user_data) @@ -140,9 +140,7 @@ verify_foreach (JsonObject *object, } else { - int i; - - for (i = 0; i < G_N_ELEMENTS (type_verify); i++) + for (guint i = 0; i < G_N_ELEMENTS (type_verify); i++) { if (strcmp (member_name, type_verify[i].member_name) == 0) { @@ -238,19 +236,19 @@ test_empty_member (void) JsonObject *object = json_object_new (); json_object_set_string_member (object, "string", ""); - g_assert (json_object_has_member (object, "string")); + g_assert_true (json_object_has_member (object, "string")); g_assert_cmpstr (json_object_get_string_member (object, "string"), ==, ""); json_object_set_string_member (object, "null", NULL); - g_assert (json_object_has_member (object, "null")); - g_assert (json_object_get_string_member (object, "null") == NULL); + g_assert_true (json_object_has_member (object, "null")); + g_assert_null (json_object_get_string_member (object, "null")); json_object_set_null_member (object, "array"); - g_assert (json_object_get_array_member (object, "array") == NULL); + g_assert_null (json_object_get_array_member (object, "array")); json_object_set_object_member (object, "object", NULL); - g_assert (json_object_get_member (object, "object") != NULL); - g_assert (json_object_get_object_member (object, "object") == NULL); + g_assert_nonnull (json_object_get_member (object, "object")); + g_assert_null (json_object_get_object_member (object, "object")); json_object_unref (object); } diff --git a/json-glib/tests/parser.c b/json-glib/tests/parser.c index ddec577..bd23798 100644 --- a/json-glib/tests/parser.c +++ b/json-glib/tests/parser.c @@ -164,7 +164,7 @@ test_empty_with_parser (JsonParser *parser) if (g_test_verbose ()) g_print ("checking json_parser_get_root...\n"); - g_assert (NULL == json_parser_get_root (parser)); + g_assert_null (json_parser_get_root (parser)); } } @@ -176,12 +176,12 @@ test_empty (void) /* Check with and without immutability enabled, as there have been bugs with * NULL root nodes on immutable parsers. */ parser = json_parser_new (); - g_assert (JSON_IS_PARSER (parser)); + g_assert_true (JSON_IS_PARSER (parser)); test_empty_with_parser (parser); g_object_unref (parser); parser = json_parser_new_immutable (); - g_assert (JSON_IS_PARSER (parser)); + g_assert_true (JSON_IS_PARSER (parser)); test_empty_with_parser (parser); g_object_unref (parser); } @@ -189,16 +189,15 @@ test_empty (void) static void test_base_value (void) { - gint i; JsonParser *parser; parser = json_parser_new (); - g_assert (JSON_IS_PARSER (parser)); + g_assert_true (JSON_IS_PARSER (parser)); if (g_test_verbose ()) g_print ("checking json_parser_load_from_data with base-values...\n"); - for (i = 0; i < n_test_base_values; i++) + for (guint i = 0; i < n_test_base_values; i++) { GError *error = NULL; @@ -215,11 +214,11 @@ test_base_value (void) { JsonNode *root; - g_assert (NULL != json_parser_get_root (parser)); + g_assert_nonnull (json_parser_get_root (parser)); root = json_parser_get_root (parser); - g_assert (root != NULL); - g_assert (json_node_get_parent (root) == NULL); + g_assert_nonnull (root); + g_assert_null (json_node_get_parent (root)); if (g_test_verbose ()) g_print ("checking root node is of the desired type %s...\n", @@ -243,7 +242,7 @@ test_empty_array (void) GError *error = NULL; parser = json_parser_new (); - g_assert (JSON_IS_PARSER (parser)); + g_assert_true (JSON_IS_PARSER (parser)); if (g_test_verbose ()) g_print ("checking json_parser_load_from_data with empty array...\n"); @@ -261,16 +260,16 @@ test_empty_array (void) JsonNode *root; JsonArray *array; - g_assert (NULL != json_parser_get_root (parser)); + g_assert_nonnull (json_parser_get_root (parser)); if (g_test_verbose ()) g_print ("checking root node is an array...\n"); root = json_parser_get_root (parser); g_assert_cmpint (JSON_NODE_TYPE (root), ==, JSON_NODE_ARRAY); - g_assert (json_node_get_parent (root) == NULL); + g_assert_null (json_node_get_parent (root)); array = json_node_get_array (root); - g_assert (array != NULL); + g_assert_nonnull (array); if (g_test_verbose ()) g_print ("checking array is empty...\n"); @@ -283,16 +282,15 @@ test_empty_array (void) static void test_simple_array (void) { - gint i; JsonParser *parser; parser = json_parser_new (); - g_assert (JSON_IS_PARSER (parser)); + g_assert_true (JSON_IS_PARSER (parser)); if (g_test_verbose ()) g_print ("checking json_parser_load_from_data with simple arrays...\n"); - for (i = 0; i < n_test_simple_arrays; i++) + for (guint i = 0; i < n_test_simple_arrays; i++) { GError *error = NULL; @@ -313,16 +311,16 @@ test_simple_array (void) JsonNode *root, *node; JsonArray *array; - g_assert (NULL != json_parser_get_root (parser)); + g_assert_nonnull (json_parser_get_root (parser)); if (g_test_verbose ()) g_print ("checking root node is an array...\n"); root = json_parser_get_root (parser); g_assert_cmpint (JSON_NODE_TYPE (root), ==, JSON_NODE_ARRAY); - g_assert (json_node_get_parent (root) == NULL); + g_assert_null (json_node_get_parent (root)); array = json_node_get_array (root); - g_assert (array != NULL); + g_assert_nonnull (array); if (g_test_verbose ()) g_print ("checking array is of the desired length (%d)...\n", @@ -334,8 +332,8 @@ test_simple_array (void) test_simple_arrays[i].element, g_type_name (test_simple_arrays[i].gtype)); node = json_array_get_element (array, test_simple_arrays[i].element); - g_assert (node != NULL); - g_assert (json_node_get_parent (node) == root); + g_assert_nonnull (node); + g_assert_true (json_node_get_parent (node) == root); g_assert_cmpint (JSON_NODE_TYPE (node), ==, test_simple_arrays[i].type); g_assert_cmpint (json_node_get_value_type (node), ==, test_simple_arrays[i].gtype); } @@ -347,16 +345,15 @@ test_simple_array (void) static void test_nested_array (void) { - gint i; JsonParser *parser; parser = json_parser_new (); - g_assert (JSON_IS_PARSER (parser)); + g_assert_true (JSON_IS_PARSER (parser)); if (g_test_verbose ()) g_print ("checking json_parser_load_from_data with nested arrays...\n"); - for (i = 0; i < n_test_nested_arrays; i++) + for (guint i = 0; i < n_test_nested_arrays; i++) { GError *error = NULL; @@ -374,16 +371,16 @@ test_nested_array (void) JsonNode *root; JsonArray *array; - g_assert (NULL != json_parser_get_root (parser)); + g_assert_nonnull (json_parser_get_root (parser)); if (g_test_verbose ()) g_print ("checking root node is an array...\n"); root = json_parser_get_root (parser); g_assert_cmpint (JSON_NODE_TYPE (root), ==, JSON_NODE_ARRAY); - g_assert (json_node_get_parent (root) == NULL); + g_assert_null (json_node_get_parent (root)); array = json_node_get_array (root); - g_assert (array != NULL); + g_assert_nonnull (array); if (g_test_verbose ()) g_print ("checking array is not empty...\n"); @@ -401,7 +398,7 @@ test_empty_object (void) GError *error = NULL; parser = json_parser_new (); - g_assert (JSON_IS_PARSER (parser)); + g_assert_true (JSON_IS_PARSER (parser)); if (g_test_verbose ()) g_print ("checking json_parser_load_from_data with empty object...\n"); @@ -419,17 +416,17 @@ test_empty_object (void) JsonNode *root; JsonObject *object; - g_assert (NULL != json_parser_get_root (parser)); + g_assert_nonnull (json_parser_get_root (parser)); if (g_test_verbose ()) g_print ("checking root node is an object...\n"); root = json_parser_get_root (parser); - g_assert (json_node_get_parent (root) == NULL); + g_assert_null (json_node_get_parent (root)); g_assert_cmpint (JSON_NODE_TYPE (root), ==, JSON_NODE_OBJECT); - g_assert (json_node_get_parent (root) == NULL); + g_assert_null (json_node_get_parent (root)); object = json_node_get_object (root); - g_assert (object != NULL); + g_assert_nonnull (object); if (g_test_verbose ()) g_print ("checking object is empty...\n"); @@ -442,16 +439,15 @@ test_empty_object (void) static void test_simple_object (void) { - gint i; JsonParser *parser; parser = json_parser_new (); - g_assert (JSON_IS_PARSER (parser)); + g_assert_true (JSON_IS_PARSER (parser)); if (g_test_verbose ()) g_print ("checking json_parser_load_from_data with simple objects...\n"); - for (i = 0; i < n_test_simple_objects; i++) + for (guint i = 0; i < n_test_simple_objects; i++) { GError *error = NULL; @@ -469,16 +465,16 @@ test_simple_object (void) JsonNode *root, *node; JsonObject *object; - g_assert (NULL != json_parser_get_root (parser)); + g_assert_nonnull (json_parser_get_root (parser)); if (g_test_verbose ()) g_print ("checking root node is an object...\n"); root = json_parser_get_root (parser); g_assert_cmpint (JSON_NODE_TYPE (root), ==, JSON_NODE_OBJECT); - g_assert (json_node_get_parent (root) == NULL); + g_assert_null (json_node_get_parent (root)); object = json_node_get_object (root); - g_assert (object != NULL); + g_assert_nonnull (object); if (g_test_verbose ()) g_print ("checking object is of the desired size (%d)...\n", @@ -490,8 +486,8 @@ test_simple_object (void) test_simple_objects[i].member, g_type_name (test_simple_objects[i].gtype)); node = json_object_get_member (object, test_simple_objects[i].member); - g_assert (node != NULL); - g_assert (json_node_get_parent (node) == root); + g_assert_nonnull (node); + g_assert_true (json_node_get_parent (node) == root); g_assert_cmpint (JSON_NODE_TYPE (node), ==, test_simple_objects[i].type); g_assert_cmpint (json_node_get_value_type (node), ==, test_simple_objects[i].gtype); } @@ -503,16 +499,15 @@ test_simple_object (void) static void test_nested_object (void) { - gint i; JsonParser *parser; parser = json_parser_new (); - g_assert (JSON_IS_PARSER (parser)); + g_assert_true (JSON_IS_PARSER (parser)); if (g_test_verbose ()) g_print ("checking json_parser_load_from_data with nested objects...\n"); - for (i = 0; i < n_test_nested_objects; i++) + for (guint i = 0; i < n_test_nested_objects; i++) { GError *error = NULL; @@ -530,16 +525,16 @@ test_nested_object (void) JsonNode *root; JsonObject *object; - g_assert (NULL != json_parser_get_root (parser)); + g_assert_nonnull (json_parser_get_root (parser)); if (g_test_verbose ()) g_print ("checking root node is an object...\n"); root = json_parser_get_root (parser); g_assert_cmpint (JSON_NODE_TYPE (root), ==, JSON_NODE_OBJECT); - g_assert (json_node_get_parent (root) == NULL); + g_assert_null (json_node_get_parent (root)); object = json_node_get_object (root); - g_assert (object != NULL); + g_assert_nonnull (object); if (g_test_verbose ()) g_print ("checking object is not empty...\n"); @@ -553,16 +548,15 @@ test_nested_object (void) static void test_assignment (void) { - gint i; JsonParser *parser; parser = json_parser_new (); - g_assert (JSON_IS_PARSER (parser)); + g_assert_true (JSON_IS_PARSER (parser)); if (g_test_verbose ()) g_print ("checking json_parser_load_from_data with assignments...\n"); - for (i = 0; i < n_test_assignments; i++) + for (guint i = 0; i < n_test_assignments; i++) { GError *error = NULL; @@ -582,10 +576,10 @@ test_assignment (void) if (g_test_verbose ()) g_print ("checking assignment...\n"); - g_assert (json_parser_has_assignment (parser, &var) == TRUE); - g_assert (var != NULL); + g_assert_true (json_parser_has_assignment (parser, &var)); + g_assert_nonnull (var); g_assert_cmpstr (var, ==, test_assignments[i].var); - g_assert (NULL != json_parser_get_root (parser)); + g_assert_nonnull (json_parser_get_root (parser)); } } @@ -595,16 +589,15 @@ test_assignment (void) static void test_unicode_escape (void) { - gint i; JsonParser *parser; parser = json_parser_new (); - g_assert (JSON_IS_PARSER (parser)); + g_assert_true (JSON_IS_PARSER (parser)); if (g_test_verbose ()) g_print ("checking json_parser_load_from_data with unicode escape...\n"); - for (i = 0; i < n_test_unicode; i++) + for (guint i = 0; i < n_test_unicode; i++) { GError *error = NULL; @@ -622,7 +615,7 @@ test_unicode_escape (void) JsonNode *root, *node; JsonObject *object; - g_assert (NULL != json_parser_get_root (parser)); + g_assert_nonnull (json_parser_get_root (parser)); if (g_test_verbose ()) g_print ("checking root node is an object...\n"); @@ -630,7 +623,7 @@ test_unicode_escape (void) g_assert_cmpint (JSON_NODE_TYPE (root), ==, JSON_NODE_OBJECT); object = json_node_get_object (root); - g_assert (object != NULL); + g_assert_true (object); if (g_test_verbose ()) g_print ("checking object is not empty...\n"); @@ -645,7 +638,7 @@ test_unicode_escape (void) if (g_test_verbose ()) g_print ("checking for valid UTF-8...\n"); - g_assert (g_utf8_validate (json_node_get_string (node), -1, NULL)); + g_assert_true (g_utf8_validate (json_node_get_string (node), -1, NULL)); } } @@ -669,19 +662,19 @@ test_stream_sync (void) file = g_file_new_for_path (path); stream = g_file_read (file, NULL, &error); g_assert_no_error (error); - g_assert (stream != NULL); + g_assert_nonnull (stream); json_parser_load_from_stream (parser, G_INPUT_STREAM (stream), NULL, &error); g_assert_no_error (error); root = json_parser_get_root (parser); - g_assert (root != NULL); - g_assert (JSON_NODE_HOLDS_ARRAY (root)); + g_assert_nonnull (root); + g_assert_true (JSON_NODE_HOLDS_ARRAY (root)); array = json_node_get_array (root); g_assert_cmpint (json_array_get_length (array), ==, 1); - g_assert (JSON_NODE_HOLDS_OBJECT (json_array_get_element (array, 0))); - g_assert (json_object_has_member (json_array_get_object_element (array, 0), "hello")); + g_assert_true (JSON_NODE_HOLDS_OBJECT (json_array_get_element (array, 0))); + g_assert_true (json_object_has_member (json_array_get_object_element (array, 0), "hello")); g_object_unref (stream); g_object_unref (file); @@ -697,13 +690,13 @@ assert_stream_load_json_correct (JsonParser *parser) JsonArray *array; root = json_parser_get_root (parser); - g_assert (root != NULL); - g_assert (JSON_NODE_HOLDS_ARRAY (root)); + g_assert_nonnull (root); + g_assert_true (JSON_NODE_HOLDS_ARRAY (root)); array = json_node_get_array (root); g_assert_cmpint (json_array_get_length (array), ==, 1); - g_assert (JSON_NODE_HOLDS_OBJECT (json_array_get_element (array, 0))); - g_assert (json_object_has_member (json_array_get_object_element (array, 0), "hello")); + g_assert_true (JSON_NODE_HOLDS_OBJECT (json_array_get_element (array, 0))); + g_assert_true (json_object_has_member (json_array_get_object_element (array, 0), "hello")); } static void @@ -736,8 +729,8 @@ test_stream_async (void) path = g_test_build_filename (G_TEST_DIST, "stream-load.json", NULL); file = g_file_new_for_path (path); stream = g_file_read (file, NULL, &error); - g_assert (error == NULL); - g_assert (stream != NULL); + g_assert_null (error); + g_assert_nonnull (stream); main_loop = g_main_loop_new (NULL, FALSE); diff --git a/json-glib/tests/path.c b/json-glib/tests/path.c index e6d82c2..864e84a 100644 --- a/json-glib/tests/path.c +++ b/json-glib/tests/path.c @@ -98,72 +98,84 @@ static const struct { "$.store.book[0].title", "[\"Sayings of the Century\"]", TRUE, + 0, }, { "Title of the first book in the store, using array notation.", "$['store']['book'][0]['title']", "[\"Sayings of the Century\"]", TRUE, + 0, }, { "All the authors from the every book.", "$.store.book[*].author", "[\"Nigel Rees\",\"Evelyn Waugh\",\"Herman Melville\",\"J. R. R. Tolkien\"]", TRUE, + 0, }, { "All the authors.", "$..author", "[\"Nigel Rees\",\"Evelyn Waugh\",\"Herman Melville\",\"J. R. R. Tolkien\"]", TRUE, + 0, }, { "Everything inside the store.", "$.store.*", NULL, TRUE, + 0, }, { "All the prices in the store.", "$.store..price", "[\"8.95\",\"12.99\",\"8.99\",\"22.99\",\"19.95\"]", TRUE, + 0, }, { "The third book.", "$..book[2]", "[{\"category\":\"fiction\",\"author\":\"Herman Melville\",\"title\":\"Moby Dick\",\"isbn\":\"0-553-21311-3\",\"price\":\"8.99\"}]", TRUE, + 0, }, { "The last book.", "$..book[-1:]", "[{\"category\":\"fiction\",\"author\":\"J. R. R. Tolkien\",\"title\":\"The Lord of the Rings\",\"isbn\":\"0-395-19395-8\",\"price\":\"22.99\"}]", TRUE, + 0, }, { "The first two books.", "$..book[0,1]", "[{\"category\":\"reference\",\"author\":\"Nigel Rees\",\"title\":\"Sayings of the Century\",\"price\":\"8.95\"},{\"category\":\"fiction\",\"author\":\"Evelyn Waugh\",\"title\":\"Sword of Honour\",\"price\":\"12.99\"}]", TRUE, + 0, }, { "The first two books, using a slice.", "$..book[:2]", "[{\"category\":\"reference\",\"author\":\"Nigel Rees\",\"title\":\"Sayings of the Century\",\"price\":\"8.95\"},{\"category\":\"fiction\",\"author\":\"Evelyn Waugh\",\"title\":\"Sword of Honour\",\"price\":\"12.99\"}]", TRUE, + 0, }, { "All the books.", "$['store']['book'][*]", "[{\"category\":\"reference\",\"author\":\"Nigel Rees\",\"title\":\"Sayings of the Century\",\"price\":\"8.95\"},{\"category\":\"fiction\",\"author\":\"Evelyn Waugh\",\"title\":\"Sword of Honour\",\"price\":\"12.99\"},{\"category\":\"fiction\",\"author\":\"Herman Melville\",\"title\":\"Moby Dick\",\"isbn\":\"0-553-21311-3\",\"price\":\"8.99\"},{\"category\":\"fiction\",\"author\":\"J. R. R. Tolkien\",\"title\":\"The Lord of the Rings\",\"isbn\":\"0-395-19395-8\",\"price\":\"22.99\"}]", TRUE, + 0, }, { "All the members of the bicycle object.", "$.store.bicycle.*", "[\"red\",\"19.95\"]", TRUE, + 0, }, { "The root node.", @@ -174,7 +186,8 @@ static const struct { "{\"category\":\"fiction\",\"author\":\"J. R. R. Tolkien\",\"title\":\"The Lord of the Rings\",\"isbn\":\"0-395-19395-8\",\"price\":\"22.99\"}]," "\"bicycle\":{\"color\":\"red\",\"price\":\"19.95\"}}}]", TRUE, - } + 0, + }, }; static void @@ -190,7 +203,7 @@ path_expressions_valid (gconstpointer data) if (g_test_verbose ()) g_print ("* %s ('%s')\n", desc, expr); - g_assert (json_path_compile (path, expr, &error)); + g_assert_true (json_path_compile (path, expr, &error)); g_assert_no_error (error); g_object_unref (path); @@ -211,8 +224,8 @@ path_expressions_invalid (gconstpointer data) g_print ("* %s ('%s')\n", desc, expr); - g_assert (!json_path_compile (path, expr, &error)); - g_assert_error (error, JSON_PATH_ERROR, code); + g_assert_false (json_path_compile (path, expr, &error)); + g_assert_error (error, JSON_PATH_ERROR, (int) code); g_object_unref (path); g_clear_error (&error); @@ -236,10 +249,10 @@ path_match (gconstpointer data) json_parser_load_from_data (parser, test_json, -1, NULL); root = json_parser_get_root (parser); - g_assert (json_path_compile (path, expr, NULL)); + g_assert_true (json_path_compile (path, expr, NULL)); matches = json_path_match (path, root); - g_assert (JSON_NODE_HOLDS_ARRAY (matches)); + g_assert_true (JSON_NODE_HOLDS_ARRAY (matches)); json_generator_set_root (gen, matches); str = json_generator_to_data (gen, NULL); @@ -268,7 +281,7 @@ int main (int argc, char *argv[]) { - int i, j; + guint i, j; g_test_init (&argc, &argv, NULL); g_test_bug_base ("http://bugzilla.gnome.org/show_bug.cgi?id="); diff --git a/json-glib/tests/reader.c b/json-glib/tests/reader.c index 67a81c3..2ad2ec6 100644 --- a/json-glib/tests/reader.c +++ b/json-glib/tests/reader.c @@ -9,6 +9,9 @@ static const gchar *test_base_object_data = static const gchar *test_reader_level_data = " { \"list\": { \"181195771\": { \"given_url\": \"http://www.gnome.org/json-glib-test\" } } }"; +static const gchar *test_reader_current_node_data = +" { \"object\": { \"subobject\": { \"key\": \"value\" } } }"; + /* https://bugzilla.gnome.org/show_bug.cgi?id=758580 */ static const char *test_reader_null_value_data = "{ \"v\": null }"; @@ -30,15 +33,15 @@ test_base_object (void) gsize n_members, i; json_parser_load_from_data (parser, test_base_object_data, -1, &error); - g_assert (error == NULL); + g_assert_no_error (error); json_reader_set_root (reader, json_parser_get_root (parser)); - g_assert (json_reader_is_object (reader)); + g_assert_true (json_reader_is_object (reader)); g_assert_cmpint (json_reader_count_members (reader), ==, 4); members = json_reader_list_members (reader); - g_assert (members != NULL); + g_assert_nonnull (members); n_members = g_strv_length (members); g_assert_cmpint (n_members, ==, json_reader_count_members (reader)); @@ -48,29 +51,29 @@ test_base_object (void) g_strfreev (members); - g_assert (json_reader_read_member (reader, "text")); - g_assert (json_reader_is_value (reader)); + g_assert_true (json_reader_read_member (reader, "text")); + g_assert_true (json_reader_is_value (reader)); g_assert_cmpstr (json_reader_get_string_value (reader), ==, "hello, world!"); json_reader_end_member (reader); - g_assert (json_reader_read_member (reader, "foo")); - g_assert (json_reader_get_null_value (reader)); + g_assert_true (json_reader_read_member (reader, "foo")); + g_assert_true (json_reader_get_null_value (reader)); json_reader_end_member (reader); - g_assert (!json_reader_read_member (reader, "bar")); - g_assert (json_reader_get_error (reader) != NULL); + g_assert_false (json_reader_read_member (reader, "bar")); + g_assert_nonnull (json_reader_get_error (reader)); g_assert_error ((GError *) json_reader_get_error (reader), JSON_READER_ERROR, JSON_READER_ERROR_INVALID_MEMBER); json_reader_end_member (reader); - g_assert (json_reader_get_error (reader) == NULL); + g_assert_no_error (json_reader_get_error (reader)); - g_assert (json_reader_read_element (reader, 2)); + g_assert_true (json_reader_read_element (reader, 2)); g_assert_cmpstr (json_reader_get_member_name (reader), ==, "blah"); - g_assert (json_reader_is_value (reader)); + g_assert_true (json_reader_is_value (reader)); g_assert_cmpint (json_reader_get_int_value (reader), ==, 47); json_reader_end_element (reader); - g_assert (json_reader_get_error (reader) == NULL); + g_assert_no_error (json_reader_get_error (reader)); json_reader_read_member (reader, "double"); json_assert_fuzzy_equals (json_reader_get_double_value (reader), 42.47, 0.01); @@ -88,49 +91,50 @@ test_base_array (void) GError *error = NULL; json_parser_load_from_data (parser, test_base_array_data, -1, &error); - g_assert (error == NULL); + g_assert_no_error (error); json_reader_set_root (reader, json_parser_get_root (parser)); - g_assert (json_reader_is_array (reader)); + g_assert_true (json_reader_is_array (reader)); g_assert_cmpint (json_reader_count_elements (reader), ==, 7); json_reader_read_element (reader, 0); - g_assert (json_reader_is_value (reader)); + g_assert_true (json_reader_is_value (reader)); g_assert_cmpint (json_reader_get_int_value (reader), ==, 0); json_reader_end_element (reader); json_reader_read_element (reader, 1); - g_assert (json_reader_is_value (reader)); - g_assert (json_reader_get_boolean_value (reader)); + g_assert_true (json_reader_is_value (reader)); + g_assert_true (json_reader_get_boolean_value (reader)); json_reader_end_element (reader); json_reader_read_element (reader, 3); - g_assert (json_reader_is_value (reader)); + g_assert_true (json_reader_is_value (reader)); g_assert_cmpstr (json_reader_get_string_value (reader), ==, "foo"); json_reader_end_element (reader); json_reader_read_element (reader, 5); - g_assert (!json_reader_is_value (reader)); - g_assert (json_reader_is_array (reader)); + g_assert_false (json_reader_is_value (reader)); + g_assert_true (json_reader_is_array (reader)); json_reader_end_element (reader); json_reader_read_element (reader, 6); - g_assert (json_reader_is_object (reader)); + g_assert_true (json_reader_is_object (reader)); json_reader_read_member (reader, "bar"); - g_assert (json_reader_is_value (reader)); + g_assert_true (json_reader_is_value (reader)); g_assert_cmpint (json_reader_get_int_value (reader), ==, 42); json_reader_end_member (reader); json_reader_end_element (reader); - g_assert (!json_reader_read_element (reader, 7)); + g_assert_false (json_reader_read_element (reader, 7)); + g_assert_nonnull (json_reader_get_error (reader)); g_assert_error ((GError *) json_reader_get_error (reader), JSON_READER_ERROR, JSON_READER_ERROR_INVALID_INDEX); json_reader_end_element (reader); - g_assert (json_reader_get_error (reader) == NULL); + g_assert_no_error (json_reader_get_error (reader)); g_object_unref (reader); g_object_unref (parser); @@ -146,31 +150,31 @@ test_reader_level (void) char **members; json_parser_load_from_data (parser, test_reader_level_data, -1, &error); - g_assert (error == NULL); + g_assert_no_error (error); json_reader_set_root (reader, json_parser_get_root (parser)); - g_assert (json_reader_count_members (reader) > 0); + g_assert_cmpint (json_reader_count_members (reader), >, 0); /* Grab the list */ - g_assert (json_reader_read_member (reader, "list")); + g_assert_true (json_reader_read_member (reader, "list")); g_assert_cmpstr (json_reader_get_member_name (reader), ==, "list"); members = json_reader_list_members (reader); - g_assert (members != NULL); + g_assert_nonnull (members); g_strfreev (members); - g_assert (json_reader_read_member (reader, "181195771")); + g_assert_true (json_reader_read_member (reader, "181195771")); g_assert_cmpstr (json_reader_get_member_name (reader), ==, "181195771"); - g_assert (!json_reader_read_member (reader, "resolved_url")); + g_assert_false (json_reader_read_member (reader, "resolved_url")); g_assert_cmpstr (json_reader_get_member_name (reader), ==, NULL); - g_assert (json_reader_get_error (reader) != NULL); + g_assert_nonnull (json_reader_get_error (reader)); json_reader_end_member (reader); g_assert_cmpstr (json_reader_get_member_name (reader), ==, "181195771"); - g_assert (json_reader_read_member (reader, "given_url")); + g_assert_true (json_reader_read_member (reader, "given_url")); g_assert_cmpstr (json_reader_get_member_name (reader), ==, "given_url"); g_assert_cmpstr (json_reader_get_string_value (reader), ==, "http://www.gnome.org/json-glib-test"); json_reader_end_member (reader); @@ -238,6 +242,41 @@ test_reader_skip_bom (void) g_object_unref (parser); } +static void +test_reader_current_node (void) +{ + JsonParser *parser = json_parser_new (); + JsonReader *reader = json_reader_new (NULL); + JsonNode *current = NULL; + gchar* node_string = NULL; + const gchar* expected_data = "{\"subobject\":{\"key\":\"value\"}}"; + GError *error = NULL; + + g_assert_null (json_reader_get_current_node (reader)); + + json_parser_load_from_data (parser, test_reader_current_node_data, -1, &error); + g_assert_no_error (error); + + json_reader_set_root (reader, json_parser_get_root (parser)); + + /* Grab the list */ + g_assert_true (json_reader_read_member (reader, "object")); + + /* Get the node at the current position */ + current = json_reader_get_current_node (reader); + g_assert_nonnull (current); + + /* Check that it contains the data waited */ + node_string = json_to_string (current, FALSE); + g_assert_cmpstr (node_string, ==, expected_data); + g_free (node_string); + + json_reader_end_member (reader); + + g_clear_object (&reader); + g_clear_object (&parser); +} + int main (int argc, char *argv[]) @@ -250,6 +289,7 @@ main (int argc, 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); + g_test_add_func ("/reader/currrent-node", test_reader_current_node); return g_test_run (); } diff --git a/json-glib/tests/serialize-complex.c b/json-glib/tests/serialize-complex.c index 226e722..b43c143 100644 --- a/json-glib/tests/serialize-complex.c +++ b/json-glib/tests/serialize-complex.c @@ -278,19 +278,19 @@ test_serialize (void) parser = json_parser_new (); json_parser_load_from_data (parser, data, -1, &error); - g_assert (error == NULL); + g_assert_null (error); node = json_parser_get_root (parser); - g_assert (json_node_get_node_type (node) == JSON_NODE_OBJECT); + g_assert_true (json_node_get_node_type (node) == JSON_NODE_OBJECT); object = json_node_get_object (node); g_assert_cmpint (json_object_get_int_member (object, "foo"), ==, 47); - g_assert (!json_object_get_boolean_member (object, "bar")); + g_assert_false (json_object_get_boolean_member (object, "bar")); g_assert_cmpstr (json_object_get_string_member (object, "baz"), ==, "Hello, World!"); g_assert_cmpfloat (json_object_get_double_member (object, "meh"), ==, 0.5); /* blah is read-only */ - g_assert (json_object_has_member (object, "blah")); + g_assert_true (json_object_has_member (object, "blah")); g_free (data); g_object_unref (parser); diff --git a/json-glib/tests/serialize-full.c b/json-glib/tests/serialize-full.c index dd5da7a..9e8d512 100644 --- a/json-glib/tests/serialize-full.c +++ b/json-glib/tests/serialize-full.c @@ -158,7 +158,7 @@ G_DEFINE_TYPE_WITH_CODE (TestObject, test_object, G_TYPE_OBJECT, json_serializable_iface_init)); static JsonNode * -test_object_serialize_property (JsonSerializable *serializable, +test_object_serialize_property (JsonSerializable *serializable G_GNUC_UNUSED, const gchar *name, const GValue *value, GParamSpec *pspec) @@ -421,20 +421,20 @@ test_deserialize (void) TEST_OBJECT (object)->m_enum == TEST_ENUM_BAZ ? "<true>" : "<false>"); g_assert_cmpint (TEST_OBJECT (object)->m_int, ==, 42); - g_assert (TEST_OBJECT (object)->m_bool); + g_assert_true (TEST_OBJECT (object)->m_bool); g_assert_cmpstr (TEST_OBJECT (object)->m_str, ==, "hello"); g_assert_cmpint (TEST_OBJECT (object)->m_enum, ==, TEST_ENUM_BAZ); - g_assert (TEST_OBJECT (object)->m_strv != NULL); + g_assert_nonnull (TEST_OBJECT (object)->m_strv); g_assert_cmpint (g_strv_length (TEST_OBJECT (object)->m_strv), ==, 4); str = g_strjoinv (NULL, TEST_OBJECT (object)->m_strv); g_assert_cmpstr (str, ==, "hello, world!"); g_free (str); - g_assert (TEST_IS_OBJECT (TEST_OBJECT (object)->m_obj)); + g_assert_true (TEST_IS_OBJECT (TEST_OBJECT (object)->m_obj)); test = TEST_OBJECT (TEST_OBJECT (object)->m_obj); - g_assert (test->m_bool); + g_assert_true (test->m_bool); g_assert_cmpstr (test->m_str, ==, "world"); g_assert_cmpint (test->m_enum, ==, TEST_ENUM_FOO); g_assert_cmpint (test->m_flags, ==, TEST_FLAGS_FOO | TEST_FLAGS_BAR); diff --git a/json-glib/tests/serialize-simple.c b/json-glib/tests/serialize-simple.c index e2e7be2..6d456af 100644 --- a/json-glib/tests/serialize-simple.c +++ b/json-glib/tests/serialize-simple.c @@ -142,7 +142,7 @@ test_serialize (void) data = json_gobject_to_data (G_OBJECT (obj), &len); - g_assert (data != NULL); + g_assert_nonnull (data); g_assert_cmpint (len, >, 0); g_assert_cmpint (len, ==, strlen (data)); diff --git a/meson.build b/meson.build index f6b72d4..8f7c34f 100644 --- a/meson.build +++ b/meson.build @@ -1,11 +1,13 @@ -project('json-glib', 'c', version: '1.6.7', - license: 'LGPLv2.1+', - default_options: [ - 'warning_level=1', - 'buildtype=debugoptimized', - 'c_std=c99', - ], - meson_version: '>= 0.55.3') +project('json-glib', 'c', + version: '1.7.1', + license: 'LGPL-2.1-or-later', + default_options: [ + 'warning_level=2', + 'buildtype=debugoptimized', + 'c_std=gnu99', + ], + meson_version: '>= 0.62.0', +) # Versioning json_version = meson.project_version() @@ -25,6 +25,7 @@ hu id it ja +ka ko ky lt @@ -1,279 +1,270 @@ -# Abkhazian translation for json-glib.
-# Copyright (C) 2022 json-glib's COPYRIGHT HOLDER
-# This file is distributed under the same license as the json-glib package.
-# Нанба Наала <naala-nanba@rambler.ru>, 2022.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: json-glib master\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/json-glib/issues\n"
-"POT-Creation-Date: 2021-11-17 00:41+0000\n"
-"PO-Revision-Date: 2021-11-17 00:41+0000\n"
-"Last-Translator: Нанба Наала <naala-nanba@rambler.ru>\n"
-"Language-Team: Abkhazian <ab@li.org>\n"
-"Language: ab\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\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: истандарту аҭыҵырҭа ахь аҭагалара залымшеит"
-
-#. 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:924
-#, c-format
-msgid "Expecting a JSON object, but the root node is of type “%s”"
-msgstr "Аобиект JSON азыԥшра, амала аҳаргтә еиқәҳәаларҭа иамоуп хкыс “%s”"
-
-#. translators: the '%s' is the type name
-#: json-glib/json-gvariant.c:482
-#, c-format
-msgid "Unexpected type “%s” in JSON node"
-msgstr "Шәызқәымгәыӷуа ахкы “%s” аиқәҳәаларҭа JSON аҟны"
-
-#: json-glib/json-gvariant.c:552
-msgid "Missing elements in JSON array to conform to a tuple"
-msgstr "Иҟаӡам ахәҭақәа аижәлантәдырра JSON аҟны акортеж ашьашәаларазы"
-
-#: json-glib/json-gvariant.c:580
-msgid "Missing closing symbol “)” in the GVariant tuple type"
-msgstr "Иҟаӡам иазыркуа асимвол “)” акортеж ахкы GVariant аҟны"
-
-#: json-glib/json-gvariant.c:588
-msgid "Unexpected extra elements in JSON array"
-msgstr "Шәызқәымгәыӷуа изыцҵоу асимволқәа аижәлантәдырра JSON аҟны"
-
-#: json-glib/json-gvariant.c:889
-msgid "Invalid string value converting to GVariant"
-msgstr "Ииашам ацәаҳәатә ҵакы GVariant ахь аиҭакразы"
-
-#: json-glib/json-gvariant.c:944
-msgid ""
-"A GVariant dictionary entry expects a JSON object with exactly one member"
-msgstr ""
-"Ажәар GVariant ахәҭа алахәылазаҵә змоу JSON обиектҵас иҟазароуп"
-
-#: json-glib/json-gvariant.c:1222
-#, c-format
-msgid "GVariant class “%c” not supported"
-msgstr "Акласс GVariant “%c” аднакылаӡом"
-
-#: json-glib/json-gvariant.c:1276
-msgid "Invalid GVariant signature"
-msgstr "Иақәнагам анапынҵамҭа GVariant"
-
-#: json-glib/json-gvariant.c:1327
-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:939
-#, c-format
-msgid "%s:%d:%d: Parse error: %s"
-msgstr "%s:%d:%d: Аилыргара агха: %s"
-
-#: json-glib/json-parser.c:1023
-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:504
-#, 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:516
-#, 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:533
-#, 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:616 json-glib/json-reader.c:789
-#: json-glib/json-reader.c:838 json-glib/json-reader.c:877
-#: json-glib/json-reader.c:917 json-glib/json-reader.c:957
-#: json-glib/json-reader.c:997 json-glib/json-reader.c:1044
-#: json-glib/json-reader.c:1082 json-glib/json-reader.c:1110
-msgid "No node available at the current position"
-msgstr "Шәахьыҟоу аҭыԥ аҟны иҟаӡам аиқәҳәаларҭа"
-
-#: json-glib/json-reader.c:623
-#, c-format
-msgid "The current position holds a “%s” and not an array"
-msgstr "Шәахьыҟоу аҭыԥ иалоу “%s” ауп, аижәлантәдырра акәымкәа"
-
-#: json-glib/json-reader.c:705
-#, c-format
-msgid "The current node is of type “%s”, but an object was expected."
-msgstr "Шәахьыҟоу аҭыԥ иамоуп ахкы “%s”, амала иазԥшуп аобиект."
-
-#: json-glib/json-reader.c:712
-#, c-format
-msgid "The member “%s” is not defined in the object at the current position."
-msgstr "Шәахьыҟоу аҭыԥ аҟны ахәҭа “%s” аобиект аҟны иарбаӡам."
-
-#: json-glib/json-reader.c:796 json-glib/json-reader.c:845
-#, c-format
-msgid "The current position holds a “%s” and not an object"
-msgstr " Шәахьыҟоу аҭыԥ аҟны иалоу “%s” ауп , аобиект акәымкәа"
-
-#: json-glib/json-reader.c:886 json-glib/json-reader.c:926
-#: json-glib/json-reader.c:966 json-glib/json-reader.c:1006
-#: json-glib/json-reader.c:1053
-#, c-format
-msgid "The current position holds a “%s” and not a value"
-msgstr "Шәахьыҟоу аҭыԥ аҟны иалоу “%s” ауп, аҵакы акәымкәа"
-
-#: json-glib/json-reader.c:1014
-msgid "The current position does not hold a string type"
-msgstr "Шәахьыҟоу аҭыԥ аҟны иалаӡам ацәаҳәатә ҵакы"
+msgid "" +msgstr "" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/json-glib/issues\n" +"POT-Creation-Date: 2022-07-14 11:02+0000\n" +"Last-Translator: Нанба Наала <naala-nanba@rambler.ru>\n" +"Language-Team: Abkhazian <ab@li.org>\n" +"Language: ab\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" + +#: 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: истандарту аҭыҵырҭа ахь аҭагалара залымшеит" + +#. 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:924 +#, c-format +msgid "Expecting a JSON object, but the root node is of type “%s”" +msgstr "Аобиект JSON азыԥшра, амала аҳаргтә еиқәҳәаларҭа иамоуп хкыс “%s”" + +#. translators: the '%s' is the type name +#: json-glib/json-gvariant.c:482 +#, c-format +msgid "Unexpected type “%s” in JSON node" +msgstr "Шәызқәымгәыӷуа ахкы “%s” аиқәҳәаларҭа JSON аҟны" + +#: json-glib/json-gvariant.c:552 +msgid "Missing elements in JSON array to conform to a tuple" +msgstr "Иҟаӡам ахәҭақәа аижәлантәдырра JSON аҟны акортеж ашьашәаларазы" + +#: json-glib/json-gvariant.c:580 +msgid "Missing closing symbol “)” in the GVariant tuple type" +msgstr "Иҟаӡам иазыркуа асимвол “)” акортеж ахкы GVariant аҟны" + +#: json-glib/json-gvariant.c:588 +msgid "Unexpected extra elements in JSON array" +msgstr "Шәызқәымгәыӷуа изыцҵоу асимволқәа аижәлантәдырра JSON аҟны" + +#: json-glib/json-gvariant.c:889 +msgid "Invalid string value converting to GVariant" +msgstr "Ииашам ацәаҳәатә ҵакы GVariant ахь аиҭакразы" + +#: json-glib/json-gvariant.c:944 +msgid "" +"A GVariant dictionary entry expects a JSON object with exactly one member" +msgstr "Ажәар GVariant ахәҭа алахәылазаҵә змоу JSON обиектҵас иҟазароуп" + +#: json-glib/json-gvariant.c:1222 +#, c-format +msgid "GVariant class “%c” not supported" +msgstr "Акласс GVariant “%c” аднакылаӡом" + +#: json-glib/json-gvariant.c:1276 +msgid "Invalid GVariant signature" +msgstr "Иақәнагам анапынҵамҭа GVariant" + +#: json-glib/json-gvariant.c:1327 +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:939 +#, c-format +msgid "%s:%d:%d: Parse error: %s" +msgstr "%s:%d:%d: Аилыргара агха: %s" + +#: json-glib/json-parser.c:1023 +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:504 +#, 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:516 +#, 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:533 +#, 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:616 json-glib/json-reader.c:789 +#: json-glib/json-reader.c:838 json-glib/json-reader.c:877 +#: json-glib/json-reader.c:917 json-glib/json-reader.c:957 +#: json-glib/json-reader.c:997 json-glib/json-reader.c:1044 +#: json-glib/json-reader.c:1082 json-glib/json-reader.c:1110 +msgid "No node available at the current position" +msgstr "Шәахьыҟоу аҭыԥ аҟны иҟаӡам аиқәҳәаларҭа" + +#: json-glib/json-reader.c:623 +#, c-format +msgid "The current position holds a “%s” and not an array" +msgstr "Шәахьыҟоу аҭыԥ иалоу “%s” ауп, аижәлантәдырра акәымкәа" + +#: json-glib/json-reader.c:705 +#, c-format +msgid "The current node is of type “%s”, but an object was expected." +msgstr "Шәахьыҟоу аҭыԥ иамоуп ахкы “%s”, амала иазԥшуп аобиект." + +#: json-glib/json-reader.c:712 +#, c-format +msgid "The member “%s” is not defined in the object at the current position." +msgstr "Шәахьыҟоу аҭыԥ аҟны ахәҭа “%s” аобиект аҟны иарбаӡам." + +#: json-glib/json-reader.c:796 json-glib/json-reader.c:845 +#, c-format +msgid "The current position holds a “%s” and not an object" +msgstr " Шәахьыҟоу аҭыԥ аҟны иалоу “%s” ауп , аобиект акәымкәа" + +#: json-glib/json-reader.c:886 json-glib/json-reader.c:926 +#: json-glib/json-reader.c:966 json-glib/json-reader.c:1006 +#: json-glib/json-reader.c:1053 +#, c-format +msgid "The current position holds a “%s” and not a value" +msgstr "Шәахьыҟоу аҭыԥ аҟны иалоу “%s” ауп, аҵакы акәымкәа" + +#: json-glib/json-reader.c:1014 +msgid "The current position does not hold a string type" +msgstr "Шәахьыҟоу аҭыԥ аҟны иалаӡам ацәаҳәатә ҵакы" @@ -2,36 +2,53 @@ # Copyright (C) 2014 THE json-glib'S COPYRIGHT HOLDER # This file is distributed under the same license as the json-glib package. # יוסף אור בוצ׳קו <yoseforb@gnome.org>, 2014. -# Yosef Or Boczko <yoseforb@gmail.com>, 2014. +# Yosef Or Boczko <yoseforb@gmail.com>, 2014-2022. # msgid "" msgstr "" "Project-Id-Version: json-glib 0.17.1\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" -"glib\n" -"POT-Creation-Date: 2014-01-26 05:31+0200\n" -"PO-Revision-Date: 2014-01-26 05:32+0200\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: 2022-07-14 13:58+0300\n" "Last-Translator: Yosef Or Boczko <yoseforb@gmail.com>\n" -"Language-Team: עברית <>\n" +"Language-Team: Hebrew <yoseforb@gmail.com>\n" "Language: he\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 40.0\n" -#: ../json-glib/json-glib-format.c:41 +#: json-glib/json-glib-format.c:58 msgid "Prettify output" msgstr "Prettify output" -#: ../json-glib/json-glib-format.c:42 +#: json-glib/json-glib-format.c:59 msgid "Indentation spaces" msgstr "Indentation spaces" +#: json-glib/json-glib-format.c:59 +msgid "SPACES" +msgstr "SPACES" + +#: json-glib/json-glib-format.c:60 +msgid "Output file" +msgstr "Output file" + +#: json-glib/json-glib-format.c:60 json-glib/json-glib-validate.c:115 +msgid "FILE" +msgstr "FILE" + +#: json-glib/json-glib-format.c:61 +#| msgid "FILE" +msgid "FILE…" +msgstr "FILE…" + #. 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:68 ../json-glib/json-glib-validate.c:61 +#: 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: error opening file: %s\n" @@ -39,7 +56,7 @@ msgstr "%s: %s: error opening file: %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:80 ../json-glib/json-glib-validate.c:73 +#: 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: error parsing file: %s\n" @@ -47,7 +64,7 @@ msgstr "%s: %s: error parsing file: %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:99 +#: json-glib/json-glib-format.c:138 #, c-format msgid "%s: %s: error writing to stdout" msgstr "%s: %s: error writing to stdout" @@ -55,22 +72,18 @@ msgstr "%s: %s: error writing to 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:119 ../json-glib/json-glib-validate.c:85 +#: 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: error closing: %s\n" -#: ../json-glib/json-glib-format.c:148 ../json-glib/json-glib-validate.c:113 -msgid "FILE" -msgstr "FILE" - #. Translators: this message will appear after the usage string #. and before the list of options. -#: ../json-glib/json-glib-format.c:151 +#: json-glib/json-glib-format.c:192 msgid "Format JSON files." msgstr "Format JSON files." -#: ../json-glib/json-glib-format.c:152 +#: json-glib/json-glib-format.c:193 msgid "json-glib-format formats JSON resources." msgstr "json-glib-format formats JSON resources." @@ -78,186 +91,218 @@ msgstr "json-glib-format formats JSON resources." #. * means the user is calling json-glib-validate without any #. * argument. #. -#: ../json-glib/json-glib-format.c:169 ../json-glib/json-glib-validate.c:134 +#: json-glib/json-glib-format.c:208 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" msgstr "Error parsing commandline options: %s\n" -#: ../json-glib/json-glib-format.c:171 ../json-glib/json-glib-format.c:185 -#: ../json-glib/json-glib-validate.c:136 ../json-glib/json-glib-validate.c:150 +#: 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 "Try \"%s --help\" for more information." +#| msgid "Try \"%s --help\" for more information." +msgid "Try “%s --help” for more information." +msgstr "Try “%s --help” for more information." #. 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:183 ../json-glib/json-glib-validate.c:148 +#: json-glib/json-glib-format.c:222 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "%s: missing files" #. Translators: this message will appear after the usage string #. and before the list of options. -#: ../json-glib/json-glib-validate.c:116 +#: json-glib/json-glib-validate.c:118 msgid "Validate JSON files." msgstr "Validate JSON files." -#: ../json-glib/json-glib-validate.c:117 +#: json-glib/json-glib-validate.c:119 msgid "json-glib-validate validates JSON data at the given URI." msgstr "json-glib-validate validates JSON data at the given URI." -#: ../json-glib/json-gobject.c:917 +#. 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 "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'" +msgid "Expecting a JSON object, but the root node is of type “%s”" +msgstr "Expecting a JSON object, but the root node is of type “%s”" -#: ../json-glib/json-gvariant.c:545 +#. translators: the '%s' is the type name +#: json-glib/json-gvariant.c:524 #, c-format -msgid "Unexpected type '%s' in JSON node" -msgstr "Unexpected type '%s' in JSON node" +#| msgid "Unexpected type '%s' in JSON node" +msgid "Unexpected type “%s” in JSON node" +msgstr "Unexpected type “%s” in JSON node" -#: ../json-glib/json-gvariant.c:615 +#: json-glib/json-gvariant.c:594 msgid "Missing elements in JSON array to conform to a tuple" msgstr "Missing elements in JSON array to conform to a tuple" -#: ../json-glib/json-gvariant.c:643 -msgid "Missing closing symbol ')' in the GVariant tuple type" -msgstr "Missing closing symbol ')' in the GVariant tuple type" +#: 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 "Missing closing symbol “)” in the GVariant tuple type" -#: ../json-glib/json-gvariant.c:651 +#: json-glib/json-gvariant.c:630 msgid "Unexpected extra elements in JSON array" msgstr "Unexpected extra elements in JSON array" -#: ../json-glib/json-gvariant.c:930 +#: json-glib/json-gvariant.c:931 msgid "Invalid string value converting to GVariant" msgstr "Invalid string value converting to GVariant" -#: ../json-glib/json-gvariant.c:986 +#: json-glib/json-gvariant.c:986 msgid "" "A GVariant dictionary entry expects a JSON object with exactly one member" msgstr "" "A GVariant dictionary entry expects a JSON object with exactly one member" -#: ../json-glib/json-gvariant.c:1266 +#: json-glib/json-gvariant.c:1264 #, c-format -msgid "GVariant class '%c' not supported" -msgstr "GVariant class '%c' not supported" +#| msgid "GVariant class '%c' not supported" +msgid "GVariant class “%c” not supported" +msgstr "GVariant class “%c” not supported" -#: ../json-glib/json-gvariant.c:1314 +#: json-glib/json-gvariant.c:1312 msgid "Invalid GVariant signature" msgstr "Invalid GVariant signature" -#: ../json-glib/json-gvariant.c:1362 +#: json-glib/json-gvariant.c:1360 msgid "JSON data is empty" msgstr "JSON data is empty" -#: ../json-glib/json-parser.c:817 +#. 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: Parse error: %s" -#: ../json-glib/json-parser.c:885 +#: json-glib/json-parser.c:992 msgid "JSON data must be UTF-8 encoded" msgstr "JSON data must be UTF-8 encoded" -#: ../json-glib/json-path.c:438 +#: json-glib/json-path.c:389 msgid "Only one root node is allowed in a JSONPath expression" msgstr "Only one root node is allowed in a JSONPath expression" -#: ../json-glib/json-path.c:447 +#. translators: the %c is the invalid character +#: json-glib/json-path.c:398 #, c-format -msgid "Root node followed by invalid character '%c'" -msgstr "Root node followed by invalid character '%c'" +#| msgid "Root node followed by invalid character '%c'" +msgid "Root node followed by invalid character “%c”" +msgstr "Root node followed by invalid character “%c”" -#: ../json-glib/json-path.c:487 +#: json-glib/json-path.c:438 msgid "Missing member name or wildcard after . character" msgstr "Missing member name or wildcard after . character" -#: ../json-glib/json-path.c:561 +#: json-glib/json-path.c:512 #, c-format -msgid "Malformed slice expression '%*s'" -msgstr "Malformed slice expression '%*s'" +#| msgid "Malformed slice expression '%*s'" +msgid "Malformed slice expression “%*s”" +msgstr "Malformed slice expression “%*s”" -#: ../json-glib/json-path.c:605 +#: json-glib/json-path.c:556 #, c-format -msgid "Invalid set definition '%*s'" -msgstr "Invalid set definition '%*s'" +#| msgid "Invalid set definition '%*s'" +msgid "Invalid set definition “%*s”" +msgstr "Invalid set definition “%*s”" -#: ../json-glib/json-path.c:658 +#: json-glib/json-path.c:609 #, c-format -msgid "Invalid slice definition '%*s'" -msgstr "Invalid slice definition '%*s'" +#| msgid "Invalid slice definition '%*s'" +msgid "Invalid slice definition “%*s”" +msgstr "Invalid slice definition “%*s”" -#: ../json-glib/json-path.c:686 +#: json-glib/json-path.c:637 #, c-format -msgid "Invalid array index definition '%*s'" -msgstr "Invalid array index definition '%*s'" +#| msgid "Invalid array index definition '%*s'" +msgid "Invalid array index definition “%*s”" +msgstr "Invalid array index definition “%*s”" -#: ../json-glib/json-path.c:705 +#: json-glib/json-path.c:656 #, c-format -msgid "Invalid first character '%c'" -msgstr "Invalid first character '%c'" +#| msgid "Invalid first character '%c'" +msgid "Invalid first character “%c”" +msgstr "Invalid first character “%c”" -#: ../json-glib/json-reader.c:457 +#: 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." +"The current node is of type “%s”, but an array or an object was expected." msgstr "" -"The current node is of type '%s', but an array or an object was expected." +"The current node is of type “%s”, but an array or an object was expected." -#: ../json-glib/json-reader.c:469 +#: 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." +"The index “%d” is greater than the size of the array at the current position." msgstr "" -"The index '%d' is greater than the size of the array at the current position." +"The index “%d” is greater than the size of the array at the current position." -#: ../json-glib/json-reader.c:486 +#: 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 "" -"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." -#: ../json-glib/json-reader.c:570 ../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 "No node available at the current position" -#: ../json-glib/json-reader.c:577 +#: json-glib/json-reader.c:592 #, c-format -msgid "The current position holds a '%s' and not an array" -msgstr "The current position holds a '%s' and not an array" +#| msgid "The current position holds a '%s' and not an array" +msgid "The current position holds a “%s” and not an array" +msgstr "The current position holds a “%s” and not an array" -#: ../json-glib/json-reader.c:640 +#: json-glib/json-reader.c:668 #, c-format -msgid "The current node is of type '%s', but an object was expected." -msgstr "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." +msgid "The current node is of type “%s”, but an object was expected." +msgstr "The current node is of type “%s”, but an object was expected." -#: ../json-glib/json-reader.c:647 +#: json-glib/json-reader.c:675 #, c-format -msgid "The member '%s' is not defined in the object at the current position." -msgstr "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." +msgid "The member “%s” is not defined in the object at the current position." +msgstr "The member “%s” is not defined in the object at the current position." -#: ../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 "The current position holds a '%s' and not an object" +#| msgid "The current position holds a '%s' and not an object" +msgid "The current position holds a “%s” and not an object" +msgstr "The current position holds a “%s” and not an object" -#: ../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 "The current position holds a '%s' and not a value" +#| msgid "The current position holds a '%s' and not a value" +msgid "The current position holds a “%s” and not a value" +msgstr "The current position holds a “%s” and not a value" -#: ../json-glib/json-reader.c:943 +#: json-glib/json-reader.c:968 msgid "The current position does not hold a string type" msgstr "The current position does not hold a string type" diff --git a/po/ka.po b/po/ka.po new file mode 100644 index 0000000..c2ba922 --- /dev/null +++ b/po/ka.po @@ -0,0 +1,276 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/json-glib/issues\n" +"POT-Creation-Date: 2022-09-18 08:04+0000\n" +"PO-Revision-Date: 2022-09-23 19:37+0200\n" +"Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>\n" +"Language-Team: \n" +"Language: ka\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: Poedit 3.1.1\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 "SPACES" + +#: 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 "FILE" + +#: json-glib/json-glib-format.c:61 +msgid "FILE…" +msgstr "FILE…" + +#. 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: სტანდარტულ გამოტანაზე ჩაწერის შეცდომა" + +#. 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:924 +#, c-format +msgid "Expecting a JSON object, but the root node is of type “%s”" +msgstr "მოველოდი JSON ობიექტს, მაგრამ ძირითადი კვანძის ტიპია %s" + +#. translators: the '%s' is the type name +#: json-glib/json-gvariant.c:482 +#, c-format +msgid "Unexpected type “%s” in JSON node" +msgstr "JSON-ის კვანძის მოულოდნელი ტიპი: %s" + +#: json-glib/json-gvariant.c:552 +msgid "Missing elements in JSON array to conform to a tuple" +msgstr "JSON მასივს კორტეჟთან შესათანხმებლად ელემენტები აკლია" + +#: json-glib/json-gvariant.c:580 +msgid "Missing closing symbol “)” in the GVariant tuple type" +msgstr "GVariant-ის კორტეჟის ტიპში დამხურავი \")\" აკლია" + +#: json-glib/json-gvariant.c:588 +msgid "Unexpected extra elements in JSON array" +msgstr "JSON მასივის მოულოდნელი დამატებითი ელემენტები" + +#: json-glib/json-gvariant.c:889 +msgid "Invalid string value converting to GVariant" +msgstr "სტრიქონიდან GVariant-ში გადასაყვანად მითითებული მნიშვნელბა არასწორია" + +#: json-glib/json-gvariant.c:944 +msgid "" +"A GVariant dictionary entry expects a JSON object with exactly one member" +msgstr "GVariant-ის ლექსიკონი მხოლოდ JSON ობიექტს ელოდება, მხოლოდ ერთი წევრით" + +#: json-glib/json-gvariant.c:1222 +#, c-format +msgid "GVariant class “%c” not supported" +msgstr "GVariant -ის კლასი “%c” მხარდაუჭერელია" + +#: json-glib/json-gvariant.c:1276 +msgid "Invalid GVariant signature" +msgstr "GVariant -ის არასწორი ხელმოწერა" + +#: json-glib/json-gvariant.c:1327 +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:939 +#, c-format +msgid "%s:%d:%d: Parse error: %s" +msgstr "%s:%d:%d: დამუშავების შეცდმა: %s" + +#: json-glib/json-parser.c:1023 +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:504 +#, 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:516 +#, 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:533 +#, 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:616 json-glib/json-reader.c:789 +#: json-glib/json-reader.c:838 json-glib/json-reader.c:877 +#: json-glib/json-reader.c:917 json-glib/json-reader.c:957 +#: json-glib/json-reader.c:997 json-glib/json-reader.c:1044 +#: json-glib/json-reader.c:1082 json-glib/json-reader.c:1110 +msgid "No node available at the current position" +msgstr "მიმდინარე პოზიციაზე კვანძი მიუწვდომელია" + +#: json-glib/json-reader.c:623 +#, c-format +msgid "The current position holds a “%s” and not an array" +msgstr "მიმდინარე პოზიცია შეიცავს \"%s\"-ს და არა მასივს" + +#: json-glib/json-reader.c:705 +#, c-format +msgid "The current node is of type “%s”, but an object was expected." +msgstr "მიმდინარე კვანძის ტიპია \"%s\", მაგრამ ობიექტს მოველოდი." + +#: json-glib/json-reader.c:712 +#, c-format +msgid "The member “%s” is not defined in the object at the current position." +msgstr "წევრი \"%s\" ობიექტში მიმდინარე პოზიციაზე აღწერილი არაა." + +#: json-glib/json-reader.c:796 json-glib/json-reader.c:845 +#, c-format +msgid "The current position holds a “%s” and not an object" +msgstr "მიმდინარე პოზიცია შეიცავს \"%s\"-ს და არა ობიექტს" + +#: json-glib/json-reader.c:886 json-glib/json-reader.c:926 +#: json-glib/json-reader.c:966 json-glib/json-reader.c:1006 +#: json-glib/json-reader.c:1053 +#, c-format +msgid "The current position holds a “%s” and not a value" +msgstr "მიმდინარე პოზიცია შეიცავს \"%s\"-ს და არა მნიშვნელობას" + +#: json-glib/json-reader.c:1014 +msgid "The current position does not hold a string type" +msgstr "მიმდინარე პოზიცია სტრიქონის ტიპს არ შეიცავს" @@ -1,5 +1,5 @@ # Turkish translation for json-glib. -# Copyright (C) 2011 json-glib's COPYRIGHT HOLDER +# Copyright (C) 2011-2022 json-glib's COPYRIGHT HOLDER # This file is distributed under the same license as the json-glib package. # # Yaşar Şentürk <yasarix@gmail.com>, 2014. @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/json-glib/issues\n" -"POT-Creation-Date: 2018-06-30 18:31+0000\n" +"POT-Creation-Date: 2022-07-14 11:02+0000\n" "PO-Revision-Date: 2018-08-09 16:12+0300\n" "Last-Translator: Emin Tufan Çetin <etcetin@gmail.com>\n" "Language-Team: Türkçe <gnome-turk@gnome.org>\n" @@ -42,14 +42,13 @@ msgid "FILE" msgstr "DOSYA" #: json-glib/json-glib-format.c:61 -#| msgid "FILE" msgid "FILE…" msgstr "DOSYA…" #. 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:120 +#: 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" @@ -58,7 +57,7 @@ msgstr "%s: %s: dosyayı açarken hata: %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:99 json-glib/json-glib-validate.c:75 +#: 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: dosyayı ayrıştırırken hata: %s\n" @@ -66,7 +65,7 @@ msgstr "%s: %s: dosyayı ayrıştırırken hata: %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:138 +#: json-glib/json-glib-format.c:143 #, c-format msgid "%s: %s: error writing to stdout" msgstr "%s: %s: stdoutʼa yazarken hata" @@ -74,18 +73,18 @@ msgstr "%s: %s: stdoutʼa yazarken hata" #. 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:159 json-glib/json-glib-validate.c:87 +#: 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: kapatma hatası: %s\n" #. Translators: this message will appear after the usage string #. and before the list of options. -#: json-glib/json-glib-format.c:192 +#: json-glib/json-glib-format.c:203 msgid "Format JSON files." msgstr "JSON dosyalarını biçimle." -#: json-glib/json-glib-format.c:193 +#: json-glib/json-glib-format.c:204 msgid "json-glib-format formats JSON resources." msgstr "json-glib-format, JSON verilerini biçimlendirir." @@ -93,12 +92,12 @@ msgstr "json-glib-format, JSON verilerini biçimlendirir." #. * means the user is calling json-glib-validate without any #. * argument. #. -#: json-glib/json-glib-format.c:208 json-glib/json-glib-validate.c:136 +#: json-glib/json-glib-format.c:219 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" msgstr "Komut satırı seçeneklerini ayrıştırırken hata: %s\n" -#: json-glib/json-glib-format.c:210 json-glib/json-glib-format.c:224 +#: 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." @@ -108,7 +107,7 @@ msgstr "Daha çok bilgi için “%s --help” komutunu girin." #. * means the user is calling json-glib-validate without any #. * argument. #. -#: json-glib/json-glib-format.c:222 json-glib/json-glib-validate.c:150 +#: json-glib/json-glib-format.c:233 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "%s: dosyalar eksik" @@ -124,49 +123,49 @@ msgid "json-glib-validate validates JSON data at the given URI." msgstr "json-glib-validate verilen URIʼdeki JSON verisini doğrular." #. translators: the %s is the name of the data structure -#: json-glib/json-gobject.c:940 +#: json-glib/json-gobject.c:924 #, c-format msgid "Expecting a JSON object, but the root node is of type “%s”" msgstr "Bir JSON nesnesi bekleniyor, ama kök düğümü “%s” türünde" #. translators: the '%s' is the type name -#: json-glib/json-gvariant.c:524 +#: json-glib/json-gvariant.c:482 #, c-format msgid "Unexpected type “%s” in JSON node" msgstr "JSON düğümünde beklenmeyen “%s” türü" -#: json-glib/json-gvariant.c:594 +#: json-glib/json-gvariant.c:552 msgid "Missing elements in JSON array to conform to a tuple" msgstr "JSON dizisinin bir demete uyması için gereken ögeler eksik" -#: json-glib/json-gvariant.c:622 +#: json-glib/json-gvariant.c:580 msgid "Missing closing symbol “)” in the GVariant tuple type" msgstr "GVariant demeti türünde kapatma sembolü “)” eksik" -#: json-glib/json-gvariant.c:630 +#: json-glib/json-gvariant.c:588 msgid "Unexpected extra elements in JSON array" msgstr "JSON dizisinde beklenmeyen ek ögeler" -#: json-glib/json-gvariant.c:909 +#: json-glib/json-gvariant.c:889 msgid "Invalid string value converting to GVariant" msgstr "GVariantʼa dönüştürmede geçersiz dizge değeri" -#: json-glib/json-gvariant.c:964 +#: json-glib/json-gvariant.c:944 msgid "" "A GVariant dictionary entry expects a JSON object with exactly one member" msgstr "" "Bir GVariant sözlük girdisi, tam olarak bir üyesi olan JSON nesnesi bekler" -#: json-glib/json-gvariant.c:1242 +#: json-glib/json-gvariant.c:1222 #, c-format msgid "GVariant class “%c” not supported" msgstr "GVariant sınıfı “%c” desteklenmiyor" -#: json-glib/json-gvariant.c:1290 +#: json-glib/json-gvariant.c:1276 msgid "Invalid GVariant signature" msgstr "Geçersiz GVariant imzası" -#: json-glib/json-gvariant.c:1338 +#: json-glib/json-gvariant.c:1327 msgid "JSON data is empty" msgstr "JSON verisi boş" @@ -174,12 +173,12 @@ msgstr "JSON verisi boş" #. * number, the second %d is the position on the line, and %s is #. * the error message #. -#: json-glib/json-parser.c:909 +#: json-glib/json-parser.c:939 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: Ayrıştırma hatası: %s" -#: json-glib/json-parser.c:992 +#: json-glib/json-parser.c:1023 msgid "JSON data must be UTF-8 encoded" msgstr "JSON verisi UTF-8 ile kodlanmış olmalıdır" @@ -222,69 +221,60 @@ msgstr "Geçersiz dizi indisi tanımı “%*s”" msgid "Invalid first character “%c”" msgstr "Geçersiz ilk karakter “%c”" -#: json-glib/json-reader.c:474 +#: json-glib/json-reader.c:504 #, c-format msgid "" "The current node is of type “%s”, but an array or an object was expected." msgstr "Geçerli düğümün türü “%s”, ama bir dizi ya da bir nesne bekleniyordu." -#: json-glib/json-reader.c:486 +#: json-glib/json-reader.c:516 #, c-format msgid "" "The index “%d” is greater than the size of the array at the current position." msgstr "“%d” indisi, geçerli konumdaki dizinin boyutundan daha büyük." -#: json-glib/json-reader.c:503 +#: json-glib/json-reader.c:533 #, c-format msgid "" "The index “%d” is greater than the size of the object at the current " "position." msgstr "“%d” indisi, geçerli konumdaki nesnenin boyutundan daha büyük." -#: 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 +#: json-glib/json-reader.c:616 json-glib/json-reader.c:789 +#: json-glib/json-reader.c:838 json-glib/json-reader.c:877 +#: json-glib/json-reader.c:917 json-glib/json-reader.c:957 +#: json-glib/json-reader.c:997 json-glib/json-reader.c:1044 +#: json-glib/json-reader.c:1082 json-glib/json-reader.c:1110 msgid "No node available at the current position" msgstr "Geçerli konumda kullanılabilir düğüm yok" -#: json-glib/json-reader.c:592 +#: json-glib/json-reader.c:623 #, c-format msgid "The current position holds a “%s” and not an array" msgstr "Geçerli konum bir dizi değil “%s” bulunduruyor" -#: json-glib/json-reader.c:668 +#: json-glib/json-reader.c:705 #, c-format msgid "The current node is of type “%s”, but an object was expected." msgstr "Geçerli düğümün türü “%s”, ama bir nesne bekleniyordu." -#: json-glib/json-reader.c:675 +#: json-glib/json-reader.c:712 #, c-format msgid "The member “%s” is not defined in the object at the current position." msgstr "“%s” üyesi, geçerli konumdaki nesnede tanımlı değil." -#: json-glib/json-reader.c:758 json-glib/json-reader.c:806 +#: json-glib/json-reader.c:796 json-glib/json-reader.c:845 #, c-format msgid "The current position holds a “%s” and not an object" msgstr "Geçerli konum bir nesne değil “%s” bulunduruyor" -#: 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 +#: json-glib/json-reader.c:886 json-glib/json-reader.c:926 +#: json-glib/json-reader.c:966 json-glib/json-reader.c:1006 +#: json-glib/json-reader.c:1053 #, c-format msgid "The current position holds a “%s” and not a value" msgstr "Geçerli konum bir değer değil “%s” bulunduruyor" -#: json-glib/json-reader.c:968 +#: json-glib/json-reader.c:1014 msgid "The current position does not hold a string type" msgstr "Geçerli konum bir dizge türü bulundurmuyor" - -#~ msgid "The current position does not hold an integer type" -#~ msgstr "Geçerli konum bir tamsayı türü bulundurmuyor" - -#~ msgid "The current position does not hold a floating point type" -#~ msgstr "Geçerli konum bir kayan noktalı tür bulundurmuyor" - -#~ msgid "The current position does not hold a boolean type" -#~ msgstr "Geçerli konum bir mantıksal doğru/yanlış türü bulundurmuyor" |