From 0ab73530ff1c21548033422793a3aa25b8a192cd Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Tue, 30 Jan 2018 10:20:17 +0900 Subject: [PATCH] Imported Upstream version 1.2.4 Change-Id: Ie8cfe934720b1bfc888982e296fa4de9163c857f Signed-off-by: DongHun Kwak --- ChangeLog | 11979 ------------------- Makefile.am | 11 +- Makefile.in | 20 +- NEWS | 4 + aclocal.m4 | 4 +- build/Makefile-newvs.am | 20 +- build/Makefile.msvcproj | 13 +- build/win32/Makefile.am | 5 +- build/win32/Makefile.in | 5 +- build/win32/config.h.win32 | 4 +- build/win32/detectenv-msvc.mak | 4 +- build/win32/jsonglibpc.py | 27 + build/win32/pc_base.py | 124 + build/win32/replace.py | 109 + build/win32/vs10/Makefile.am | 5 + build/win32/vs10/Makefile.in | 12 +- build/win32/vs10/json-glib-install.props | 19 +- build/win32/vs10/json-glib-install.propsin | 20 +- build/win32/vs10/json-glib-install.vcxproj | 30 +- build/win32/vs10/json-glib-install.vcxproj.filters | 13 + build/win32/vs10/json-glib-version-paths.props | 16 + build/win32/vs10/json-glib-version-paths.props.in | 70 + build/win32/vs10/json-glib.vcxproj | 29 +- build/win32/vs10/json-glib.vcxproj.filters | 1 - build/win32/vs10/json-glib.vcxprojin | 28 +- build/win32/vs11/Makefile.am | 1 + build/win32/vs11/Makefile.in | 15 +- build/win32/vs11/json-glib-install.props | 19 +- build/win32/vs11/json-glib-install.vcxproj | 30 +- build/win32/vs11/json-glib-install.vcxproj.filters | 13 + build/win32/vs11/json-glib-version-paths.props | 16 + build/win32/vs11/json-glib.vcxproj | 29 +- build/win32/vs11/json-glib.vcxproj.filters | 1 - build/win32/vs12/Makefile.am | 1 + build/win32/vs12/Makefile.in | 15 +- build/win32/vs12/json-glib-install.props | 19 +- build/win32/vs12/json-glib-install.vcxproj | 30 +- build/win32/vs12/json-glib-install.vcxproj.filters | 13 + build/win32/vs12/json-glib-version-paths.props | 16 + build/win32/vs12/json-glib.vcxproj | 29 +- build/win32/vs12/json-glib.vcxproj.filters | 1 - build/win32/vs14/Makefile.am | 1 + build/win32/vs14/Makefile.in | 15 +- build/win32/vs14/json-glib-install.props | 19 +- build/win32/vs14/json-glib-install.vcxproj | 30 +- build/win32/vs14/json-glib-install.vcxproj.filters | 13 + build/win32/vs14/json-glib-version-paths.props | 16 + build/win32/vs14/json-glib.vcxproj | 29 +- build/win32/vs14/json-glib.vcxproj.filters | 1 - build/win32/vs15/Makefile.am | 55 + build/win32/vs15/Makefile.in | 619 + build/win32/vs15/README.txt | 92 + build/win32/vs15/array.vcxproj | 171 + build/win32/vs15/array.vcxproj.filters | 14 + build/win32/vs15/boxed.vcxproj | 171 + build/win32/vs15/boxed.vcxproj.filters | 14 + build/win32/vs15/builder.vcxproj | 171 + build/win32/vs15/builder.vcxproj.filters | 14 + build/win32/vs15/generator.vcxproj | 171 + build/win32/vs15/generator.vcxproj.filters | 14 + build/win32/vs15/gvariant.vcxproj | 162 + build/win32/vs15/gvariant.vcxproj.filters | 14 + build/win32/vs15/invalid.vcxproj | 171 + build/win32/vs15/invalid.vcxproj.filters | 14 + build/win32/vs15/json-glib-build-defines.props | 32 + build/win32/vs15/json-glib-format.vcxproj | 166 + build/win32/vs15/json-glib-format.vcxproj.filters | 14 + build/win32/vs15/json-glib-gen-srcs.props | 17 + build/win32/vs15/json-glib-install.props | 53 + build/win32/vs15/json-glib-install.vcxproj | 114 + build/win32/vs15/json-glib-install.vcxproj.filters | 13 + build/win32/vs15/json-glib-validate.vcxproj | 166 + .../win32/vs15/json-glib-validate.vcxproj.filters | 14 + build/win32/vs15/json-glib-version-paths.props | 70 + build/win32/vs15/json-glib.sln | 196 + build/win32/vs15/json-glib.vcxproj | 203 + build/win32/vs15/json-glib.vcxproj.filters | 39 + build/win32/vs15/node.vcxproj | 171 + build/win32/vs15/node.vcxproj.filters | 14 + build/win32/vs15/object.vcxproj | 171 + build/win32/vs15/object.vcxproj.filters | 13 + build/win32/vs15/parser.vcxproj | 171 + build/win32/vs15/parser.vcxproj.filters | 14 + build/win32/vs15/path.vcxproj | 162 + build/win32/vs15/path.vcxproj.filters | 14 + build/win32/vs15/reader.vcxproj | 172 + build/win32/vs15/reader.vcxproj.filters | 14 + build/win32/vs15/serialize-complex.vcxproj | 170 + build/win32/vs15/serialize-complex.vcxproj.filters | 14 + build/win32/vs15/serialize-full.vcxproj | 171 + build/win32/vs15/serialize-full.vcxproj.filters | 14 + build/win32/vs15/serialize-simple.vcxproj | 170 + build/win32/vs15/serialize-simple.vcxproj.filters | 14 + build/win32/vs9/Makefile.in | 7 +- build/win32/vs9/json-glib-install.vcproj | 40 + build/win32/vs9/json-glib-install.vsprops | 5 + build/win32/vs9/json-glib-install.vspropsin | 6 + build/win32/vs9/json-glib-version-paths.vsprops | 16 + build/win32/vs9/json-glib-version-paths.vsprops.in | 69 + build/win32/vs9/json-glib.vcproj | 1 - configure | 60 +- configure.ac | 11 +- doc/reference/Makefile.in | 52 +- doc/reference/html/JsonBuilder.html | 38 +- doc/reference/html/JsonGenerator.html | 34 +- doc/reference/html/JsonParser.html | 54 +- doc/reference/html/JsonPath.html | 18 +- doc/reference/html/JsonReader.html | 54 +- doc/reference/html/annotation-glossary.html | 6 +- doc/reference/html/ch01.html | 6 +- doc/reference/html/ch02.html | 6 +- doc/reference/html/ch03.html | 6 +- doc/reference/html/ch04.html | 6 +- doc/reference/html/ch06.html | 10 +- doc/reference/html/index.html | 9 +- doc/reference/html/ix01.html | 6 +- doc/reference/html/ix02.html | 6 +- doc/reference/html/ix03.html | 6 +- doc/reference/html/ix04.html | 6 +- doc/reference/html/ix05.html | 6 +- doc/reference/html/ix06.html | 6 +- doc/reference/html/ix07.html | 6 +- doc/reference/html/ix08.html | 6 +- doc/reference/html/ix09.html | 6 +- doc/reference/html/ix10.html | 6 +- doc/reference/html/ix11.html | 6 +- doc/reference/html/json-advanced.html | 6 +- doc/reference/html/json-base.html | 6 +- doc/reference/html/json-format-tool.html | 6 +- .../html/json-glib-Boxed-Types-Serialization.html | 56 +- .../html/json-glib-GObject-Serialization.html | 20 +- doc/reference/html/json-glib-JSON-Array.html | 70 +- .../html/json-glib-JSON-GVariant-Integration.html | 16 +- doc/reference/html/json-glib-JSON-Node.html | 178 +- doc/reference/html/json-glib-JSON-Object.html | 78 +- .../html/json-glib-Serializable-Interface.html | 30 +- doc/reference/html/json-glib-Utility-API.html | 12 +- .../html/json-glib-Versioning-information.html | 18 +- doc/reference/html/json-glib.html | 6 +- doc/reference/html/json-streams.html | 6 +- doc/reference/html/json-tools.html | 6 +- doc/reference/html/json-validate-tool.html | 6 +- doc/reference/html/license.html | 6 +- doc/reference/html/tools.html | 6 +- doc/reference/json-glib-docs.xml | 11 +- doc/reference/json-glib-format.1 | 4 +- doc/reference/json-glib-validate.1 | 4 +- doc/reference/meson.build | 66 + doc/reference/version.xml | 2 +- doc/reference/xml/gtkdocentities.ent.in | 8 + doc/reference/xml/meson.build | 11 + gtk-doc.make | 53 +- json-glib/Json-1.0.gir | 65 +- json-glib/Makefile.am | 5 - json-glib/Makefile.in | 95 +- json-glib/json-enum-types.c | 20 +- json-glib/json-enum-types.c.in | 4 + json-glib/json-enum-types.h | 8 +- json-glib/json-generator.c | 8 +- json-glib/json-gobject.c | 2 +- json-glib/json-gobject.h | 4 + json-glib/json-gvariant.c | 4 +- json-glib/json-marshal.c | 132 - json-glib/json-marshal.h | 37 - json-glib/json-marshal.list | 5 - json-glib/json-node.c | 57 +- json-glib/json-parser.c | 45 +- json-glib/json-path.c | 2 +- json-glib/json-reader.c | 1 + json-glib/json-scanner.c | 19 - json-glib/json-version.h | 6 +- json-glib/meson.build | 127 + json-glib/tests/builder.c | 5 +- json-glib/tests/generator.c | 25 +- json-glib/tests/gvariant.c | 4 +- json-glib/tests/invalid.c | 2 +- json-glib/tests/meson.build | 37 + json-glib/tests/object.c | 8 +- json-glib/tests/parser.c | 3 +- meson.build | 157 + meson_options.txt | 9 + po/Makevars | 2 +- po/as.gmo | Bin 7246 -> 7246 bytes po/as.po | 69 +- po/bg.gmo | Bin 4519 -> 4519 bytes po/bg.po | 69 +- po/bn_IN.gmo | Bin 5255 -> 5255 bytes po/bn_IN.po | 69 +- po/bs.gmo | Bin 5145 -> 5145 bytes po/bs.po | 69 +- po/ca.gmo | Bin 5510 -> 5510 bytes po/ca.po | 69 +- po/ca@valencia.gmo | Bin 3928 -> 3928 bytes po/ca@valencia.po | 69 +- po/cs.gmo | Bin 5343 -> 5343 bytes po/cs.po | 69 +- po/da.gmo | Bin 5200 -> 5200 bytes po/da.po | 69 +- po/de.gmo | Bin 5476 -> 5476 bytes po/de.po | 69 +- po/el.gmo | Bin 6765 -> 6765 bytes po/el.po | 69 +- po/en_GB.gmo | Bin 3597 -> 5058 bytes po/en_GB.po | 115 +- po/eo.gmo | Bin 3762 -> 3762 bytes po/eo.po | 69 +- po/es.gmo | Bin 5362 -> 5362 bytes po/es.po | 69 +- po/et.gmo | Bin 3674 -> 3674 bytes po/et.po | 69 +- po/eu.gmo | Bin 5318 -> 5318 bytes po/eu.po | 69 +- po/fr.gmo | Bin 5572 -> 5572 bytes po/fr.po | 69 +- po/fur.gmo | Bin 5156 -> 5156 bytes po/fur.po | 69 +- po/gl.gmo | Bin 5321 -> 5321 bytes po/gl.po | 69 +- po/he.gmo | Bin 5069 -> 5069 bytes po/he.po | 69 +- po/hi.gmo | Bin 5284 -> 5284 bytes po/hi.po | 69 +- po/hu.gmo | Bin 5541 -> 5541 bytes po/hu.po | 69 +- po/id.gmo | Bin 5172 -> 5172 bytes po/id.po | 69 +- po/it.gmo | Bin 5284 -> 5284 bytes po/it.po | 69 +- po/ja.gmo | Bin 4023 -> 4023 bytes po/ja.po | 69 +- po/json-glib-1.0.pot | 71 +- po/ko.gmo | Bin 5504 -> 5504 bytes po/ko.po | 69 +- po/ky.gmo | Bin 4430 -> 4430 bytes po/ky.po | 69 +- po/lt.gmo | Bin 5371 -> 5371 bytes po/lt.po | 69 +- po/lv.gmo | Bin 5273 -> 5273 bytes po/lv.po | 69 +- po/meson.build | 83 + po/ml.gmo | Bin 5792 -> 5792 bytes po/ml.po | 69 +- po/nb.gmo | Bin 2477 -> 2946 bytes po/nb.po | 85 +- po/oc.gmo | Bin 5646 -> 5646 bytes po/oc.po | 69 +- po/or.gmo | Bin 5486 -> 5486 bytes po/or.po | 69 +- po/pa.gmo | Bin 4814 -> 4814 bytes po/pa.po | 69 +- po/pl.gmo | Bin 5483 -> 5461 bytes po/pl.po | 121 +- po/pt.gmo | Bin 5238 -> 5238 bytes po/pt.po | 69 +- po/pt_BR.gmo | Bin 5254 -> 5254 bytes po/pt_BR.po | 69 +- po/ro.gmo | Bin 5484 -> 5484 bytes po/ro.po | 69 +- po/ru.gmo | Bin 6649 -> 6649 bytes po/ru.po | 69 +- po/sk.gmo | Bin 5375 -> 5375 bytes po/sk.po | 69 +- po/sl.gmo | Bin 5325 -> 5325 bytes po/sl.po | 69 +- po/sr.gmo | Bin 6597 -> 6597 bytes po/sr.po | 69 +- po/sr@latin.gmo | Bin 5322 -> 5322 bytes po/sr@latin.po | 69 +- po/sv.gmo | Bin 5268 -> 5268 bytes po/sv.po | 69 +- po/te.gmo | Bin 5325 -> 5325 bytes po/te.po | 69 +- po/tg.gmo | Bin 6571 -> 6571 bytes po/tg.po | 69 +- po/tr.gmo | Bin 5219 -> 5219 bytes po/tr.po | 69 +- po/ug.gmo | Bin 4440 -> 4440 bytes po/ug.po | 69 +- po/uk.gmo | Bin 6645 -> 6645 bytes po/uk.po | 69 +- po/vi.gmo | Bin 3756 -> 3756 bytes po/vi.po | 69 +- po/zh_CN.gmo | Bin 5000 -> 5000 bytes po/zh_CN.po | 69 +- po/zh_HK.gmo | Bin 5030 -> 5030 bytes po/zh_HK.po | 69 +- po/zh_TW.gmo | Bin 5033 -> 5033 bytes po/zh_TW.po | 69 +- 288 files changed, 9261 insertions(+), 14141 deletions(-) delete mode 100644 ChangeLog create mode 100644 build/win32/jsonglibpc.py create mode 100644 build/win32/pc_base.py create mode 100644 build/win32/replace.py create mode 100644 build/win32/vs10/json-glib-install.vcxproj.filters create mode 100644 build/win32/vs10/json-glib-version-paths.props.in create mode 100644 build/win32/vs11/json-glib-install.vcxproj.filters create mode 100644 build/win32/vs12/json-glib-install.vcxproj.filters create mode 100644 build/win32/vs14/json-glib-install.vcxproj.filters create mode 100644 build/win32/vs15/Makefile.am create mode 100644 build/win32/vs15/Makefile.in create mode 100644 build/win32/vs15/README.txt create mode 100644 build/win32/vs15/array.vcxproj create mode 100644 build/win32/vs15/array.vcxproj.filters create mode 100644 build/win32/vs15/boxed.vcxproj create mode 100644 build/win32/vs15/boxed.vcxproj.filters create mode 100644 build/win32/vs15/builder.vcxproj create mode 100644 build/win32/vs15/builder.vcxproj.filters create mode 100644 build/win32/vs15/generator.vcxproj create mode 100644 build/win32/vs15/generator.vcxproj.filters create mode 100644 build/win32/vs15/gvariant.vcxproj create mode 100644 build/win32/vs15/gvariant.vcxproj.filters create mode 100644 build/win32/vs15/invalid.vcxproj create mode 100644 build/win32/vs15/invalid.vcxproj.filters create mode 100644 build/win32/vs15/json-glib-build-defines.props create mode 100644 build/win32/vs15/json-glib-format.vcxproj create mode 100644 build/win32/vs15/json-glib-format.vcxproj.filters create mode 100644 build/win32/vs15/json-glib-gen-srcs.props create mode 100644 build/win32/vs15/json-glib-install.props create mode 100644 build/win32/vs15/json-glib-install.vcxproj create mode 100644 build/win32/vs15/json-glib-install.vcxproj.filters create mode 100644 build/win32/vs15/json-glib-validate.vcxproj create mode 100644 build/win32/vs15/json-glib-validate.vcxproj.filters create mode 100644 build/win32/vs15/json-glib-version-paths.props create mode 100644 build/win32/vs15/json-glib.sln create mode 100644 build/win32/vs15/json-glib.vcxproj create mode 100644 build/win32/vs15/json-glib.vcxproj.filters create mode 100644 build/win32/vs15/node.vcxproj create mode 100644 build/win32/vs15/node.vcxproj.filters create mode 100644 build/win32/vs15/object.vcxproj create mode 100644 build/win32/vs15/object.vcxproj.filters create mode 100644 build/win32/vs15/parser.vcxproj create mode 100644 build/win32/vs15/parser.vcxproj.filters create mode 100644 build/win32/vs15/path.vcxproj create mode 100644 build/win32/vs15/path.vcxproj.filters create mode 100644 build/win32/vs15/reader.vcxproj create mode 100644 build/win32/vs15/reader.vcxproj.filters create mode 100644 build/win32/vs15/serialize-complex.vcxproj create mode 100644 build/win32/vs15/serialize-complex.vcxproj.filters create mode 100644 build/win32/vs15/serialize-full.vcxproj create mode 100644 build/win32/vs15/serialize-full.vcxproj.filters create mode 100644 build/win32/vs15/serialize-simple.vcxproj create mode 100644 build/win32/vs15/serialize-simple.vcxproj.filters create mode 100644 build/win32/vs9/json-glib-version-paths.vsprops.in create mode 100644 doc/reference/meson.build create mode 100644 doc/reference/xml/gtkdocentities.ent.in create mode 100644 doc/reference/xml/meson.build delete mode 100644 json-glib/json-marshal.c delete mode 100644 json-glib/json-marshal.h delete mode 100644 json-glib/json-marshal.list create mode 100644 json-glib/meson.build create mode 100644 json-glib/tests/meson.build create mode 100644 meson.build create mode 100644 meson_options.txt create mode 100644 po/meson.build diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index ebf0905..0000000 --- a/ChangeLog +++ /dev/null @@ -1,11979 +0,0 @@ -commit 5c42cb97cf78c04017a0a95d5a97b615c07c4107 -Author: Emmanuele Bassi -Date: Fri Jul 29 10:53:02 2016 +0100 - - Release JSON-GLib 1.2.2 - - NEWS | 1 + - configure.ac | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) - -commit 184391215f3f4f2d2b1435b1f82446c4532fe0a2 -Author: Piotr Drąg -Date: Sat Jul 23 22:33:15 2016 +0200 - - Add Language headers to po files - - Future versions of gettext will fail if this header is missing. - - po/ca@valencia.po | 2 +- - po/es.po | 2 +- - po/ja.po | 2 +- - po/nb.po | 2 +- - po/sl.po | 2 +- - po/sr@latin.po | 2 +- - po/ug.po | 2 +- - po/vi.po | 1 + - po/zh_HK.po | 2 +- - 9 files changed, 9 insertions(+), 8 deletions(-) - -commit 9c65113d9a61724b777ef038e789432a85cb7aca -Author: Anders Jonsson -Date: Tue Jul 19 21:28:56 2016 +0000 - - Updated Swedish translation - - po/sv.po | 58 +++++++++++++++++++++++++++++----------------------------- - 1 file changed, 29 insertions(+), 29 deletions(-) - -commit cf30bc6fdb61ab6cb858306dda9f3eb1e66e3586 -Author: Cédric Valmary -Date: Mon May 30 19:39:19 2016 +0000 - - Updated Occitan translation - - po/oc.po | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit fde984c8845d5b13fa8e0ac5bfdbb4dfc20872b4 -Author: Cédric Valmary -Date: Mon May 9 20:54:01 2016 +0000 - - Updated Occitan translation - - po/oc.po | 59 ++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 30 insertions(+), 29 deletions(-) - -commit c2f43c6fb5d702a8037cf28fc9318367c4140b84 -Author: Chun-wei Fan -Date: Mon Mar 7 14:16:44 2016 +0800 - - MSVC builds: Look for headers in include/gio-win32-2.0 - - gio.h is going to include headers from include/gio-win32-2.0 at some - point, so make sure we look for headers from there as well during the - build. - - build/win32/vs10/json-glib-build-defines.props | 4 ++-- - build/win32/vs9/json-glib-build-defines.vsprops | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -commit 3a91387198ad5474f5b1af5744fb7496584769b6 -Author: Chun-wei Fan -Date: Mon Jan 4 14:26:49 2016 +0800 - - MSVC builds: Improve introspection builds on MSVC - - This changes the introspection build process on MSVC by moving the - source/header list generation from using a Python script to generating - the list (and the full command lines for g-ir-scanner and g-ir-compiler) - using the common autotools module, to make it more easily maintained. - - build/win32/Makefile.am | 34 ++++++-- - build/win32/detectenv-msvc.mak | 76 ++++++++++++++++++ - build/win32/detectenv_msvc.mak | 65 --------------- - build/win32/gen-file-list-jsonglib.py | 115 --------------------------- - build/win32/introspection-msvc.mak | 79 ++++++++++-------- - build/win32/json-glib-introspection-msvc.mak | 40 ++-------- - json-glib/Makefile.am | 26 +++++- - 7 files changed, 181 insertions(+), 254 deletions(-) - -commit 8e80c2ce026421f0f8b50f71a28693e9a8cae535 -Author: Chun-wei Fan -Date: Mon Jan 4 14:02:51 2016 +0800 - - MSVC builds: Add support for Visual Studio 2012-2015 - - This adds support for Visual Studio 2012-2015 by making use of the - common autotools module to copy the Visual Studio 2010 projects and - updating the (few) items in there for providing build support for the - newer Visual Studio versions out-of-the-box, as the formats of the - project files used in these releases are largely the same. - - build/win32/Makefile.am | 2 +- - build/win32/vs11/Makefile.am | 53 ++++++++++++++++++++++++++++++++++++++++++++ - build/win32/vs12/Makefile.am | 53 ++++++++++++++++++++++++++++++++++++++++++++ - build/win32/vs14/Makefile.am | 53 ++++++++++++++++++++++++++++++++++++++++++++ - configure.ac | 3 +++ - 5 files changed, 163 insertions(+), 1 deletion(-) - -commit 5eedb10ae257b48ea4f6650f8b24240a2544b9a6 -Author: Chun-wei Fan -Date: Mon Jan 4 13:57:29 2016 +0800 - - build: Clean up MSVC-related items in autotools build files - - This makes use of the common build/Makefile.msvcproj to create the full - Visual Studio 2008/2010 project files from their respective templates, - while making the autotools files cleaner. As an added benefit, this also - enables the list of headers to "install" to be filled in automatically - during 'make dist', so that we will have to worry less about the addition - or removal of public headers. - - build/win32/vs10/Makefile.am | 16 +++++++-- - build/win32/vs10/json-glib-install.props | 54 ---------------------------- - build/win32/vs10/json-glib-install.propsin | 43 ++++++++++++++++++++++ - build/win32/vs10/json-glib.vcxproj.filtersin | 2 +- - build/win32/vs10/json-glib.vcxprojin | 2 +- - build/win32/vs9/Makefile.am | 14 ++++++-- - build/win32/vs9/json-glib-install.vsprops | 39 -------------------- - build/win32/vs9/json-glib-install.vspropsin | 26 ++++++++++++++ - build/win32/vs9/json-glib.vcprojin | 2 +- - json-glib/Makefile.am | 51 ++++++++------------------ - 10 files changed, 112 insertions(+), 137 deletions(-) - -commit d1119d775c5c2c7d630b77ee6855b67f66d92e31 -Author: Chun-wei Fan -Date: Mon Jan 4 13:49:53 2016 +0800 - - build: Add common autotools modules for MSVC build files - - This adds autotools modules that are directly copied from (and shared with) - the ones that are in GLib and GObject-introspection, where: - - Makefile.msvcproj: Creates the complete MSVC 2008/2010 project files for - building the main JSON-GLib DLL and the property sheets - for "installing" JSON-GLib, in particular the headers, - aimed to clean up the json-glib/Makefile.am in particular. - - Makefile-newvs.am: Copies the MSVC 2010 projects and replace the necessary - items so that we can support Visual Studio 2012-2015 out - of the box. - - Makefile.msvc-introspection: Creates the full NMake Makefile snippet that - contains the full command lines for g-ir-scanner - and g-ir-compiler to build the introspection - files for JSON-GLib for MSVC builds. - - build/Makefile-newvs.am | 45 ++++++++++++++ - build/Makefile.msvc-introspection | 125 ++++++++++++++++++++++++++++++++++++++ - build/Makefile.msvcproj | 107 ++++++++++++++++++++++++++++++++ - 3 files changed, 277 insertions(+) - -commit 4c2ad10eda3e2cdc2714358f72882b5ac8cbf34f -Author: Chun-wei Fan -Date: Tue Apr 19 15:43:53 2016 +0800 - - json-types.h: Add missing JSON_AVAILABLE_IN_1_2 - - The json_node_is_immutable() missed an JSON_AVAILABLE_IN_1_2, causing it - not to be exported. Fix this. - - json-glib/json-types.h | 1 + - 1 file changed, 1 insertion(+) - -commit 0e88e1cd971ac129a99ed970fdc7ae792016f88d -Author: Fabio Tomat -Date: Fri Apr 8 08:16:05 2016 +0000 - - Updated Friulian translation - - po/fur.po | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -commit aafea9253100f41a592622ab562ae7f69cfbf0dc -Author: Fabio Tomat -Date: Sat Apr 2 23:32:33 2016 +0000 - - Updated Friulian translation - - po/fur.po | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit f1df1ad6e0dd929c156da58c0570131e4fafe177 -Author: Fabio Tomat -Date: Wed Mar 23 16:45:53 2016 +0000 - - Updated Friulian translation - - po/fur.po | 173 +++++++++++++++++++++++++++++++++++++++++++++++++------------- - 1 file changed, 137 insertions(+), 36 deletions(-) - -commit b3655eaa245da84c5a6e01f6b65db7c37dc7df3c -Author: Emmanuele Bassi -Date: Tue Mar 22 16:15:39 2016 +0000 - - Post-release version bump to 1.2.1 - - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 19f5626b70e72a81dae7ee11b4c3a4d75779a7be -Author: Emmanuele Bassi -Date: Tue Mar 22 16:14:19 2016 +0000 - - Release JSON-GLib 1.2.0 (stable) - - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit ae32d238ee2479002d07d7b5b19a482dc31e7ffd -Author: Emmanuele Bassi -Date: Tue Mar 22 16:01:46 2016 +0000 - - node: Turn a g_debug() call into a JSON_NOTE - - This allows conditional compilation, and it makes the debugging code - consistent. - - json-glib/json-node.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -commit b659345f0fbf08053ae7087c7c2eb25905e61cf3 -Author: Emmanuele Bassi -Date: Tue Mar 22 16:01:25 2016 +0000 - - debug: Add flag for debugging nodes - - json-glib/json-debug.c | 3 ++- - json-glib/json-debug.h | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -commit 14fa35ca93b1e553c2f50df5527bb17fb84d69d1 -Author: Emmanuele Bassi -Date: Tue Mar 1 18:59:31 2016 +0000 - - Post-release version bump to 1.1.3 - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 83965c9474dcd35da6bffaa00f0e715986e70d74 -Author: Emmanuele Bassi -Date: Tue Mar 1 16:16:05 2016 +0000 - - Release JSON-GLib 1.1.2 (snapshot) - - NEWS | 15 +++++++++++++++ - configure.ac | 2 +- - 2 files changed, 16 insertions(+), 1 deletion(-) - -commit f0dfe4f84c924953585db3d53c568cfe7813226a -Author: Emmanuele Bassi -Date: Tue Mar 1 16:18:24 2016 +0000 - - build: Update gitignore generation rule - - build/autotools/Makefile.am.gitignore | 29 +++++++++++++---------------- - 1 file changed, 13 insertions(+), 16 deletions(-) - -commit 5e186395aecb256a67a9d06c1749393be681ae38 -Author: Emmanuele Bassi -Date: Tue Mar 1 16:02:28 2016 +0000 - - fixup! docs: Fix the Since tags - - json-glib/json-types.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 438ca10a27f2732173b345a0ca359d1b8f59c2f6 -Author: Emmanuele Bassi -Date: Tue Mar 1 15:05:13 2016 +0000 - - parser: Rename `immutable` bit field - - json-glib/json-parser.c | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -commit a43a9451b0cf9ebc03c651b5688f0fad56e3bacb -Author: Emmanuele Bassi -Date: Tue Mar 1 15:02:19 2016 +0000 - - docs: Fix the Since tags - - The newly added API is available since 1.2. - - json-glib/json-array.c | 8 ++++---- - json-glib/json-builder.c | 4 ++-- - json-glib/json-node.c | 20 ++++++++++---------- - json-glib/json-object.c | 12 ++++++------ - json-glib/json-parser.c | 4 ++-- - json-glib/json-value.c | 2 +- - 6 files changed, 25 insertions(+), 25 deletions(-) - -commit 6ddbc94c9888e5ddcd1cbb15845d2f1b5524b3ed -Author: Philip Withnall -Date: Tue Mar 1 15:01:07 2016 +0000 - - core: Add JSON node, object, array hashes - - Now that these objects can be marked as immutable, it is possible to - calculate and cache hash values for each of them. This allows efficient - hash-based deduplication of large numbers of JSON nodes, as needed by - Walbottle for JSON test vector generation. - - To complement the new hash functions, each of JsonNode, JsonValue, - JsonObject and JsonArray also now have an equal() comparison method. - This compares them structurally and recursively, using the definition of - equality from the JSON Schema specification, which seems as good as any - other. - - http://json-schema.org/latest/json-schema-core.html#anchor9 - - https://bugzilla.gnome.org/show_bug.cgi?id=756121 - - Signed-off-by: Emmanuele Bassi - - doc/reference/json-glib-sections.txt | 11 ++ - json-glib/json-array.c | 104 ++++++++++++++- - json-glib/json-node.c | 245 +++++++++++++++++++++++++++++++++++ - json-glib/json-object.c | 99 +++++++++++++- - json-glib/json-parser.c | 8 +- - json-glib/json-types-private.h | 5 + - json-glib/json-types.h | 27 ++++ - json-glib/json-value.c | 45 +++++++ - 8 files changed, 530 insertions(+), 14 deletions(-) - -commit 1de237a502ceee96df7091c2df4492b8bc08b2c5 -Author: Philip Withnall -Date: Sat Nov 7 17:38:22 2015 +0100 - - node: Add json_node_ref() and json_node_unref() - - Add reference counting semantics to JsonNode, in addition to the - existing init/unset and alloc/free semantics. - - json_node_free() must only be used with nodes allocated using - json_node_alloc(). json_node_unref() may be used with all nodes (if - correctly paired; it may be paired with json_node_alloc()). - - It is not valid to call json_node_free() on a node whose reference count - is not 1. - - https://bugzilla.gnome.org/show_bug.cgi?id=756121 - - doc/reference/json-glib-sections.txt | 2 + - json-glib/json-array.c | 6 +- - json-glib/json-builder.c | 4 +- - json-glib/json-generator.c | 4 +- - json-glib/json-gobject.c | 4 +- - json-glib/json-gvariant.c | 2 +- - json-glib/json-node.c | 129 ++++++++++++++++++++++++++--------- - json-glib/json-object.c | 4 +- - json-glib/json-parser.c | 24 +++---- - json-glib/json-path.c | 4 +- - json-glib/json-reader.c | 4 +- - json-glib/json-types-private.h | 13 +++- - json-glib/json-types.h | 5 ++ - 13 files changed, 141 insertions(+), 64 deletions(-) - -commit 58f479b60eb2db4c73605d469d68a8ffd8679327 -Author: Philip Withnall -Date: Sat Nov 7 14:17:31 2015 +0100 - - core: Add immutability support to core objects - - Add an immutable mode to JsonNode, JsonObject, JsonArray and JsonValue. - This is an optional mode which objects enter by calling json_*_seal(). - It is a one-way transition, which means that we can build and manipulate - objects as much as desired, before sealing them and enjoying the - benefits of immutable objects: no need to take copies when handling - them, persistent hash values (still to be implemented). - - https://bugzilla.gnome.org/show_bug.cgi?id=756121 - - doc/reference/json-glib-sections.txt | 8 + - json-glib/json-array.c | 48 ++++++ - json-glib/json-builder.c | 106 ++++++++++++ - json-glib/json-builder.h | 2 + - json-glib/json-node.c | 127 +++++++++++++- - json-glib/json-object.c | 51 ++++++ - json-glib/json-parser.c | 108 ++++++++++++ - json-glib/json-parser.h | 2 + - json-glib/json-types-private.h | 7 + - json-glib/json-types.h | 13 ++ - json-glib/json-value.c | 23 +++ - json-glib/tests/node.c | 320 +++++++++++++++++++++++++++++++++++ - 12 files changed, 810 insertions(+), 5 deletions(-) - -commit a82b93ba60dd0f54660990df86ba0cf7fc74c9a8 -Author: Cédric Valmary -Date: Mon Feb 29 19:41:32 2016 +0000 - - Updated Occitan translation - - po/oc.po | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 8ff4ca0a807e8bb04081bcf47e7a9951edd70ac9 -Author: Emmanuele Bassi -Date: Mon Feb 29 00:31:57 2016 +0000 - - format: Silence a compiler warning - - json-glib/json-glib-format.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -commit 130190ed1ca0387b4bc22b15b0e1a910e961c667 -Author: Emmanuele Bassi -Date: Mon Feb 29 00:27:59 2016 +0000 - - Add autoptr macros - - GLib can take advantage of the "cleanup" attribute by using a bunch of - macro magic. This has been slowly been used across various libraries in - the G* stack, so JSON-GLib should provide symbols for the automatic - memory management of its types. - - json-glib/json-builder.h | 4 ++++ - json-glib/json-generator.h | 4 ++++ - json-glib/json-parser.h | 4 ++++ - json-glib/json-path.h | 4 ++++ - json-glib/json-reader.h | 4 ++++ - json-glib/json-types.h | 6 ++++++ - 6 files changed, 26 insertions(+) - -commit a1490d9b6a3a21774d68f085f805d5f7a68b305e -Author: Emmanuele Bassi -Date: Thu Feb 25 09:42:54 2016 +0000 - - parser: Detect missing commas in arrays - - Just like we detect trailing commas, we should also detect missing ones - to avoid parsing invalid JSON successfully. - - json-glib/json-parser.c | 15 ++++++++++++++- - json-glib/tests/invalid.c | 31 +++++++++++++++++++++++++++++++ - 2 files changed, 45 insertions(+), 1 deletion(-) - -commit c34b3541f9d2cb388bc20fecc9cf412d6ab0716d -Author: Emmanuele Bassi -Date: Thu Feb 25 09:41:38 2016 +0000 - - parser: Correctly increment the array index counter - - We pass the counter to the JsonParser::array-element signal, but we - never really increment it. - - json-glib/json-parser.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -commit 28c7347150d24383114f06457c3a8d5f5d8eab00 -Author: Philip Withnall -Date: Sat Nov 7 18:01:54 2015 +0100 - - core: Remove atomic operations for reference counting - - They are not needed — json-glib is not at all thread safe. - - json-glib/json-array.c | 4 ++-- - json-glib/json-object.c | 4 ++-- - json-glib/json-value.c | 4 ++-- - 3 files changed, 6 insertions(+), 6 deletions(-) - -commit d8720da7ec351e5f15f6ce7baf96434ea42bb111 -Author: Philip Withnall -Date: Sat Nov 7 15:20:28 2015 +0100 - - array: Ensure JsonArray is zero-initialised - - json-glib/json-array.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit db7c76dcdc56ccaaa06051ccde5db808783bef22 -Author: Robert Ancell -Date: Tue Nov 24 21:15:38 2015 +1300 - - Fix code returning FALSE when it should be NULL - - json-glib/json-reader.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit e5c11ba342122981a1e3081eb7f82217a0ebb431 -Author: Philip Withnall -Date: Thu Nov 19 17:49:47 2015 +0000 - - docs: Fix section title - - doc/reference/json-glib-docs.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 1843dd381ebbe6ea62c2d8b91588eb4dab7c5bab -Author: Emmanuele Bassi -Date: Fri Nov 13 13:40:13 2015 +0000 - - docs: Fix URL of the project page - - README.md | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 3e0985cbb3399af8bece24a2933b9045edcc7a74 -Author: Philip Withnall -Date: Fri Nov 6 11:23:45 2015 +0100 - - types: Tweak dummy padding in JsonObjectIter - - Use padding which resembles the ABI structure of GHashTableIter so that - our struct size is the same as GHashTableIter on all platforms, rather - than just on x86_64. This fixes the static assertion failure on i386 and - armhf. - - https://bugzilla.gnome.org/show_bug.cgi?id=757675 - - json-glib/json-types.h | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -commit c0607bee11fae7963d64de6556d2dea84310ca63 -Author: Cédric Valmary -Date: Sat Oct 31 09:10:45 2015 +0000 - - Updated Occitan translation - - po/oc.po | 201 +++++++++++++++++++++++++++++++++++++-------------------------- - 1 file changed, 117 insertions(+), 84 deletions(-) - -commit d720ff7b5447817933f1af38a7f03d0f7ac0b302 -Author: Daniel Șerbănescu -Date: Sat Oct 24 19:37:07 2015 +0000 - - Added Romanian translation - - po/ro.po | 265 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 265 insertions(+) - -commit d231976e240f2244c60df26a1a6600ecb325506a -Author: Philip Withnall -Date: Thu Sep 24 11:06:34 2015 +0100 - - object: Add JsonObjectIter to ease iteration over JsonObject members - - This is a stack-allocated iterator object similar to GHashTableIter - which allows allocation-free iteration over the members in a JsonObject. - - It differs from json_object_foreach_member() in the order in which it - iterates — for JsonObjectIter the order is undefined. - - https://bugzilla.gnome.org/show_bug.cgi?id=755509 - - doc/reference/json-glib-sections.txt | 3 ++ - json-glib/json-object.c | 71 ++++++++++++++++++++++++++++++++++++ - json-glib/json-types-private.h | 9 +++++ - json-glib/json-types.h | 26 +++++++++++++ - json-glib/tests/object.c | 28 ++++++++++++++ - 5 files changed, 137 insertions(+) - -commit 5185a8f8a58e5b455116eaa8c99c4b4c38a45929 -Author: Iain Lane -Date: Fri Oct 2 11:28:38 2015 +0100 - - tests/builder: Don't duplicate test names - - GLib 2.46.0 forbids this and so the testsuite fails. - - https://bugzilla.gnome.org/show_bug.cgi?id=755977 - - json-glib/tests/builder.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit bfbc0b48e9256473491755766c079f73bee80724 -Author: Philip Withnall -Date: Tue Sep 1 10:05:23 2015 +0100 - - lib: Trivial documentation clarifications - - Clarify the documentation for json_node_set_object() and - json_object_get_array_member(). - - https://bugzilla.gnome.org/show_bug.cgi?id=754384 - - json-glib/json-node.c | 4 +++- - json-glib/json-object.c | 6 ++++-- - 2 files changed, 7 insertions(+), 3 deletions(-) - -commit 54fedc974f0c0548951454125cd2b2f35528fa67 -Author: Piotr Drąg -Date: Wed Aug 26 19:43:15 2015 +0200 - - Updated Polish translation - - po/pl.po | 118 +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 59 insertions(+), 59 deletions(-) - -commit 8fd3660b4bc7e764cc57d11bbba8ef3a0ab2ee7d -Author: Philip Withnall -Date: Fri Feb 6 15:10:35 2015 +0000 - - reader: Clarify use of json_reader_end_[element|member]() with errors - - Include an example showing that the end function must be called on both - code paths (success and failure) if the reader object is to be used - afterwards. - - https://bugzilla.gnome.org/show_bug.cgi?id=744100 - - json-glib/json-reader.c | 31 +++++++++++++++++++++++++++++-- - 1 file changed, 29 insertions(+), 2 deletions(-) - -commit f7eb50b5b03ee5870e476135bd989cb49d8d44c2 -Author: Emmanuele Bassi -Date: Tue Aug 18 14:04:05 2015 +0100 - - array: Do not create a null node for empty strings - - The two are fairly different, and JsonObject does not behave this way. - - https://bugzilla.gnome.org/show_bug.cgi?id=730803 - - json-glib/json-array.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 4c1485acaa0f7267c87a37477f43808924e5aece -Author: Anders Jonsson -Date: Sun Aug 9 21:42:03 2015 +0000 - - Updated Swedish translation - - po/sv.po | 89 ++++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 45 insertions(+), 44 deletions(-) - -commit 157820c544291512cfde3e224e6b0af0ab2997cb -Author: Pedro Albuquerque -Date: Wed Jul 1 22:01:02 2015 +0000 - - Updated Portuguese translation - - po/pt.po | 102 +++++++++++++++++++++++++++++++++------------------------------ - 1 file changed, 53 insertions(+), 49 deletions(-) - -commit 3ae9c9e82dc2423b8f6af23ae2b5d08d30f6b575 -Author: Emmanuele Bassi -Date: Tue Jun 9 12:56:13 2015 +0100 - - parser: Port to GTask - - GSimpleAsyncResult is deprecated in GLib 2.46, so we should drop its - use, and simplify the code in the process. - - json-glib/json-parser.c | 180 +++++++++++++++++------------------------------- - 1 file changed, 62 insertions(+), 118 deletions(-) - -commit 155991af58d451cf8c4ccfaed432a959f1687b1c -Author: Emmanuele Bassi -Date: Tue Jun 9 12:29:06 2015 +0100 - - docs: Add 1.2 symbols index - - doc/reference/json-glib-docs.xml | 5 +++++ - 1 file changed, 5 insertions(+) - -commit fd443041b5243dbb5748ce132c5c14b1c52f23fa -Author: Emmanuele Bassi -Date: Tue Jun 9 12:28:57 2015 +0100 - - docs: Add missing symbols - - doc/reference/json-glib-sections.txt | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -commit b6546a62362bafcb0aa2d97175a15c4218cc6023 -Author: Emmanuele Bassi -Date: Tue Jun 9 12:23:12 2015 +0100 - - Add simple JSON/string utilities - - Wrap JsonParser and JsonGenerator in simple, easy to call functions that - manage the objects for you. - - doc/reference/json-glib-docs.xml | 5 ++ - doc/reference/json-glib-sections.txt | 6 ++ - json-glib/Makefile.am | 2 + - json-glib/json-glib.h | 1 + - json-glib/json-utils.c | 103 +++++++++++++++++++++++++++++++++++ - json-glib/json-utils.h | 40 ++++++++++++++ - json-glib/json-version-macros.h | 16 ++++++ - 7 files changed, 173 insertions(+) - -commit 445a787757eb08afeee61a6c5fdbd6622c43d0af -Author: Emmanuele Bassi -Date: Tue Jun 9 12:24:15 2015 +0100 - - Bump up version to 1.1.1 - - New development cycle, for new API. - - configure.ac | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit b3b996bbdf704bb7488493a8262aff3dc282d496 -Author: Cédric Valmary -Date: Thu May 21 17:12:58 2015 +0000 - - Added Occitan translation - - po/oc.po | 235 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 235 insertions(+) - -commit a7b081b736e632405b36e34bbd01040bde115f92 -Author: Emmanuele Bassi -Date: Sun Mar 15 17:52:28 2015 +0000 - - Post-release version bump to 1.0.5 - - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit c7bbaf2a3f3e07d9d4e48591e765f388541ecd7f -Author: Emmanuele Bassi -Date: Sun Mar 15 17:45:44 2015 +0000 - - Release JSON-GLib 1.0.4 - - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 52cf02caa0db2eee99c3a1145319eea5806b2977 -Author: Emmanuele Bassi -Date: Sun Mar 15 17:42:58 2015 +0000 - - build: Enable subdir-objects - - We need to remove the path specification inside the sources listing, and - modify the enumeration type and marshallers generation rules to cope - with it (by adding the $(srcdir) when needed). This is similar to the - changes there were made to Clutter. - - .gitignore | 1 + - build/autotools/Makefile.am.enums | 29 +++++++++------ - build/autotools/Makefile.am.marshal | 17 ++++++--- - configure.ac | 2 +- - json-glib/Makefile.am | 70 ++++++++++++++++++------------------- - 5 files changed, 68 insertions(+), 51 deletions(-) - -commit efecd1214580eb2835f99b8d231b126ee6cafa21 -Author: Samir Ribic -Date: Fri Mar 13 21:01:51 2015 +0000 - - Added Bosnian translation - - po/bs.po | 252 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 252 insertions(+) - -commit 0f4a21d03a16ddd4cf052b9b2230ec004d05d430 -Author: Emmanuele Bassi -Date: Fri Mar 13 13:43:59 2015 +0000 - - build: Enable gtkdoc-check - - We can verify that the documentation is correct and up to date every - time we distcheck by turning on the gtk-doc check tool. - - .gitignore | 3 +++ - doc/reference/Makefile.am | 24 ++++++++++-------------- - 2 files changed, 13 insertions(+), 14 deletions(-) - -commit 81174fcdd31f3c1d1601b5d9000c154391f14006 -Author: Emmanuele Bassi -Date: Fri Mar 13 13:41:36 2015 +0000 - - build: Clean up gtk-doc stanzas - - We need to ensure that gtk-doc looks into both the srcdir and the - builddir in order to find all annotations. - - We also don't need to have the .types file under revision control: - gtk-doc is perfectly capable of rebuilding it by itself. - - doc/reference/Makefile.am | 35 ++--------------------------------- - doc/reference/json-glib.types | 7 ------- - 2 files changed, 2 insertions(+), 40 deletions(-) - -commit c5183b4546ebaceaf77183f259d354488fea5469 -Author: Emmanuele Bassi -Date: Fri Mar 13 13:40:41 2015 +0000 - - docs: Add missing symbol indices - - doc/reference/json-glib-docs.xml | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -commit cd0fee83bfde8ccdf4602094e9f14bcd749a12b0 -Author: Emmanuele Bassi -Date: Fri Mar 13 13:40:27 2015 +0000 - - docs: Add missing annotations - - json-glib/json-serializable.c | 28 ++++++++++++++++++++++++++-- - 1 file changed, 26 insertions(+), 2 deletions(-) - -commit d82de8274ac1aa03138078f40f99ea1cc8ef3cd0 -Author: Patrick Welche -Date: Fri Mar 13 11:07:54 2015 +0000 - - configure: test(1) uses = to test for string equality - - https://bugzilla.gnome.org/show_bug.cgi?id=711600 - https://bugzilla.gnome.org/show_bug.cgi?id=746143 - - build/autotools/glibtests.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 5d62e7a6bd5e494f9f80b9ad5f14191e4986c467 -Author: Dušan Kazik -Date: Mon Mar 9 17:35:36 2015 +0000 - - Updated Slovak translation - - po/sk.po | 174 ++++++++++++++++++++++++++++++++++++++++++++++++++------------- - 1 file changed, 138 insertions(+), 36 deletions(-) - -commit 88178ad0c2befc61e8771875f1f7fc2807c075ce -Author: Chun-wei Fan -Date: Fri Mar 6 16:23:53 2015 +0800 - - MSVC Builds: Rename "Install" Projects - - Rename the install projects as json-glib-install, so that it would be - easier for one to integrate the project set in a grand solution that can be - used to build the entire stack, such as for Clutter. - - build/win32/vs10/Makefile.am | 2 +- - build/win32/vs10/install.vcxproj | 110 ----------------------------- - build/win32/vs10/json-glib-install.vcxproj | 110 +++++++++++++++++++++++++++++ - build/win32/vs10/json-glib.sln | 2 +- - build/win32/vs9/Makefile.am | 2 +- - build/win32/vs9/install.vcproj | 77 -------------------- - build/win32/vs9/json-glib-install.vcproj | 77 ++++++++++++++++++++ - build/win32/vs9/json-glib.sln | 2 +- - 8 files changed, 191 insertions(+), 191 deletions(-) - -commit 5332e0e3ad2ee0d03787569ddcf5cadb608ece23 -Author: Chun-wei Fan -Date: Fri Mar 6 16:15:25 2015 +0800 - - MSVC Builds: "Install" the .pdb Files - - "Install" the .pdb files for the json-glib DLL and the tools to ease - debugging people developing or using json-glib, as the .pdb files are - already generated for all builds. - - build/win32/vs10/json-glib-install.props | 5 +++-- - build/win32/vs9/json-glib-install.vsprops | 5 +++-- - 2 files changed, 6 insertions(+), 4 deletions(-) - -commit ed05b1c8f0352b22e4a726526d4155f2dc6ac7f6 -Author: Chun-wei Fan -Date: Fri Mar 6 16:12:51 2015 +0800 - - MSVC 2010 Projects: Clean Up "Installation" - - The empty lines in the property sheets are not really needed, so remove - them. - - build/win32/vs10/json-glib-install.props | 21 --------------------- - 1 file changed, 21 deletions(-) - -commit c642f6644f82b555b348d3c364efd9961155528d -Author: Chun-wei Fan -Date: Fri Mar 6 16:11:44 2015 +0800 - - MSVC Builds: Speed Up Release Builds - - Use the multiprocessor compilation (/MP) option, which can cut down release - build times by quite a bit. This will emit a brief warning on debug - builds, but otherwise the build will proceed as normal. - - Also use the /d2Zi+ option for MSVC 2010 (and later) builds so that more - useful information can be logged to the .pdb files for the release builds. - - build/win32/vs10/json-glib-build-defines.props | 2 ++ - build/win32/vs9/json-glib-build-defines.vsprops | 1 + - 2 files changed, 3 insertions(+) - -commit 80e44db76dd179e4c12d1a11b24f27c7548dc382 -Author: Stef Walter -Date: Thu Feb 13 22:21:18 2014 +0100 - - json-gvariant: Parse json doubles that are whole numbers - - The json gvariant serializer encodes whole number doubles without - a dot. The deserializer needs to be able to parse these as well. - - Fix problem, and add test cases. - - https://bugzilla.gnome.org/show_bug.cgi?id=724319 - - json-glib/json-gvariant.c | 6 +++++- - json-glib/tests/gvariant.c | 4 ++++ - 2 files changed, 9 insertions(+), 1 deletion(-) - -commit aee569b0bc2542aa8f1d13d66ddadacbda1035ac -Author: Philip Withnall -Date: Sun Jan 25 11:47:23 2015 +0000 - - builder: Add missing (transfer) annotation to json_builder_add_value() - - Document and annotate the fact that json_builder_add_value() takes - ownership of the JsonNode passed in to it. - - https://bugzilla.gnome.org/show_bug.cgi?id=743475 - - json-glib/json-builder.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -commit 1f6668a9534c01523361075dad290c0dc49d7623 -Author: Philip Withnall -Date: Sat Dec 20 23:22:09 2014 +0000 - - reader: Maintain a stack of member names - - This fixes the case where, with nested objects, we call: - json_reader_read_member (reader, "outer"); - // json_reader_get_member_name (reader) == "outer" - - json_reader_read_member (reader, "inner"); - // json_reader_get_member_name (reader) == "inner" - // do something useful - json_reader_end_member (reader); - but at the end, the following assertion no longer holds: - // json_reader_get_member_name (reader) == "outer" - even though the JsonReader state should have been reset after ending the - inner node. - - Fix it by maintaining a stack of member names. This works with both - json_reader_read_member() and json_reader_read_element(). Updates to the - unit tests are included. - - https://bugzilla.gnome.org/show_bug.cgi?id=741824 - - json-glib/json-reader.c | 29 ++++++++++++++++------------- - json-glib/tests/reader.c | 13 +++++++++++++ - 2 files changed, 29 insertions(+), 13 deletions(-) - -commit 23e69e79484d41c722ab8bcab78fe850b960316e -Author: Tristan Van Berkom -Date: Sun Mar 9 17:59:02 2014 +0900 - - Handle serialization/deserialization of glong gulong and guint64 - - Long and unsigned long was properly serialized but not deserialized, guint64 - handling is not ideal as the type is cast into a gint64, however this is - better than not handling the fundamental type at all. - - https://bugzilla.gnome.org/show_bug.cgi?id=725972 - - json-glib/json-gobject.c | 28 ++++++++++++++++++++++++++++ - 1 file changed, 28 insertions(+) - -commit c183513e82e20e7f77821e6a667bf12dfa0b8b20 -Author: Emmanuele Bassi -Date: Fri Jul 25 10:05:21 2014 +0100 - - Drop unnecessary '_' prefix from json_marshal - - It's not public API anyway, and we use annotations instead of the '_' - prefix. - - json-glib/Makefile.am | 2 +- - json-glib/json-parser.c | 18 +++++++++--------- - 2 files changed, 10 insertions(+), 10 deletions(-) - -commit 2779d537492f1902d71cf648631238110b62b311 -Author: Yaşar Şentürk -Date: Thu Dec 4 21:37:26 2014 +0000 - - Updated Turkish translation - - po/tr.po | 205 ++++++++++++++++++++++++++++++++++++++++++++++----------------- - 1 file changed, 152 insertions(+), 53 deletions(-) - -commit 4ccb9ab6119b81dde81b04208b98c89fc3a7884c -Author: Sebastian Rasmussen -Date: Thu Sep 18 20:13:42 2014 +0000 - - Updated Swedish translation - - po/sv.po | 261 +++++++++++++++++++++++++++++++++++++++++++-------------------- - 1 file changed, 177 insertions(+), 84 deletions(-) - -commit 88a3adda5238177084998b734cc0d2f3f8237f38 -Author: ngoswami -Date: Wed Aug 20 07:49:49 2014 +0000 - - Updated Assamese translation - - po/as.po | 180 +++++++++++++++++++++++++++++++++++++++++++++++++-------------- - 1 file changed, 140 insertions(+), 40 deletions(-) - -commit 5b8fa1bcd8c16e638369db78783feca5fb9fe188 -Author: Wolfgang Stöggl -Date: Thu Aug 14 22:20:11 2014 +0000 - - Updated German translation - - po/de.po | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -commit 47816385fa7e1f35580b50268e8de38fa22e44d6 -Author: Olav Vitters -Date: Wed Jul 30 20:24:44 2014 +0200 - - doap category core - - json-glib.doap | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit cfc576eb1a22c7ab213e26bba7716534109884fe -Author: Emmanuele Bassi -Date: Fri Jul 25 09:12:00 2014 +0100 - - Clean up the enumeration type template - - json-glib/json-enum-types.c.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit 415c75677544df6aa4929c851f44a412ea39b7b4 -Author: Emmanuele Bassi -Date: Fri Jul 25 09:10:52 2014 +0100 - - Include "config.h" in the enum types template - - Expands the symbol annotation correctly. - - json-glib/json-enum-types.c.in | 1 + - 1 file changed, 1 insertion(+) - -commit 2eab41a368620c28bb3c4f9fd0e1a20b2cfdce95 -Author: Tom Tryfonidis -Date: Wed Jul 9 23:21:14 2014 +0000 - - Updated Greek translation - - po/el.po | 80 ++++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 40 insertions(+), 40 deletions(-) - -commit e1141c9ea04a9f11b60d5278693edb819bcac7d9 -Author: Chun-wei Fan -Date: Mon Jun 9 18:29:01 2014 +0800 - - MSVC 2010+ Projects: Update "Installation" Process - - Currently, due to the way that Visual Studio 2010+ projects are handled, - the "install" project does not re-build upon changes to the sources, as it - does not believe that its dependencies have changed, although the changed - sources are automatically recompiled. This means that if a part or more - of the solution does not build, or if the sources need some other fixes - or enhancements, the up-to-date build is not copied automatically, which - can be misleading. - - Improve on the situation by forcing the "install" project to trigger its - rebuild, so that the updated binaries can be copied. This does trigger an - MSBuild warning, but having that warning is way better than not having an - up-to-date build, especially during testing and development. - - build/win32/vs10/install.vcxproj | 28 ++++++++++++++++------------ - build/win32/vs10/json-glib-install.props | 20 ++++++++++++++++---- - 2 files changed, 32 insertions(+), 16 deletions(-) - -commit a86c22b452afd1dc14916508b9303b7dcce71eff -Author: Gil Forcada -Date: Tue Jun 3 00:49:01 2014 +0200 - - [l10n] Update Catalan translation - - po/ca.po | 176 +++++++++++++++++++++++++++++++++++++++++++++++++-------------- - 1 file changed, 139 insertions(+), 37 deletions(-) - -commit 298a6f389d376b37f231966affad544b06a06be2 -Author: Emmanuele Bassi -Date: Thu May 29 10:06:13 2014 +0100 - - Post-release version bump to 1.0.3 - - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 82d10baa19383f22b3b8022b01be4ae1b08c968a -Author: Emmanuele Bassi -Date: Thu May 29 10:04:39 2014 +0100 - - Release JSON-GLib 1.0.2 - - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit bdb27fb70a831e14d569aaff9d7c452978da2236 -Author: Emmanuele Bassi -Date: Thu May 29 09:52:03 2014 +0100 - - build: Include enum-types.[ch] in the introspection sources - - Otherwise g-ir-scanner won't pick the types up, and will not notice that - the error enumerations have an associated error domain. - - https://bugzilla.gnome.org/show_bug.cgi?id=730917 - - json-glib/Makefile.am | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -commit 8bbc873dccb0426ce7e2ad0974b1397506454674 -Author: Stef Walter -Date: Wed May 21 12:14:57 2014 +0200 - - generator: Add tests for updated string escaping routine - - https://bugzilla.gnome.org/show_bug.cgi?id=730425 - - json-glib/tests/generator.c | 47 +++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 47 insertions(+) - -commit f2ee9a7e205abe5050fba37fa65aceceeb243898 -Author: Stef Walter -Date: Tue May 20 10:49:02 2014 +0200 - - generator: Escape the control characters correctly - - Escaping these as octals is out of the JSON spec completely, - so roll our own string encoder. - - https://bugzilla.gnome.org/show_bug.cgi?id=730425 - - json-glib/json-generator.c | 73 +++++++++++++++++++++++++++++----------------- - 1 file changed, 47 insertions(+), 26 deletions(-) - -commit 8f4816a2e05d0d3672d7723df2feaf466632c498 -Author: Stef Walter -Date: Tue May 20 10:43:29 2014 +0200 - - generator: Escape Object key names correctly - - Also fix empty keys, which are now encoded properly. - - https://bugzilla.gnome.org/show_bug.cgi?id=727593 - - json-glib/json-generator.c | 19 +++++++++++-------- - 1 file changed, 11 insertions(+), 8 deletions(-) - -commit 0898b9c335a21a82d92621e16be1b1038ccc6991 -Author: Christian Kirbach -Date: Mon Apr 28 17:27:32 2014 +0000 - - Updated German translation - - po/de.po | 175 +++++++++++++++++++++++++++++++++++++++++++++++++-------------- - 1 file changed, 138 insertions(+), 37 deletions(-) - -commit 62d9456c3d78286b662e7f96477617fd78358a18 -Author: Daniel Korostil -Date: Mon Apr 21 12:20:32 2014 +0300 - - Updated Ukrainian translation - - po/uk.po | 225 +++++++++++++++++++++++++++++++++++++++++++++++---------------- - 1 file changed, 168 insertions(+), 57 deletions(-) - -commit 13397eb080fee132a3d227a6b98b73e75364b4f5 -Author: djcb -Date: Mon Apr 7 17:13:47 2014 +0300 - - json-parser: use length parameter when validating utf-8 - - https://bugzilla.gnome.org/show_bug.cgi?id=727755 - - json-glib/json-parser.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit c9de87387f3b2494e4e770fd1d2ffca9ebfdbfe5 -Author: Emmanuele Bassi -Date: Thu Apr 17 15:30:32 2014 +0100 - - tests: Add more checks to the parser stream unit - - json-glib/tests/parser.c | 22 ++++++++++++++++------ - 1 file changed, 16 insertions(+), 6 deletions(-) - -commit e31683d2804916da23d1e48b80b124b37df1c8e6 -Author: Emmanuele Bassi -Date: Thu Apr 17 15:28:15 2014 +0100 - - parser: Use the right length for parsing the stream contents - - The ByteArray we use to buffer the contents of a stream in order to - pass them to the parser may have a bigger length. We should use the - cursor position that we use to put a '\0' in the buffer instead. We - could also use -1, but this saves us a strlen() later on. - - json-glib/json-parser.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 289e75bd35c5ee268269f09c9e2db90602994fc1 -Author: Chun-wei Fan -Date: Mon Apr 7 15:05:40 2014 +0800 - - Visual Studio Builds: Fix Installation of Headers - - json-version-macros.h needs to be installed as well, so fix that. - - build/win32/vs10/json-glib-install.props | 2 ++ - build/win32/vs9/json-glib-install.vsprops | 1 + - 2 files changed, 3 insertions(+) - -commit e645b5a383230ec5233cb0bd389e53e226a4bdd3 -Author: Piotr Drąg -Date: Sun Apr 6 17:46:40 2014 +0200 - - doap: update URLs - - json-glib.doap | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit b3e105fa890d4c63708b9cb9d372d9db16a636ff -Author: Matej Urbančič -Date: Thu Apr 3 20:37:41 2014 +0200 - - Updated Slovenian translation - - po/sl.po | 203 ++++++++++++++++++++++++++++++++++++++++++++++----------------- - 1 file changed, 150 insertions(+), 53 deletions(-) - -commit 82389b02f8b82eb5b3c37e38498975ebd15697ac -Author: Inaki Larranaga Murgoitio -Date: Thu Apr 3 17:39:19 2014 +0200 - - Updated Basque language - - po/eu.po | 184 +++++++++++++++++++++++++++++++++++++++++++++++++-------------- - 1 file changed, 144 insertions(+), 40 deletions(-) - -commit 18c76eff151fd29213401477c2c4a022eec9c698 -Author: Chun-wei Fan -Date: Tue Apr 1 19:40:12 2014 +0800 - - Fix MSVC Introspection Build - - Also substitute $(top_builddir), as it is used for json-version.h during - the scanning of the headers and sources. - - build/win32/gen-file-list-jsonglib.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -commit e0aef7ca7ba0c9d94ffa6e814caee956c139ad23 -Author: Emmanuele Bassi -Date: Tue Mar 25 11:53:25 2014 +0000 - - Post-release version bump to 1.0.1 - - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit cb7212b5ee71f18f4023e928884fd55ef54b9327 -Author: Emmanuele Bassi -Date: Tue Mar 25 11:50:36 2014 +0000 - - Release JSON-GLib 1.0.0 - - configure.ac | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit 19981d54171acff70f8a8987e0731fe1d8dd5d89 -Author: Gábor Kelemen -Date: Fri Mar 21 17:09:53 2014 +0000 - - Updated Hungarian translation - - po/hu.po | 181 +++++++++++++++++++++++++++++++++++++++++++++++++-------------- - 1 file changed, 141 insertions(+), 40 deletions(-) - -commit bf5295a8b72954bfff5ba89c389f8ace0d913082 -Author: Мирослав Николић -Date: Fri Mar 21 04:00:22 2014 +0100 - - Updated Serbian translation - - po/sr.po | 174 +++++++++++++++++++++++++++++++++++++++++++++------------ - po/sr@latin.po | 174 +++++++++++++++++++++++++++++++++++++++++++++------------ - 2 files changed, 274 insertions(+), 74 deletions(-) - -commit a8c56f54d5f47e35921e50a63e2a59190da13ad0 -Author: Chun-wei Fan -Date: Thu Mar 20 10:23:36 2014 +0800 - - Visual Studio Builds: Don't Generate .def File - - The symbols for json-glib is now exported via a visibility-based method, - like GLib and GTK+, so do likewise for the Visual Studio builds, by using - __declspec(dllexport). This will also mean that the .def file is no longer - needed to export the symbols for json-glib. - - build/win32/config.h.win32.in | 7 +++++ - build/win32/vs10/json-glib-gen-srcs.props | 7 ----- - build/win32/vs10/json-glib.vcxproj.filtersin | 1 - - build/win32/vs10/json-glib.vcxprojin | 18 ------------- - build/win32/vs9/json-glib-gen-srcs.vsprops | 7 ----- - build/win32/vs9/json-glib.vcprojin | 38 ---------------------------- - 6 files changed, 7 insertions(+), 71 deletions(-) - -commit b177715f1cb21edf5716a0768d6678096443ad51 -Author: Ask H. Larsen -Date: Wed Mar 19 22:31:43 2014 +0100 - - Updated Danish translation - - po/da.po | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++------------- - 1 file changed, 136 insertions(+), 35 deletions(-) - -commit 75f00bf9a9d3326444d77a400ca2d5a0378f8d32 -Author: Duarte Loreto -Date: Tue Mar 18 23:32:42 2014 +0000 - - Updated Portuguese translation - - po/pt.po | 179 +++++++++++++++++++++++++++++++++++++++++++++++++-------------- - 1 file changed, 140 insertions(+), 39 deletions(-) - -commit 7b9d72519777b313d094a0e63a9f138e3fafd54c -Author: Emmanuele Bassi -Date: Tue Mar 18 19:22:15 2014 +0000 - - build: Resync our copy of introspection.m4 - - build/autotools/introspection.m4 | 2 ++ - 1 file changed, 2 insertions(+) - -commit 5adb54c97fb5a87a609584727285f742cd0e2f09 -Author: Emmanuele Bassi -Date: Tue Mar 18 18:41:40 2014 +0000 - - build: Include $(top_builddir) - - Fixes compilation in cases where builddir != srcdir. - - json-glib/tests/Makefile.am | 2 ++ - 1 file changed, 2 insertions(+) - -commit d3fcd43a73061a64dc5f8b7551c138849a32b719 -Author: Emmanuele Bassi -Date: Tue Mar 18 18:10:14 2014 +0000 - - Remove conditional inclusion of config.h - - All the platforms and build system we support have a config.h header. - - json-glib/json-array.c | 2 -- - json-glib/json-builder.c | 2 -- - json-glib/json-debug.c | 2 -- - json-glib/json-gboxed.c | 2 -- - json-glib/json-generator.c | 2 -- - json-glib/json-gobject.c | 2 -- - json-glib/json-gvariant.c | 2 -- - json-glib/json-node.c | 2 -- - json-glib/json-object.c | 3 --- - json-glib/json-parser.c | 2 -- - json-glib/json-path.c | 2 -- - json-glib/json-reader.c | 4 ---- - json-glib/json-scanner.c | 2 -- - json-glib/json-serializable.c | 2 -- - json-glib/json-value.c | 2 -- - json-glib/tests/generator.c | 2 -- - json-glib/tests/invalid.c | 2 -- - json-glib/tests/parser.c | 2 -- - 18 files changed, 39 deletions(-) - -commit 445b1c4c1efec99ed640c16b92a9b19a87b39082 -Author: Emmanuele Bassi -Date: Thu Mar 6 15:09:50 2014 +0000 - - Add version constants to introspection - - We need to let g-ir-scanner parse json-version.h. - - json-glib/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit d3095c5f8fe91209cc98e1e2d7e75a8aad1e8d88 -Author: Emmanuele Bassi -Date: Thu Mar 6 15:09:04 2014 +0000 - - Reimplement JSON_VERSION_HEX as a macro call - - Add a JSON_ENCODE_VERSION macro and use it in JSON_VERSION_HEX. - - doc/reference/json-glib-sections.txt | 1 + - json-glib/json-version.h.in | 12 +++++++----- - 2 files changed, 8 insertions(+), 5 deletions(-) - -commit 794664746dcbe8894255f9615357dd51f7f836c3 -Author: Emmanuele Bassi -Date: Thu Mar 6 14:35:49 2014 +0000 - - Use compiler annotations to determine symbol visibility - - Instead of relying on a separate file that requires being update every - time we add a new public function we should use compiler annotations to - let the linker know which symbols are public and exported. - - In order to achieve this we have to: - - * check for the visibility=hidden attribute - * add -fvisibility=hidden to the linker flags - * add a macro to annotate all public symbols - - While we're at it, we should copy the versioned symbols macro layout - already used by GLib, GTK+, and other G* libraries, including the - ability to express the range of allowed versions of JSON-GLib that - third party code can compile against. - - configure.ac | 31 ++++++ - doc/reference/json-glib-sections.txt | 16 +++ - json-glib/Makefile.am | 47 ++++----- - json-glib/abicheck.sh | 6 -- - json-glib/json-builder.h | 15 +++ - json-glib/json-enum-types.h.in | 2 + - json-glib/json-generator.h | 13 +++ - json-glib/json-glib.h | 1 + - json-glib/json-glib.symbols | 191 ----------------------------------- - json-glib/json-gobject.h | 26 ++++- - json-glib/json-gvariant.h | 4 + - json-glib/json-parser.h | 13 ++- - json-glib/json-path.h | 6 ++ - json-glib/json-reader.h | 22 ++++ - json-glib/json-types.h | 103 +++++++++++++++++-- - json-glib/json-version-macros.h | 135 +++++++++++++++++++++++++ - 16 files changed, 391 insertions(+), 240 deletions(-) - -commit 50bf9cd2f6bc9fb21d9793377f0fd534732d215d -Author: Emmanuele Bassi -Date: Thu Mar 6 13:58:52 2014 +0000 - - docs: Drop the SGML mode - - The whole documentation is now MarkDown. - - doc/reference/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 20c861f02f8e41cde2dec92f9d63d8266383c26b -Author: Emmanuele Bassi -Date: Thu Mar 6 13:58:15 2014 +0000 - - docs: Port to MarkDown - - Drop the DocBook documentation, and move everything to the MarkDown - format used by modern gtk-doc. - - json-glib/json-array.c | 4 +- - json-glib/json-builder.c | 2 +- - json-glib/json-builder.h | 7 +- - json-glib/json-gboxed.c | 2 +- - json-glib/json-generator.c | 9 +- - json-glib/json-gobject.c | 4 +- - json-glib/json-gobject.h | 2 +- - json-glib/json-gvariant.c | 64 ++++------ - json-glib/json-node.c | 13 +- - json-glib/json-object.c | 9 +- - json-glib/json-path.c | 268 +++++++++++++++++------------------------- - json-glib/json-path.h | 9 +- - json-glib/json-reader.c | 19 ++- - json-glib/json-reader.h | 7 +- - json-glib/json-serializable.c | 10 +- - 15 files changed, 181 insertions(+), 248 deletions(-) - -commit ff018d7e560278d65a03c4de71c3cf11b22d3167 -Author: Emmanuele Bassi -Date: Tue Mar 4 18:30:31 2014 +0000 - - build: Bump up the requirement for gtk-doc - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 36872776b354d2b4b39f9da8e12dd51e949b6c90 -Author: Emmanuele Bassi -Date: Sun Mar 2 14:26:44 2014 +0000 - - scanner: Clean up the UTF-16 surrogate pairs decoding - - We over-assert() our pre-conditions, and the conversion is a bit - obfuscated. We should use a proper function, and de-obfuscate the - code so that the intent is clear. - - json-glib/json-scanner.c | 42 ++++++++++++++++++++++++++++++++++++------ - 1 file changed, 36 insertions(+), 6 deletions(-) - -commit 16396ab205a5f9bfe7a68aec436fe916bbbee342 -Author: Seong-ho Cho -Date: Sun Mar 16 22:18:26 2014 +0900 - - Updated Korean translation - - po/ko.po | 189 ++++++++++++++++++++++++++++++++++++++++++++++++--------------- - 1 file changed, 145 insertions(+), 44 deletions(-) - -commit 87804f9cf3d5cb643b1d92ee8b26547158fbf41a -Author: Claude Paroz -Date: Tue Mar 11 22:44:07 2014 +0100 - - Updated French translation - - po/fr.po | 185 +++++++++++++++++++++++++++++++++++++++++++++++---------------- - 1 file changed, 139 insertions(+), 46 deletions(-) - -commit e2fd54326c3dfa3927c9e78d865ed349b022a7d3 -Author: Yuri Myasoedov -Date: Tue Mar 11 12:23:24 2014 +0400 - - Updated Russian translation - - po/ru.po | 75 ++++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 37 insertions(+), 38 deletions(-) - -commit fd3ccd2c7c19305d099b98c62ad6c0dae536f6bc -Author: Rūdolfs Mazurs -Date: Fri Mar 7 16:52:22 2014 +0200 - - Updated Latvian translation - - po/lv.po | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++------------- - 1 file changed, 135 insertions(+), 35 deletions(-) - -commit e76f0283c3605fb04fb03e5aee56200c1abece2e -Author: Chun-wei Fan -Date: Thu Mar 6 18:47:47 2014 +0800 - - Visual Studio 2010 Projects: Add PlatformToolset Tag - - This adds a PlatformToolset tag to each configuration so that the projects - can be updated to Visual Studio 2012 or 2013 formats quite easily, using - Visual Studio's round-tripping feature which actually looks at this tag. - - This, for example, can be quite easily processed by a script to produce - the Visual Studio 2012 and 2013 projects. - - build/win32/vs10/array.vcxproj | 4 ++++ - build/win32/vs10/boxed.vcxproj | 4 ++++ - build/win32/vs10/builder.vcxproj | 4 ++++ - build/win32/vs10/generator.vcxproj | 4 ++++ - build/win32/vs10/gvariant.vcxproj | 4 ++++ - build/win32/vs10/install.vcxproj | 4 ++++ - build/win32/vs10/invalid.vcxproj | 4 ++++ - build/win32/vs10/json-glib-format.vcxproj | 4 ++++ - build/win32/vs10/json-glib-validate.vcxproj | 4 ++++ - build/win32/vs10/json-glib.vcxprojin | 4 ++++ - build/win32/vs10/node.vcxproj | 4 ++++ - build/win32/vs10/object.vcxproj | 4 ++++ - build/win32/vs10/parser.vcxproj | 4 ++++ - build/win32/vs10/path.vcxproj | 4 ++++ - build/win32/vs10/reader.vcxproj | 4 ++++ - build/win32/vs10/serialize-complex.vcxproj | 4 ++++ - build/win32/vs10/serialize-full.vcxproj | 4 ++++ - build/win32/vs10/serialize-simple.vcxproj | 4 ++++ - 18 files changed, 72 insertions(+) - -commit da66fd86764d12640ad2d53a869c77df31f5bd82 -Author: Piotr Drąg -Date: Mon Mar 3 01:05:53 2014 +0100 - - Updated Polish translation - - po/pl.po | 169 ++++++++++++++++++++++++++++++++++++++++++++++++++------------- - 1 file changed, 135 insertions(+), 34 deletions(-) - -commit a4d731db0780a87304c98be412d72d615b277592 -Author: Chun-wei Fan -Date: Tue Feb 25 13:09:32 2014 +0800 - - MSVC Builds: Update Introspection Build Process - - GObject-Introspection was recently changed to support acquiring the name of - the DLL from a library (.lib, etc) that was passed into g-ir-scanner on - Windows, like the *nix builds, instead of directly passing in the name of - the DLL. - - This updates the introspection build process, so that introspection files - for JSON-GLib can continue to be properly built. - - build/win32/json-glib-introspection-msvc.mak | 9 ++------- - 1 file changed, 2 insertions(+), 7 deletions(-) - -commit 9dc47a1f4e66f871e435675ebe09b554b9fc9e8c -Author: Sphinx Jiang -Date: Sat Feb 22 01:28:27 2014 +0000 - - Updated Chinese (China) translation - - po/zh_CN.po | 113 +++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 58 insertions(+), 55 deletions(-) - -commit 843b41e885c2528cb6f146f415a50582c07eaef6 -Author: Aurimas Černius -Date: Fri Feb 21 23:18:30 2014 +0200 - - Updated Lithuanian translation - - po/lt.po | 103 ++++++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 56 insertions(+), 47 deletions(-) - -commit d8de1631c41333ba72a11658a2102bb42fb15d09 -Author: Emmanuele Bassi -Date: Fri Feb 14 17:56:10 2014 +0000 - - Add missing annotations - - JsonNode, JsonObject, and JsonArray have various constructors, so we - need to annotate them. - - json-glib/json-array.c | 10 +++++----- - json-glib/json-node.c | 2 +- - json-glib/json-object.c | 6 +++--- - 3 files changed, 9 insertions(+), 9 deletions(-) - -commit 4726ccc490a30aeff95b7c01fc6c44dbce36a7f4 -Author: Kjartan Maraas -Date: Wed Feb 12 19:47:31 2014 +0100 - - Updated Norwegian bokmål translation - - po/nb.po | 167 ++++++++++++++++++++++++++++++++++++++++++++++++++------------- - 1 file changed, 134 insertions(+), 33 deletions(-) - -commit d97be101490a46c72f919d3dc45f4bc06e625e0c -Author: Chun-wei Fan -Date: Fri Feb 7 11:39:29 2014 +0800 - - tools: Fix build on Visual Studio - - As unistd.h is not universally available, don't include it unconditionally - and include the corresponding Windows headers where necessary. Also, use - gssize in place of ssize_t and define STDOUT_FILENO on Windows when we - don't have unistd.h, which is a constant that is defined in unistd.h. - - https://bugzilla.gnome.org/show_bug.cgi?id=723813 - - json-glib/json-glib-format.c | 11 ++++++++++- - json-glib/json-glib-validate.c | 2 ++ - 2 files changed, 12 insertions(+), 1 deletion(-) - -commit 0b1397ad168078bf2b588ab413ad921c04aab8a2 -Author: Chun-wei Fan -Date: Fri Feb 7 18:55:32 2014 +0800 - - MSVC Builds: Rework Introspection Files Build - - Use a set of NMake Makefiles in place of custom Visual Studio Projects to - generate the introspection files for JSON-GLib. - - Although this means that one needs to build the introspection files in two - stages, namely using the projects to build the JSON-GLib DLL and then - running this NMake Makefile to generate the introspection files. The - original approach required setting lots of environment variables for the - building of introspection files to work. Using NMake Makefiles will make - it clearer to the one building the introspection files on what items and - variables are needed exactly to do the job - - build/win32/Makefile.am | 4 +- - build/win32/detectenv_msvc.mak | 65 +++++++++++++ - build/win32/gengir_jsonglib.bat | 132 --------------------------- - build/win32/introspection-msvc.mak | 79 ++++++++++++++++ - build/win32/json-glib-introspection-msvc.mak | 64 +++++++++++++ - 5 files changed, 211 insertions(+), 133 deletions(-) - -commit ed7f9df3c09209749d0d1be0917a80ad6a4f7546 -Author: Chun-wei Fan -Date: Fri Feb 7 18:33:32 2014 +0800 - - Overhaul the Visual Studio 2010 Projects - - Split up the property sheets used to build JSON-GLib. Also add projects to - build and "install" the json-glib-validate and json-glib-format tools. - - Move the introspection file generation out of the Visual Studio projects - to add an NMake Makefile later to generate the introspection files, to make - the process clearer to people. - - Stop installing the test programs, although they continue to be built from - the projects for now. - - build/win32/vs10/Makefile.am | 20 ++- - build/win32/vs10/array.vcxproj | 12 +- - build/win32/vs10/array.vcxproj.filters | 2 +- - build/win32/vs10/boxed.vcxproj | 10 +- - build/win32/vs10/boxed.vcxproj.filters | 2 +- - build/win32/vs10/builder.vcxproj | 10 +- - build/win32/vs10/builder.vcxproj.filters | 2 +- - build/win32/vs10/generator.vcxproj | 10 +- - build/win32/vs10/generator.vcxproj.filters | 2 +- - build/win32/vs10/gengir.vcxproj | 104 ------------- - build/win32/vs10/gvariant.vcxproj | 10 +- - build/win32/vs10/gvariant.vcxproj.filters | 2 +- - build/win32/vs10/install.vcxproj | 76 ++-------- - build/win32/vs10/invalid.vcxproj | 10 +- - build/win32/vs10/invalid.vcxproj.filters | 2 +- - build/win32/vs10/json-glib-build-defines.props | 30 ++++ - build/win32/vs10/json-glib-format.vcxproj | 162 +++++++++++++++++++++ - build/win32/vs10/json-glib-format.vcxproj.filters | 14 ++ - build/win32/vs10/json-glib-gen-srcs.props | 24 +++ - build/win32/vs10/json-glib-install.props | 60 ++++++++ - build/win32/vs10/json-glib-validate.vcxproj | 162 +++++++++++++++++++++ - .../win32/vs10/json-glib-validate.vcxproj.filters | 14 ++ - build/win32/vs10/json-glib-version-paths.props | 54 +++++++ - build/win32/vs10/json-glib.props | 150 ------------------- - build/win32/vs10/json-glib.sln | 50 ++++--- - build/win32/vs10/json-glib.vcxproj.filtersin | 3 +- - build/win32/vs10/json-glib.vcxprojin | 28 ++-- - build/win32/vs10/node.vcxproj | 10 +- - build/win32/vs10/node.vcxproj.filters | 2 +- - build/win32/vs10/object.vcxproj | 10 +- - build/win32/vs10/object.vcxproj.filters | 2 +- - build/win32/vs10/parser.vcxproj | 10 +- - build/win32/vs10/parser.vcxproj.filters | 2 +- - build/win32/vs10/path.vcxproj | 10 +- - build/win32/vs10/path.vcxproj.filters | 2 +- - build/win32/vs10/reader.vcxproj | 10 +- - build/win32/vs10/reader.vcxproj.filters | 2 +- - build/win32/vs10/serialize-complex.vcxproj | 10 +- - build/win32/vs10/serialize-complex.vcxproj.filters | 2 +- - build/win32/vs10/serialize-full.vcxproj | 10 +- - build/win32/vs10/serialize-full.vcxproj.filters | 2 +- - build/win32/vs10/serialize-simple.vcxproj | 10 +- - build/win32/vs10/serialize-simple.vcxproj.filters | 2 +- - 43 files changed, 680 insertions(+), 441 deletions(-) - -commit 1e0ef4493d485bfc211bcb2af2f212a3f26a800e -Author: Chun-wei Fan -Date: Fri Feb 7 11:52:48 2014 +0800 - - Fix Commit of Visual Studio 2008 Projects - - Left out the update to json-glib.vcprojin, oops :| - - build/win32/vs9/json-glib.vcprojin | 58 +++++++++++++++++++++++++------------- - 1 file changed, 38 insertions(+), 20 deletions(-) - -commit 7053ea79f4c90f26e7e25c598a6a1617fbcea990 -Author: Chun-wei Fan -Date: Fri Feb 7 11:35:47 2014 +0800 - - Overhaul the Visual Studio 2008 Projects - - Split up the property sheets used to build JSON-GLib, and make all the - projects (*.vcproj) and property sheets (*.vsprops) use UNIX line endings - to simplify future maintenance. Also add projects to build and "install" - the json-glib-validate and json-glib-format tools. - - Move the introspection file generation out of the Visual Studio projects - to add an NMake Makefile later to generate the introspection files, to make - the process clearer to people. - - Stop installing the test programs, although they continue to be built from - the projects for now. - - Similar changes to the Visual Studio 2010 projects will follow. - - build/win32/vs9/Makefile.am | 20 +- - build/win32/vs9/array.vcproj | 306 +++++++++++----------- - build/win32/vs9/boxed.vcproj | 8 +- - build/win32/vs9/builder.vcproj | 306 +++++++++++----------- - build/win32/vs9/generator.vcproj | 306 +++++++++++----------- - build/win32/vs9/gengir.vcproj | 77 ------ - build/win32/vs9/gvariant.vcproj | 8 +- - build/win32/vs9/install.vcproj | 160 ++++++------ - build/win32/vs9/invalid.vcproj | 306 +++++++++++----------- - build/win32/vs9/json-glib-build-defines.vsprops | 25 ++ - build/win32/vs9/json-glib-format.vcproj | 151 +++++++++++ - build/win32/vs9/json-glib-gen-srcs.vsprops | 19 ++ - build/win32/vs9/json-glib-install.vsprops | 37 +++ - build/win32/vs9/json-glib-validate.vcproj | 151 +++++++++++ - build/win32/vs9/json-glib-version-paths.vsprops | 53 ++++ - build/win32/vs9/json-glib.sln | 75 +++--- - build/win32/vs9/json-glib.vsprops | 127 ---------- - build/win32/vs9/node.vcproj | 306 +++++++++++----------- - build/win32/vs9/object.vcproj | 302 +++++++++++----------- - build/win32/vs9/parser.vcproj | 324 ++++++++++++------------ - build/win32/vs9/path.vcproj | 8 +- - build/win32/vs9/reader.vcproj | 308 +++++++++++----------- - build/win32/vs9/serialize-complex.vcproj | 8 +- - build/win32/vs9/serialize-full.vcproj | 8 +- - build/win32/vs9/serialize-simple.vcproj | 8 +- - 25 files changed, 1821 insertions(+), 1586 deletions(-) - -commit 7b865790ae3233a0636fdc780f843143a7e94a01 -Author: Chun-wei Fan -Date: Fri Feb 7 10:23:40 2014 +0800 - - Update build/win32/config.h.win32.in - - Make its entries reflect the entries that are being checked by the - autotools build, and also make the entries reflect the situation on - non-Visual C++ and newer Visual Studio versions better. - - build/win32/config.h.win32.in | 18 +++++++++++++----- - 1 file changed, 13 insertions(+), 5 deletions(-) - -commit 4f7dd7f5b004f1bcd478572c1cb6f2dd6822add1 -Author: Emmanuele Bassi -Date: Mon Feb 3 23:50:34 2014 +0000 - - Post-release version bump to 0.99.3 - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 43f40339eae66e0f6545da7638f36c9b07de0bab -Author: Emmanuele Bassi -Date: Mon Feb 3 23:49:11 2014 +0000 - - Release JSON-GLib 0.99.2 (1.0.0-rc1) - - First release candidate for JSON-GLib. - - NEWS | 9 +++++++++ - configure.ac | 4 ++-- - 2 files changed, 11 insertions(+), 2 deletions(-) - -commit 3c627b1e44172184f54399b03d10c1637265649b -Author: Emmanuele Bassi -Date: Mon Feb 3 23:46:56 2014 +0000 - - build: Add missing file - - We need to dist the tap-test script. - - build/autotools/Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -commit a482772a181c6ee3bd5a8d74c04b8ff9186b43f8 -Author: Emmanuele Bassi -Date: Mon Feb 3 23:45:24 2014 +0000 - - build: Remove bogus rules - - We don't need check targets any more. - - build/Makefile.am | 10 ---------- - 1 file changed, 10 deletions(-) - -commit 627a1b3f0343666923e95ebead0c7be821d29148 -Author: Emmanuele Bassi -Date: Mon Feb 3 23:33:44 2014 +0000 - - build: Remove type init option for gtk-doc - - We're building against a required version of GLib that does not need - type initialization. - - doc/reference/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 501c9fb3805c9236fc008032295e0cdd87c4df47 -Author: Bastien Nocera -Date: Sat Feb 1 22:52:27 2014 +0100 - - reader: When a read() fails, don't track back on end() - - When a call to json_reader_read_element() fails if the element - doesn't exist, we need to call json_reader_end_element() to clear - out any errors. - - But the _end_element() call will backtrack to the parent node, - when the _read_element() call did not set the child node. - - To fix this, leave early from _end_*() calls when an error has - been set. - - https://bugzilla.gnome.org/show_bug.cgi?id=723428 - - json-glib/json-reader.c | 16 ++++++++++++---- - 1 file changed, 12 insertions(+), 4 deletions(-) - -commit 40abd7add9e3fa7288fdd144fd96da5270a86663 -Author: Bastien Nocera -Date: Sat Feb 1 23:31:02 2014 +0100 - - tests: Add new test for reader level bug - - https://bugzilla.gnome.org/show_bug.cgi?id=723428 - - json-glib/tests/reader.c | 43 +++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 43 insertions(+) - -commit 440f735349aa30ce34957e50786a528e96335442 -Author: Bastien Nocera -Date: Fri Dec 27 17:14:06 2013 +0100 - - reader: Fix example code for json_reader_read_member() - - Fix cut'n'paste error. - - https://bugzilla.gnome.org/show_bug.cgi?id=721137 - - json-glib/json-reader.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit bce10169c945a551e589267ee698fd39917813c6 -Author: Chao-Hsiung Liao -Date: Sun Feb 2 20:40:35 2014 +0800 - - Updated Traditional Chinese translation(Hong Kong and Taiwan) - - po/zh_HK.po | 174 +++++++++++++++++++++++++++++++++++++++++++++++------------- - po/zh_TW.po | 174 +++++++++++++++++++++++++++++++++++++++++++++++------------- - 2 files changed, 274 insertions(+), 74 deletions(-) - -commit 3e9b53978f36543a1537da8075b7c74e1eb1ffcf -Author: Daniel Mustieles -Date: Thu Jan 23 12:53:38 2014 +0100 - - Updated FSF's address - - json-glib/json-scanner.c | 4 +--- - json-glib/json-scanner.h | 4 +--- - 2 files changed, 2 insertions(+), 6 deletions(-) - -commit 668975eac681d84a041d6da8df8ccc71b92bb971 -Author: Yosef Or Boczko -Date: Sun Jan 26 05:32:33 2014 +0200 - - Added Hebrew translation - - Signed-off-by: Yosef Or Boczko - - po/he.po | 263 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 263 insertions(+) - -commit 5fb0b925adb517445c0347f04fe281952b614b37 -Author: Wylmer Wang -Date: Fri Jan 24 21:40:10 2014 +0800 - - Update Chinese simplified translation - - po/zh_CN.po | 175 +++++++++++++++++++++++++++++++++++++++++++++++------------- - 1 file changed, 138 insertions(+), 37 deletions(-) - -commit 7d1457e0f1c8d142647811005c9c348104c43287 -Author: Marek Černocký -Date: Sat Jan 18 22:46:35 2014 +0100 - - Updated Czech translation - - po/cs.po | 175 +++++++++++++++++++++++++++++++++++++++++++++++++-------------- - 1 file changed, 138 insertions(+), 37 deletions(-) - -commit 67571cf0b7b3dacb24726c05aa9fbc7a6d4060c1 -Author: Yuri Myasoedov -Date: Sun Jan 12 22:35:31 2014 +0400 - - Updated Russian translation - - po/ru.po | 180 +++++++++++++++++++++++++++++++++++++++++++++++++-------------- - 1 file changed, 141 insertions(+), 39 deletions(-) - -commit 8502517892c656b6f68034cc5f36254bae67cafc -Author: Dimitris Spingos -Date: Tue Jan 7 09:53:59 2014 +0200 - - Updated Greek translation - - po/el.po | 45 +++++++++++++++++++++++++++------------------ - 1 file changed, 27 insertions(+), 18 deletions(-) - -commit e919cfbbdce0b684566a0cd6e60bdd87a654e718 -Author: Rafael Ferreira -Date: Fri Jan 3 06:05:58 2014 -0200 - - Updated Brazilian Portuguese translation - - po/pt_BR.po | 48 +++++++++++++++++++++++++++++------------------- - 1 file changed, 29 insertions(+), 19 deletions(-) - -commit f16d9b82c4d36e949620f5ef6105985c087d438e -Author: Andika Triwidada -Date: Thu Jan 2 23:39:49 2014 +0700 - - Updated Indonesian translation - - po/id.po | 182 +++++++++++++++++++++++++++++++++++++++++++++++++-------------- - 1 file changed, 141 insertions(+), 41 deletions(-) - -commit 314419676c5d7f4f2c19c530bcb9ced6972a8040 -Author: Victor Ibragimov -Date: Fri Dec 20 14:32:41 2013 +0500 - - Tajik translation updated - - po/tg.po | 175 ++++++++++++++++++++++++++++++++++++++++++++++++++------------- - 1 file changed, 139 insertions(+), 36 deletions(-) - -commit 11fd007fcb4734b5640d1481407d6fa0c4943256 -Author: Fran Diéguez -Date: Thu Dec 19 01:13:28 2013 +0100 - - Updated Galician translations - - po/gl.po | 39 ++++++++++++++++++++++++--------------- - 1 file changed, 24 insertions(+), 15 deletions(-) - -commit 8bceaafd95ac36c531e1a1bf079c031d1c0785ab -Author: Milo Casagrande -Date: Wed Dec 11 10:47:36 2013 +0100 - - [l10n] Updated Italian translation. - - po/it.po | 173 ++++++++++++++++++++++++++++++++++++++++++++++++++------------- - 1 file changed, 138 insertions(+), 35 deletions(-) - -commit 0cba330f3b24d4c2fd8ba79cabddc23d6e7e8063 -Author: Daniel Mustieles -Date: Mon Dec 9 16:03:35 2013 +0100 - - Updated Spanish translation - - po/es.po | 30 +++++++++++++++++++++--------- - 1 file changed, 21 insertions(+), 9 deletions(-) - -commit 0d6a2da5775de27160f9fd0bad783cb7d45d8dac -Author: Emmanuele Bassi -Date: Wed Dec 4 12:43:37 2013 +0000 - - Make json-gvariant.h conform to the other headers - - Only include the necessary headers, and use a single-header inclusion - guard to prevent people from including only json-gvariant.h. - - json-glib/json-gvariant.c | 5 +++++ - json-glib/json-gvariant.h | 7 +++++-- - 2 files changed, 10 insertions(+), 2 deletions(-) - -commit 0de776ea67869b692ee8bd709fd70c0e2368d9fc -Author: Emmanuele Bassi -Date: Wed Dec 4 12:41:06 2013 +0000 - - Move the single include guard after multiple inclusion one - - GCC (and other compilers) can optimise multiple inclusion of headers if - they find the: - - #ifndef FOO - #define FOO - - #endif - - pattern as the first thing inside a header. The single-header inclusion - guard was preventing that from happening, so we need to move it inside - the multiple inclusion guard. - - json-glib/json-builder.h | 6 +++--- - json-glib/json-enum-types.h.in | 6 +++--- - json-glib/json-generator.h | 6 +++--- - json-glib/json-parser.h | 6 +++--- - json-glib/json-path.h | 6 +++--- - json-glib/json-reader.h | 6 +++--- - json-glib/json-types.h | 6 +++--- - json-glib/json-version.h.in | 6 +++--- - 8 files changed, 24 insertions(+), 24 deletions(-) - -commit b3072da5a2e897b2b87f84d30485bf316c4476fb -Author: Emmanuele Bassi -Date: Mon Dec 2 14:34:20 2013 +0000 - - tests/gvariant: Use G_N_ELEMENTS - - Instead of sizeof(array)/sizeof(type). - - json-glib/tests/gvariant.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -commit 64b4f936617e781e9a3677cf98b2abde94b8ef2a -Author: Joseph Artsimovich -Date: Tue Sep 3 11:30:08 2013 +0100 - - Make JSON to GVariant conversion handle some string to number conversions. - - Consider the following JSON: ["123"] - Trying to convert it to GVariant with signature "(i)" would previously fail, - as string-to-number conversions weren't implemented. This patch implements - string-to-number and string-to-boolean conversions. - - https://bugzilla.gnome.org/show_bug.cgi?id=707382 - - json-glib/json-gvariant.c | 24 ++++++++++++++++++++++++ - json-glib/tests/gvariant.c | 37 ++++++++++++++++++++++++++++++------- - 2 files changed, 54 insertions(+), 7 deletions(-) - -commit 35562f291b7bf1bae88d7e5f78d7be163ca263d6 -Author: bi -Date: Thu May 16 14:00:03 2013 +0200 - - Add tests for json paths (2 invalids, 1 valid) - - Signed-off-by: Emmanuele Bassi - - Conflicts: - json-glib/tests/path.c - - json-glib/tests/path.c | 24 ++++++++++++++++++++++++ - 1 file changed, 24 insertions(+) - -commit d82420c14b19f29a993b7754ff1128b3524c4ad7 -Author: bi -Date: Wed May 15 17:35:26 2013 +0200 - - Handle invalid path: invalid first character - - Signed-off-by: Emmanuele Bassi - - Conflicts: - json-glib/json-path.c - - json-glib/json-path.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -commit e4a054484774fd0849ca18617b6e20d15964fdd8 -Author: bi -Date: Wed May 15 16:19:55 2013 +0200 - - path: compile and query path '$' to retrieve root node - - Signed-off-by: Emmanuele Bassi - - json-glib/json-path.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -commit b5570400cbd95f46373dfce2877c6599802bec21 -Author: bi -Date: Wed May 15 16:06:48 2013 +0200 - - Handle invalid path : missing member name after . - - Signed-off-by: Emmanuele Bassi - - json-glib/json-path.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -commit 730761d0ab3b9a72cea0b5cf806e656ec93f8a11 -Author: Emmanuele Bassi -Date: Mon Dec 2 11:11:25 2013 +0000 - - docs: Add wiki link to the README file - - README.md | 2 ++ - 1 file changed, 2 insertions(+) - -commit 4df9e2a6157e9d874e6393f50143bb28bdef3ef8 -Author: Emmanuele Bassi -Date: Mon Dec 2 11:05:53 2013 +0000 - - docs: Further clean ups of the README - - Reword the description, and fit everything on a 80 columns margin. - - README.md | 48 ++++++++++++++++++++++++------------------------ - 1 file changed, 24 insertions(+), 24 deletions(-) - -commit 567d6470f4fc88a650dd11ed28f414537dd4c6da -Author: Emmanuele Bassi -Date: Mon Dec 2 11:00:19 2013 +0000 - - Clean up the README - - Update the requirements, and clean up the text. - - README.md | 47 +++++++++++++++++++++++++++-------------------- - 1 file changed, 27 insertions(+), 20 deletions(-) - -commit 3c0ec689cdba1379791da3bcc1ad07c46416ac9a -Author: Emmanuele Bassi -Date: Mon Dec 2 10:46:57 2013 +0000 - - build: Move the pkg-config file under json-glib - - The pkg-config file for a library is tied to the source, so it should - not be in the top-level of the project. - - Makefile.am | 11 ----------- - configure.ac | 3 +-- - json-glib.pc.in | 11 ----------- - json-glib/Makefile.am | 10 ++++++++++ - json-glib/json-glib.pc.in | 11 +++++++++++ - 5 files changed, 22 insertions(+), 24 deletions(-) - -commit 287628bc003ae3d3e1893898c5e1a8959f895f52 -Author: Emmanuele Bassi -Date: Mon Dec 2 10:41:37 2013 +0000 - - build: Drop unnecessary linker flags - - The -no-undefined linker flag is needed only when compiling for Windows, - and it's added conditionally. Except that we also add it unconditionally - in the LDFLAGS used for the libjson-glib-1.0 shared object. Whoopsie. - - We should also drop the unneeded -rpath: distributions will go out of - their way to patch it out in any case. - - json-glib/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 7ab837c98a10cc1464318e4e4d04426b6fcc070b -Author: Emmanuele Bassi -Date: Mon Dec 2 10:40:43 2013 +0000 - - build: Fix syntax error in --enable-man define - - A missing comma was triggering a bad substitution and a warning when - running the configure script. - - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 45e06f80b97e4b2dc0d6a1a6c806013a07113262 -Author: Emmanuele Bassi -Date: Mon Dec 2 10:30:13 2013 +0000 - - build: Clean up unnecessary complications - - We don't need a custom Makefile for quiet rules: AM_V_GEN is pretty much - all we use anyway. - - The Makefile.am.gtest file is not included any longer, since we switched - to TAP and GLib's own rules for unit testing. - - Makefile.am | 12 +++--- - build/autotools/Makefile.am | 1 - - build/autotools/Makefile.am.enums | 4 +- - build/autotools/Makefile.am.gitignore | 2 +- - build/autotools/Makefile.am.gtest | 74 ----------------------------------- - build/autotools/Makefile.am.marshal | 4 +- - build/autotools/Makefile.am.silent | 11 ------ - configure.ac | 2 - - doc/reference/Makefile.am | 11 ------ - json-glib/Makefile.am | 2 - - 10 files changed, 10 insertions(+), 113 deletions(-) - -commit 01614d512891057ed417768a85868a1382fd9bc0 -Author: Aurimas Černius -Date: Sun Dec 1 18:07:23 2013 +0200 - - Updated Lithuanian translation - - po/lt.po | 196 ++++++++++++++++++++++++++++++++++++++++++++++----------------- - 1 file changed, 143 insertions(+), 53 deletions(-) - -commit cda0a32cc6e2e45e4af58eb53a31fbfc0a9cc9ff -Author: Emmanuele Bassi -Date: Sat Nov 23 12:45:59 2013 +0000 - - build: Use the correct TAP driver - - Re-sync with GLib's TAP harness. - - build/autotools/Makefile.am | 3 +- - build/autotools/glib-tap.mk | 2 +- - build/autotools/tap-driver.sh | 652 ++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 655 insertions(+), 2 deletions(-) - -commit 36cc15ea015640a044d499cdf983f76e11184286 -Author: Dimitris Spingos -Date: Thu Nov 14 11:25:18 2013 +0200 - - Updated Greek translation - - po/el.po | 169 ++++++++++++++++++++++++++++++++++++++++++++++++--------------- - 1 file changed, 130 insertions(+), 39 deletions(-) - -commit 9931570f6df75093e31c6770361f2f4544d846da -Author: Fran Diéguez -Date: Fri Nov 1 15:29:07 2013 +0100 - - Updated Galician translations - - po/gl.po | 164 +++++++++++++++++++++++++++++++++++++++++++++++++-------------- - 1 file changed, 128 insertions(+), 36 deletions(-) - -commit e21f7de27c64748a44985af9165cbb9066b19bbc -Author: Daniel Mustieles -Date: Thu Oct 31 18:23:18 2013 +0100 - - Updated Spanish translation - - po/es.po | 178 +++++++++++++++++++++++++++++++++++++++++++++++---------------- - 1 file changed, 133 insertions(+), 45 deletions(-) - -commit 80a6da1d5571f4a75a4de83ff7d63dd6668dbc94 -Author: Emmanuele Bassi -Date: Mon Oct 28 12:55:43 2013 +0000 - - docs: Include tool man pages in the API reference - - The small utilities we ship should have their main pages included in the - API reference, similarly to what GLib does. - - doc/reference/json-glib-docs.xml | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -commit 42c36ba1c5a04a60bf1a6ec221c722b6c0136562 -Author: Emmanuele Bassi -Date: Mon Oct 28 11:17:06 2013 +0000 - - Improve consistency in error messages - - Use the same spacing and formatting rules. - - json-glib/json-glib-format.c | 4 ++-- - json-glib/json-glib-validate.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -commit a6816327ece4edbce8903967780364638752616a -Author: Enrico Nicoletto -Date: Mon Oct 28 09:04:56 2013 -0200 - - Updated Brazilian Portuguese translation - - po/pt_BR.po | 170 ++++++++++++++++++++++++++++++++++++++++++++++-------------- - 1 file changed, 132 insertions(+), 38 deletions(-) - -commit 06ba2cd30373f2043fe1f09a12e11eae52aa5842 -Author: Emmanuele Bassi -Date: Mon Oct 28 00:07:33 2013 +0000 - - po: Add utilities to the POTFILES - - They come with translatable strings. - - po/POTFILES.in | 2 ++ - 1 file changed, 2 insertions(+) - -commit 15d5439f05ecf933258c19995fc684f709327541 -Author: Emmanuele Bassi -Date: Sun Oct 27 23:45:33 2013 +0000 - - Add abicheck.sh test output to the ignored files - - .gitignore | 1 + - 1 file changed, 1 insertion(+) - -commit 8ec28bcaac3d5134670e5f51fbd8646ec741e8c7 -Author: Emmanuele Bassi -Date: Sun Oct 27 23:43:19 2013 +0000 - - build: Clean up configure summary - - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -commit 436ed4f2b0ce86764c84af8e0ad4b1181a287050 -Author: Emmanuele Bassi -Date: Sun Oct 27 23:11:56 2013 +0000 - - docs: Add infrastructure to build man pages - - The small utilities we build and install should have their own manual - pages. - - .gitignore | 2 + - build/autotools/Makefile.am | 1 + - build/autotools/jh-catalog.m4 | 54 ++++++++++++++++++++++++ - configure.ac | 50 ++++++++++++++++++++++ - doc/reference/Makefile.am | 31 ++++++++++++-- - doc/reference/json-glib-format.xml | 81 ++++++++++++++++++++++++++++++++++++ - doc/reference/json-glib-validate.xml | 67 +++++++++++++++++++++++++++++ - 7 files changed, 283 insertions(+), 3 deletions(-) - -commit 848e954addf5a9a54beb37d86f684b37d0d595f1 -Author: Emmanuele Bassi -Date: Sun Oct 27 16:43:54 2013 +0000 - - Add format tool - - A simple command line utility to format JSON data; it allows prettifying - and unprettifying JSON. - - .gitignore | 1 + - json-glib/Makefile.am | 5 +- - json-glib/json-glib-format.c | 211 +++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 216 insertions(+), 1 deletion(-) - -commit 1fcc3dd0956ae381444f2b1808f39424a2192a6f -Author: Emmanuele Bassi -Date: Sat Oct 26 20:44:31 2013 +0100 - - Add validation tool - - The json-glib-validate tool is a small utility that validates the data - found at the URIs passed on its command line. - - .gitignore | 1 + - json-glib/Makefile.am | 7 ++ - json-glib/json-glib-validate.c | 171 +++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 179 insertions(+) - -commit a40e07510208456eeb52776a5ab1d8eb90625fbc -Author: Emmanuele Bassi -Date: Sat Oct 26 20:43:36 2013 +0100 - - parser: Always perform UTF-8 validation - - JSON is defined to be encoded using UTF-8, so we should not rely on - the documentation saying so when parsing, but validate the input and - eventually provide a recoverable parsing error. - - json-glib/json-parser.c | 9 +++++++++ - json-glib/json-parser.h | 2 ++ - 2 files changed, 11 insertions(+) - -commit e71d87eefe4fa51b9a391187c7b41d4c04333e02 -Author: Emmanuele Bassi -Date: Sat Oct 26 20:39:39 2013 +0100 - - parser: Always use a valid GError internally - - Do not just pass the GError through from the public-facing arguments: we - may want to perform error checking internally at any later date. - - json-glib/json-parser.c | 17 +++++++++++++++-- - 1 file changed, 15 insertions(+), 2 deletions(-) - -commit 288f8300977c2f7fb3912c147395fef8e1fe016e -Author: Emmanuele Bassi -Date: Sat Oct 26 20:38:59 2013 +0100 - - build: Clean up the main Makefile.am - - json-glib/Makefile.am | 44 ++++++++++++++++++++++++++++---------------- - 1 file changed, 28 insertions(+), 16 deletions(-) - -commit ce46c06d9c088501c8cbab2dba51856be1a05592 -Author: Juan A. Suarez Romero -Date: Wed Sep 18 17:52:17 2013 +0000 - - path: Check if JSONPath expression is NULL - - https://bugzilla.gnome.org/show_bug.cgi?id=708318 - - json-glib/json-path.c | 2 ++ - 1 file changed, 2 insertions(+) - -commit a876adb3f3a20d87d76f3bf6902a64dd912c47cf -Author: Jiro Matsuzawa -Date: Thu Sep 19 08:12:04 2013 +0900 - - l10n: Update Japanese translation - - po/ja.po | 80 ++++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 40 insertions(+), 40 deletions(-) - -commit 17dbdd5cce26f257a522ba0c218a05753e1fa3b1 -Author: Chun-wei Fan -Date: Fri Aug 30 16:41:41 2013 +0800 - - Visual C++ Builds: Use Custom Build Rules - - ...so that the json-glib.def file can be regenerated as automatically - when the json-glib.symbols file is updated, and the json-glib.def can be - automatically deleted on a "clean" request. - - Also drop some unneeded items from the property sheets. - - build/win32/vs10/json-glib.props | 8 ++--- - build/win32/vs10/json-glib.vcxproj.filtersin | 3 ++ - build/win32/vs10/json-glib.vcxprojin | 28 +++++++++------- - build/win32/vs9/json-glib.vcprojin | 50 +++++++++++++++++++--------- - build/win32/vs9/json-glib.vsprops | 10 ++---- - 5 files changed, 58 insertions(+), 41 deletions(-) - -commit 8e71b3e89d1852414ab27801e873f37e472fec12 -Author: Chun-wei Fan -Date: Wed Aug 28 11:57:45 2013 +0800 - - MSVC Builds: Build the invalid test program - - Add project files to build the "invalid" test program. - - build/win32/vs10/Makefile.am | 2 + - build/win32/vs10/install.vcxproj | 4 + - build/win32/vs10/invalid.vcxproj | 167 +++++++++++++++++++++++++++++++ - build/win32/vs10/invalid.vcxproj.filters | 14 +++ - build/win32/vs10/json-glib.sln | 10 ++ - build/win32/vs9/Makefile.am | 1 + - build/win32/vs9/invalid.vcproj | 153 ++++++++++++++++++++++++++++ - build/win32/vs9/json-glib.sln | 14 +++ - 8 files changed, 365 insertions(+) - -commit 590a6ce8cecfd6fdfb22c7765bca20f5da3aa3d6 -Author: Chun-wei Fan -Date: Wed Aug 28 11:43:40 2013 +0800 - - MSVC Builds: Drop Unneeded Defines - - ...since we are using GLib APIs to locate test data files since - commit b8baa2a0 - - build/win32/vs10/parser.vcxproj | 8 ++++---- - build/win32/vs9/parser.vcproj | 8 ++++---- - 2 files changed, 8 insertions(+), 8 deletions(-) - -commit df8ff199e2a56f5b0430dbe6c7a30addac5fcb42 -Author: Emmanuele Bassi -Date: Thu Aug 22 12:10:07 2013 +0100 - - Drop some more pointless GET_PRIVATE macros - - We can use the autogenerated get_instance_private() function. - - json-glib/json-builder.c | 8 +++----- - json-glib/json-generator.c | 11 +++++------ - 2 files changed, 8 insertions(+), 11 deletions(-) - -commit 141b0a4a2b3b4ef7d9f8769aef5b43f7fb841edd -Author: Emmanuele Bassi -Date: Thu Aug 22 12:02:01 2013 +0100 - - parser: Fix all occurances of TESTS_DATA_DIR - - And use g_test_build_filename(). - - json-glib/tests/parser.c | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -commit b8baa2a07e6b125f38a3a9a0101cf9b887790ea5 -Author: Emmanuele Bassi -Date: Thu Aug 22 11:50:14 2013 +0100 - - parser: Use the proper GLib API to find test data files - - Instead of our homegrown solution. This should fix the regression in the - installed tests case. - - Original patch by: Colin Walters - - json-glib/tests/Makefile.am | 1 - - json-glib/tests/parser.c | 7 +------ - 2 files changed, 1 insertion(+), 7 deletions(-) - -commit 66aa02b0da6d9964f38c4531f775f7c25b07af7d -Author: Emmanuele Bassi -Date: Thu Aug 22 11:46:11 2013 +0100 - - parser: Drop a pointless macro - - The JSON_PARSER_GET_PRIVATE macro is pointless, now that we use the new - version of GLib. - - json-glib/json-parser.c | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -commit 5b6ada6b362f3ff160608c00bcffbb8f2b8eff7b -Author: Emmanuele Bassi -Date: Wed Aug 21 12:16:10 2013 +0100 - - Remove compile time GLib version check - - We depend on a new version of GLib, so we can remove a bunch of old - version checks. - - json-glib/json-builder.c | 14 +------------- - json-glib/json-generator.c | 14 +------------- - json-glib/json-gobject.c | 8 -------- - json-glib/json-parser.c | 14 +------------- - json-glib/json-reader.c | 13 ------------- - json-glib/tests/array.c | 4 ---- - json-glib/tests/boxed.c | 3 --- - json-glib/tests/builder.c | 3 --- - json-glib/tests/generator.c | 3 --- - json-glib/tests/gvariant.c | 3 --- - json-glib/tests/invalid.c | 3 --- - json-glib/tests/node.c | 3 --- - json-glib/tests/object.c | 3 --- - json-glib/tests/parser.c | 3 --- - json-glib/tests/path.c | 3 --- - json-glib/tests/reader.c | 3 --- - json-glib/tests/serialize-complex.c | 3 --- - json-glib/tests/serialize-full.c | 3 --- - json-glib/tests/serialize-simple.c | 3 --- - 19 files changed, 3 insertions(+), 103 deletions(-) - -commit 361e427316cc50b52e4b8f0a71a2b29d1a02ed36 -Author: Emmanuele Bassi -Date: Wed Aug 21 12:08:44 2013 +0100 - - path: Remove unused variable - - json-glib/json-path.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 6c3f870f10465602c2570e0ba3d2311587437977 -Author: Emmanuele Bassi -Date: Wed Aug 21 12:07:39 2013 +0100 - - tests: Use the new TAP support in GTest - - Instead of using the old GLib test harness, we should use the newly - added TAP support and the TAP driver inside autotools. - - .gitignore | 1 + - build/autotools/Makefile.am | 14 +--- - build/autotools/Makefile.am.gitignore | 8 +- - build/autotools/glib-tap.mk | 134 ++++++++++++++++++++++++++++++++++ - build/autotools/glibtests.m4 | 28 +++++++ - build/autotools/tap-test | 5 ++ - configure.ac | 11 +-- - json-glib/Makefile.am | 10 +-- - json-glib/tests/Makefile.am | 52 ++----------- - 9 files changed, 189 insertions(+), 74 deletions(-) - -commit edfa380703f289c509a442d2467f1f8cfa189fff -Author: Emmanuele Bassi -Date: Wed Aug 21 12:01:32 2013 +0100 - - Require GLib >= 2.37.6 - - We're going to need the latest snapshot. - - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 577f7987896a3cfebe5e43d8ebbd94692ee34020 -Author: Emmanuele Bassi -Date: Wed Aug 21 12:01:07 2013 +0100 - - Bump to 0.17.1 - - Start a new development cycle. - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit f9012e0760aea54e652acde3a3ab9cc8e154e3b0 -Author: Fabio Tomat -Date: Tue Aug 20 15:14:12 2013 +0200 - - Added Friulian translation - - po/fur.po | 157 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 157 insertions(+) - -commit 3fd47359707dfc15277cef505d4008c10d8455e9 -Author: Emmanuele Bassi -Date: Thu Jul 11 17:04:13 2013 +0100 - - Use new macros when compiling against new GLib - - If we're being compiled against a newer version of GLib, we should use - the new macros that add instance private data. - - Since this is a stable branch, we cannot bump the GLib requirement; so - we use version checks to conditionally compile the new code. - - json-glib/json-builder.c | 15 ++++++++++++--- - json-glib/json-generator.c | 15 ++++++++++++--- - json-glib/json-parser.c | 12 +++++++++++- - json-glib/json-reader.c | 10 ++++++++++ - 4 files changed, 45 insertions(+), 7 deletions(-) - -commit a9327484746820a5a2b8c1acf4a78470b004f0a0 -Author: Emmanuele Bassi -Date: Thu Jul 11 16:49:14 2013 +0100 - - build: Add configure option to enable -Bsymbolic - - We should always compile with -Bsymbolic enabled to avoid intra-library - PLT jumps. - - https://bugzilla.gnome.org/show_bug.cgi?id=703734 - - configure.ac | 24 ++++++++++++++++++++++++ - 1 file changed, 24 insertions(+) - -commit 8673d5abca21f4c1729c26d7ada1a409e5842572 -Author: Victor Ibragimov -Date: Wed Jul 17 13:47:38 2013 +0500 - - Tajik translation updated - - po/tg.po | 34 +++++++++++++++++----------------- - 1 file changed, 17 insertions(+), 17 deletions(-) - -commit 0d6d965d692d0863ee8f0114e2abdd66cdd69f21 -Author: Victor Ibragimov -Date: Wed Jun 5 14:31:15 2013 +0500 - - Tajik updated - - po/tg.po | 18 ++++++++++-------- - 1 file changed, 10 insertions(+), 8 deletions(-) - -commit 10930960f20a61478244187e290433558f0a1155 -Author: Emmanuele Bassi -Date: Fri May 17 00:21:36 2013 +0100 - - build: Add ltp 1.10 to the whitelist - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 53431a7f034cbee724c9115783538c087dc07d31 -Author: Emmanuele Bassi -Date: Thu May 16 23:37:05 2013 +0100 - - build: Remove INCLUDES - - It has been replaced by AM_CPPFLAGS for a while. - - doc/reference/Makefile.am | 2 +- - json-glib/Makefile.am | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -commit 3e9858cb9c34f492ad0859bd262c8c4691260b41 -Author: Emmanuele Bassi -Date: Thu May 16 23:27:56 2013 +0100 - - build: Add --enable-installed-tests - - See https://live.gnome.org/GnomeGoals/InstalledTests for more - information. - - It's still possible to run `make check` with locally uninstalled tests. - - .gitignore | 1 + - configure.ac | 16 +++++++++++++++- - json-glib/tests/Makefile.am | 46 +++++++++++++++++++++++++++++++++++++-------- - json-glib/tests/parser.c | 24 ++++++++++++++++++++--- - 4 files changed, 75 insertions(+), 12 deletions(-) - -commit a595c61dbd2dd6f16acc2549504f553c76551752 -Author: Emmanuele Bassi -Date: Thu May 16 10:47:09 2013 +0100 - - tests: Improve the JsonPath suite - - Run each expression as a separate unit, so we can catch errors more - quickly and easily. - - json-glib/tests/path.c | 182 ++++++++++++++++++++++++++++++++----------------- - 1 file changed, 121 insertions(+), 61 deletions(-) - -commit 72a3a8f71003d40087c59371d07df5b59f2df3a7 -Author: Emmanuele Bassi -Date: Thu May 16 10:16:02 2013 +0100 - - debug: Clean up debug flags accessor - - Mark json_get_debug_flags() as an internal function, and drop the '_' - prefix; also, add a simple macro that we can use everywhere to mask the - function call. - - json-glib/json-debug.c | 8 ++++---- - json-glib/json-debug.h | 9 ++++++--- - json-glib/json-path.c | 7 ++++++- - 3 files changed, 16 insertions(+), 8 deletions(-) - -commit 5b89c6438b8c1bf7a7b1476305a4e20f2c34234b -Author: Emmanuele Bassi -Date: Thu May 16 10:05:51 2013 +0100 - - path: Move debug dump of the path into its own function - - The path parsing function is already pretty long, so we should isolate - the debugging code out of the way. - - json-glib/json-path.c | 123 +++++++++++++++++++++++++------------------------- - 1 file changed, 62 insertions(+), 61 deletions(-) - -commit c912213d05ea9cacb5ba87f25c76581737c6fbf6 -Author: Emmanuele Bassi -Date: Thu May 16 10:02:50 2013 +0100 - - Use G_DEFINE_QUARK macro - - Instead of hand-writing the error domain function ourselves. - - json-glib/json-parser.c | 10 +++------- - json-glib/json-path.c | 8 ++------ - json-glib/json-reader.c | 10 +++------- - 3 files changed, 8 insertions(+), 20 deletions(-) - -commit ff226427bd4ab911f30a985a2c60e3eaca51c066 -Author: Emmanuele Bassi -Date: Wed May 15 21:51:09 2013 +0100 - - Update ignore file for autotools 1.13 - - .gitignore | 1 + - 1 file changed, 1 insertion(+) - -commit e034cb033a6ba198cf22cd0601ab65bfd8c5b8dd -Author: Emmanuele Bassi -Date: Wed May 15 21:50:01 2013 +0100 - - tests/path: Start adding negative tests for JsonPath - - json-glib/tests/path.c | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -commit 72909d28f48365f249e87ddb0ebea8ad0f0adac1 -Author: Emmanuele Bassi -Date: Wed May 15 21:39:46 2013 +0100 - - tests/path: Allow testing for valid queries - - This will allow adding negative tests to JsonPath. - - The tests will only be caught when compiling the query; an invalid query - won't return a match, so there's no point to check matches. - - json-glib/tests/path.c | 64 +++++++++++++++++++++++++++++++++++++++----------- - 1 file changed, 50 insertions(+), 14 deletions(-) - -commit 69d50a83b1def47bdb6e3d5e2ef8f59081515dd5 -Author: Emmanuele Bassi -Date: Tue Apr 16 20:02:18 2013 +0100 - - Post-release version bump to 0.16.1 - - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 2a0e59c07aaf3788ace907e62a1b5140e919992f -Author: Emmanuele Bassi -Date: Tue Apr 16 19:56:26 2013 +0100 - - Release JSON-GLib 0.16.0 (stable) - - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 55fdc3aa8fcbebd424926eca9a912caa3f41acdf -Author: Emmanuele Bassi -Date: Tue Apr 16 19:59:41 2013 +0100 - - docs: Fix xinclude fallback for annotation glossary - - doc/reference/json-glib-docs.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit d4e864799773ebc047219482d474f894f151eb93 -Author: Kristjan SCHMIDT -Date: Mon Apr 1 18:32:26 2013 +0200 - - Add Esperanto translation - - po/eo.po | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 170 insertions(+) - -commit 183dac4f69c44a46d5634f82a773a41a3a449a5b -Author: Seong-ho Cho -Date: Thu Mar 21 00:04:11 2013 +0900 - - Updated Korean translation - - po/ko.po | 67 ++++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 34 insertions(+), 33 deletions(-) - -commit 5bc2060d2c433622c5b7df44d0dd3cb7fc3d7a17 -Author: Victor Ibragimov -Date: Tue Mar 19 22:36:30 2013 +0100 - - [l10n] Added Tadjik translation - - po/tg.po | 155 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 155 insertions(+) - -commit 7b7ac31d069d0cda5ec5d8d16ef1e2a9f43c8bfe -Author: Rūdolfs Mazurs -Date: Sun Mar 17 20:23:41 2013 +0200 - - Updated Latvian translation - - po/lv.po | 65 ++++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 33 insertions(+), 32 deletions(-) - -commit 474cd483c4ab292bbd3ceab9f411159989e743be -Author: Ask H. Larsen -Date: Sun Mar 17 08:27:33 2013 +0100 - - Updated Danish translation - - po/da.po | 67 ++++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 34 insertions(+), 33 deletions(-) - -commit 879ed51b7c2629a3f1c512bb787dd79e097dc7ca -Author: Duarte Loreto -Date: Fri Mar 15 01:00:51 2013 +0000 - - Updated Portuguese translation and converted to New Spelling (Novo AO) - - po/pt.po | 98 ++++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 49 insertions(+), 49 deletions(-) - -commit e1a55fde8a6a5cc0f1fe44ccfd54c60dd8a7aec6 -Author: Emmanuele Bassi -Date: Wed Mar 13 14:41:23 2013 -0300 - - variant: Fix documentation and annotations for deserialize() - - The returned GVariant when deserializing from JSON has a floating - reference that needs to be sunk. - - json-glib/json-gvariant.c | 15 +++++++++++---- - 1 file changed, 11 insertions(+), 4 deletions(-) - -commit 8bba53c334b26811083c6d786a527afce965f25d -Author: Chun-wei Fan -Date: Thu Mar 7 17:30:10 2013 +0800 - - Update Visual Studio Solution Files - - Integrate the utility projects to build the introspection files, where one - can use to build the introspection files directly from the Visual Studio - IDE if desired. Note that the introspection files are not built by default - in a standard Visual Studio build process for JSON-GLib. - - build/win32/vs10/json-glib.sln | 6 ++++++ - build/win32/vs9/json-glib.sln | 9 +++++++++ - 2 files changed, 15 insertions(+) - -commit 522a8b40915531ce6fe3075f5f83e6aea984e019 -Author: Chun-wei Fan -Date: Thu Mar 7 17:28:12 2013 +0800 - - Visual Studio Builds: Support building introspection files - - Add a Windows .bat and a python script to create a file list of headers - and sources to be processed by g-ir-scanner, and to call g-ir-scanner to - build the introspection files for JSON-GLib. This will enable one to build - the introspection files with Visual Studio builds without needing a - BASH-style shell like MSYS. - - Also add utility Visual Studio projects that can be used to call the - Windows .bat to build the introspection files, for convenience - - build/win32/Makefile.am | 6 +- - build/win32/gen-file-list-jsonglib.py | 114 +++++++++++++++++++++++++++++ - build/win32/gengir_jsonglib.bat | 132 ++++++++++++++++++++++++++++++++++ - build/win32/vs10/Makefile.am | 1 + - build/win32/vs10/gengir.vcxproj | 104 +++++++++++++++++++++++++++ - build/win32/vs9/Makefile.am | 1 + - build/win32/vs9/gengir.vcproj | 77 ++++++++++++++++++++ - 7 files changed, 434 insertions(+), 1 deletion(-) - -commit a518623439d8bcb7052affe7aeef9783e026138b -Author: Chun-wei Fan -Date: Thu Mar 7 17:22:37 2013 +0800 - - Update build/win32/config.h.win32(.in) - - Make its entries reflect the entries that are requested in the config.h.in - that was generated with autotools - - build/win32/config.h.win32.in | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - -commit 3350c6ee0767fa18ab3ccd7c699ba5a397418573 -Author: Chun-wei Fan -Date: Thu Mar 7 17:21:04 2013 +0800 - - Update Visual Studio Property Sheets - - -Replace JsonGlibVersion with ApiVersion, to be consistent with the Visual - Studio property sheets of the other parts of the GTK+/Clutter stack, and - update the corresponding projects - -Add directives in the property sheets so that we use later to build the - introspection files - - build/win32/vs10/json-glib.props | 69 +++++++++++++++++++++++------------- - build/win32/vs10/json-glib.vcxprojin | 8 ++--- - build/win32/vs9/json-glib.vcprojin | 8 ++--- - build/win32/vs9/json-glib.vsprops | 59 ++++++++++++++++++++---------- - 4 files changed, 93 insertions(+), 51 deletions(-) - -commit 10bc48945678b1c61f42a2860b1ca89c0d9d248f -Author: Inaki Larranaga Murgoitio -Date: Mon Mar 4 22:53:50 2013 +0100 - - Updated Basque language - - po/eu.po | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 158 insertions(+) - -commit ebe85c769b380d442ec246edebaccf8a5186b366 -Author: A S Alam -Date: Tue Feb 26 07:28:55 2013 +0530 - - Punjabi: Translation updated (aalam) - - po/pa.po | 49 +++++++++++++++++++++++++------------------------ - 1 file changed, 25 insertions(+), 24 deletions(-) - -commit 96c3822becd754851c0370c5dcb983c2579ad9d7 -Author: Alexandre Franke -Date: Wed Feb 20 20:12:59 2013 +0100 - - Update French translation - - po/fr.po | 44 ++++++++++++++++++++++---------------------- - 1 file changed, 22 insertions(+), 22 deletions(-) - -commit 97e0e0194a7273e928fe3e73a875382fb5810333 -Author: Piotr Drąg -Date: Sun Feb 17 20:13:33 2013 +0100 - - Updated Polish translation - - po/pl.po | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -commit 078f26ac09eec7aa5b00823dedb56c5c934f9aa2 -Author: Anish A -Date: Thu Feb 14 21:23:15 2013 +0400 - - Updated Malayalam Localization - - po/ml.po | 48 ++++++++++++++++++++++++------------------------ - 1 file changed, 24 insertions(+), 24 deletions(-) - -commit eba4dfe745e14f8a27339d2b9962168aeec25b94 -Author: Evan Nemerson -Date: Mon Feb 11 01:55:51 2013 -0800 - - node: add (transfer none) annotations to the new typed initializers - - https://bugzilla.gnome.org/show_bug.cgi?id=693575 - - json-glib/json-node.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -commit 53c92e81be7d6d59d177ec2e78ee5e3bd86bc6ac -Author: Chao-Hsiung Liao -Date: Mon Feb 4 20:33:01 2013 +0800 - - Updated Traditional Chinese translation(Hong Kong and Taiwan) - - po/zh_HK.po | 67 ++++++++++++++++++++++++++++++------------------------------- - po/zh_TW.po | 67 ++++++++++++++++++++++++++++++------------------------------- - 2 files changed, 66 insertions(+), 68 deletions(-) - -commit 437418bc7f5f176cd3cee6f88aaa51f9b69ac9ae -Author: Gheyret Kenji -Date: Sat Jan 26 09:48:04 2013 +0900 - - Updated Uyghur translation - - Signed-off-by: Gheyret Kenji - - po/ug.po | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit e4653a5c9ae70621bfba6314e4c538a8415923a1 -Author: Gheyret Kenji -Date: Sat Jan 26 09:45:46 2013 +0900 - - Updated Uyghur translation - - Signed-off-by: Gheyret Kenji - - po/ug.po | 52 ++++++++++++++++++++++++++-------------------------- - 1 file changed, 26 insertions(+), 26 deletions(-) - -commit e2172751e967d1dbbeb618eda68c4dc0aec709f3 -Author: Milo Casagrande -Date: Thu Jan 24 22:36:47 2013 +0100 - - [l10n] Updated Italian translation. - - po/it.po | 68 +++++++++++++++++++++++++++------------------------------------- - 1 file changed, 29 insertions(+), 39 deletions(-) - -commit eff4e0997aace5b99ab1bfd1dde9dbd3c8127b7d -Author: Kjartan Maraas -Date: Wed Jan 23 14:01:55 2013 +0100 - - Updated Norwegian bokmål translation - - po/nb.po | 48 ++++++++++++++++++++++++------------------------ - 1 file changed, 24 insertions(+), 24 deletions(-) - -commit 36abcad4a2cb7cfd0cdbd2298bf32d5a1d617d1b -Author: Carles Ferrando -Date: Mon Jan 21 00:27:23 2013 +0100 - - [l10n] Updated Catalan (Valencian) translation - - po/ca@valencia.po | 46 +++++++++++++++++++++++----------------------- - 1 file changed, 23 insertions(+), 23 deletions(-) - -commit 87d129518204769fc5942070fab13812008e306e -Author: Gil Forcada -Date: Mon Jan 21 00:26:24 2013 +0100 - - [l10n] Updated Catalan translation - - po/ca.po | 48 ++++++++++++++++++++++++------------------------ - 1 file changed, 24 insertions(+), 24 deletions(-) - -commit 96c57eec2d8332c72b28851bc9a72e1b61ddb2c5 -Author: Gheyret Kenji -Date: Sun Jan 20 11:49:52 2013 +0900 - - Uyghur translation added - - Signed-off-by: Gheyret Kenji - - po/ug.po | 153 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 153 insertions(+) - -commit 69decac8985401f1a47ffea96f72d728e3585248 -Author: Мирослав Николић -Date: Sat Jan 19 11:47:40 2013 +0100 - - Updated Serbian translation - - po/sr.po | 71 +++++++++++++++++++++++++--------------------------------- - po/sr@latin.po | 71 +++++++++++++++++++++++++--------------------------------- - 2 files changed, 60 insertions(+), 82 deletions(-) - -commit a9bc17dc04b425888b40b5ecef6baefcf369ec84 -Author: Emmanuele Bassi -Date: Fri Jan 11 17:47:13 2013 +0000 - - path: Fix get all object members with wildcard - - Similar to the fix that went in commit path e348b1fa, we need to fix - getting all the members of an object by using the wildcard notation. - - json-glib/json-path.c | 2 +- - json-glib/tests/path.c | 28 +++++++++++++++++++++++----- - 2 files changed, 24 insertions(+), 6 deletions(-) - -commit e348b1fa88823ddb18fb8d2a2d1acea94c9f9448 -Author: Juan A. Suarez Romero -Date: Fri Jan 11 15:03:08 2013 +0000 - - path: Fix get all array elements with wildcard - - Using the same data as in tests, asking for $['store']['book'][*] JSON path - should return all the book objects in an array. - - But that array is returned inside another array, dupped several times. - - https://bugzilla.gnome.org/show_bug.cgi?id=691557 - - json-glib/json-path.c | 2 +- - json-glib/tests/path.c | 4 ++++ - 2 files changed, 5 insertions(+), 1 deletion(-) - -commit f33c209e0f895b52afae5742a72cfacf104116bc -Author: Alexander Shopov -Date: Tue Jan 8 21:46:02 2013 +0200 - - Updated Bulgarian translation - - po/bg.po | 48 ++++++++++++++++++++++++------------------------ - 1 file changed, 24 insertions(+), 24 deletions(-) - -commit 8b540ceb2f72b2e354a54bd418c378b4edc6f01a -Author: Timur Zhamakeev -Date: Sat Jan 5 18:25:00 2013 +0600 - - Updated Kyrgyz translation. - - po/ky.po | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -commit 62958e52b8b60defe3f701c6b4d0680a83528312 -Author: Balázs Úr -Date: Mon Dec 31 16:47:49 2012 +0100 - - Updated Hungarian translation - - po/hu.po | 68 ++++++++++++++++++++++++++++++++++++---------------------------- - 1 file changed, 38 insertions(+), 30 deletions(-) - -commit b75a912ebfac50a07a3c6c3669b1e485de9df90a -Author: Chun-wei Fan -Date: Wed Dec 26 10:57:56 2012 +0800 - - Fix VS 2008 poperty sheet - - A is required for each line of command for this, which stands - for newline. :| - - build/win32/vs9/json-glib.vsprops | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 881ba4e89ae88dfad1d91d693bb45af0ba5492fa -Author: Chun-wei Fan -Date: Fri Dec 14 19:35:11 2012 +0800 - - Cleanup/fix Visual C++ build files - - -Make all projects build with MultiByte character set, to be consistent - with GLib. - -Generate .def in the intermediate directory, instead of json-glib/ - -Get rid of some unwanted cruft in many of the Win32 (32-bit) configs in - various Visual C++ 2008 files. - -Some cosmetic changes to Visual C++ 2010 solution file. - -Fix "installation" folder - - build/win32/vs10/array.vcxproj | 4 +- - build/win32/vs10/boxed.vcxproj | 4 +- - build/win32/vs10/builder.vcxproj | 4 +- - build/win32/vs10/generator.vcxproj | 4 +- - build/win32/vs10/gvariant.vcxproj | 4 +- - build/win32/vs10/json-glib.props | 11 +++++- - build/win32/vs10/json-glib.sln | 2 +- - build/win32/vs10/json-glib.vcxprojin | 8 ++-- - build/win32/vs10/node.vcxproj | 4 +- - build/win32/vs10/object.vcxproj | 4 +- - build/win32/vs10/parser.vcxproj | 4 +- - build/win32/vs10/path.vcxproj | 4 +- - build/win32/vs10/reader.vcxproj | 4 +- - build/win32/vs10/serialize-complex.vcxproj | 4 +- - build/win32/vs10/serialize-full.vcxproj | 4 +- - build/win32/vs10/serialize-simple.vcxproj | 4 +- - build/win32/vs9/array.vcproj | 8 +--- - build/win32/vs9/boxed.vcproj | 8 +--- - build/win32/vs9/builder.vcproj | 8 +--- - build/win32/vs9/generator.vcproj | 8 +--- - build/win32/vs9/gvariant.vcproj | 4 +- - build/win32/vs9/json-glib.vcprojin | 12 ++---- - build/win32/vs9/json-glib.vsprops | 59 ++++++++++++++++++------------ - build/win32/vs9/node.vcproj | 8 +--- - build/win32/vs9/object.vcproj | 8 +--- - build/win32/vs9/parser.vcproj | 8 +--- - build/win32/vs9/path.vcproj | 4 +- - build/win32/vs9/reader.vcproj | 8 +--- - build/win32/vs9/serialize-complex.vcproj | 8 +--- - build/win32/vs9/serialize-full.vcproj | 8 +--- - build/win32/vs9/serialize-simple.vcproj | 8 +--- - 31 files changed, 105 insertions(+), 135 deletions(-) - -commit 59a3e4ef763c2fb312d931fe1843638be84421c8 -Author: Piotr Drąg -Date: Tue Nov 27 17:15:50 2012 +0100 - - Updated Polish translation - - po/pl.po | 44 ++++++++++++++++++++++---------------------- - 1 file changed, 22 insertions(+), 22 deletions(-) - -commit c288498a8c39c2bcd5513cfb5612cb1de8e19806 -Author: Pavol Klačanský -Date: Sun Nov 18 23:34:20 2012 +0100 - - Updated slovak translation - - po/sk.po | 21 ++++++++++----------- - 1 file changed, 10 insertions(+), 11 deletions(-) - -commit e9504191e69ac004f2f1caeeed5e1b7f9ed903d7 -Author: Pavol Klačanský -Date: Sat Nov 17 00:22:34 2012 +0100 - - Updated slovak translation - - po/sk.po | 160 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 160 insertions(+) - -commit ef4f7685307842e3723498b7daaff8536c9dc58e -Author: Emmanuele Bassi -Date: Wed Nov 7 18:48:25 2012 +0000 - - build: Bump up the requirement for GLib - - We need symbols from GLib 2.34 for the test suite. - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 6838ee9b2a7ac7a2366a6570dc1abc7a711d9440 -Author: Emmanuele Bassi -Date: Mon Nov 5 12:11:13 2012 +0000 - - build: Use the symbols file to generate our public ABI - - Instead of a regular expression. This allows us to catch ABI issues - immediately, without using the ABI check, while building JSON-GLib, - even on *nix. - - json-glib/Makefile.am | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit 2b8e9ef835f1e99ff791bd5d5ec579e470465f46 -Author: Emmanuele Bassi -Date: Mon Nov 5 12:11:01 2012 +0000 - - symbols: Re-sort - - json-glib/json-glib.symbols | 382 ++++++++++++++++++++++---------------------- - 1 file changed, 191 insertions(+), 191 deletions(-) - -commit de5e62d3a2826499ab67df21162223ecd1167c5e -Author: Marek Černocký -Date: Mon Nov 5 16:15:05 2012 +0100 - - Updated Czech translation - - po/cs.po | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -commit 3144ead7f256f1172278f74c9c2035884e2eca50 -Author: Marek Černocký -Date: Mon Nov 5 16:13:17 2012 +0100 - - Updated Czech translation - - po/cs.po | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -commit 447c3684cb99f1f8acda4a0273612ec5a065f8d7 -Author: Rafael Ferreira -Date: Mon Nov 5 12:40:56 2012 -0200 - - Updated Brazilian Portuguese Translation - - po/pt_BR.po | 67 +++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 32 insertions(+), 35 deletions(-) - -commit 02a081f6dc83e8f5f083722ef8bb3bfb47a746c2 -Author: Yuri Myasoedov -Date: Sun Nov 4 21:15:38 2012 +0400 - - Updated Russian translation - - po/ru.po | 82 ++++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 41 insertions(+), 41 deletions(-) - -commit f69e9b58cc8ad8d37369fd3f60db8d8e9847b1f1 -Author: Мирослав Николић -Date: Sat Nov 3 09:20:27 2012 +0100 - - Updated Serbian translation - - po/sr.po | 49 ++++++++++++++++++++++++++++++------------------- - po/sr@latin.po | 49 ++++++++++++++++++++++++++++++------------------- - 2 files changed, 60 insertions(+), 38 deletions(-) - -commit b16cb3f338f625ed9e997dce9ad26a4568a082be -Author: Tom Tryfonidis -Date: Thu Nov 1 11:43:51 2012 +0200 - - Added Greek translation - - po/el.po | 77 +++++++++++++++++++++++++++++++--------------------------------- - 1 file changed, 37 insertions(+), 40 deletions(-) - -commit 7552833d503db0aa94e4ebc59094e9341e8920af -Author: Fran Diéguez -Date: Wed Oct 31 11:04:11 2012 +0100 - - Updated Galician translations - - po/gl.po | 74 +++++++++++++++++++++++++++++++--------------------------------- - 1 file changed, 36 insertions(+), 38 deletions(-) - -commit 6999123568e522dc57c76799aff90a285a52c5dd -Author: Wolfgang Stoeggl -Date: Tue Oct 30 19:01:34 2012 +0100 - - Updated German translation - - po/de.po | 78 +++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 40 insertions(+), 38 deletions(-) - -commit b3569e022b36ff8be4379a163c1694df0ac66d8e -Author: Mattias Põldaru -Date: Tue Oct 30 15:36:23 2012 +0200 - - [l10n] Updated Estonian translation - - po/et.po | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -commit 53835c75028b578a5b565280ae62971990c1355f -Author: Daniel Mustieles -Date: Sun Oct 28 13:31:25 2012 +0100 - - Updated Spanish translation - - po/es.po | 48 ++++++++++++++++++++++++------------------------ - 1 file changed, 24 insertions(+), 24 deletions(-) - -commit 28e6bff54d2ddc64e7662d96365d2faf615ed0b5 -Author: Marek Černocký -Date: Sun Oct 28 11:15:27 2012 +0100 - - Updated Czech translation - - po/cs.po | 39 ++++++++++++++------------------------- - 1 file changed, 14 insertions(+), 25 deletions(-) - -commit 64fe683c440d7ec7140fd27f53fbaf54da37b249 -Author: Emmanuele Bassi -Date: Sat Oct 27 12:18:53 2012 +0100 - - tests: Put g_type_init() under conditional compilation - - Starting from GLib 2.36, g_type_init() is going to be deprecated (the - type system will be initialized as soon as libgobject is paged in, using - constructors). As I don't want to bump dependencies just for that, the - call to g_type_init() should be placed under a compile-time version - check, to keep the noise from compiler warnings down. - - json-glib/tests/array.c | 3 +++ - json-glib/tests/boxed.c | 2 ++ - json-glib/tests/builder.c | 2 ++ - json-glib/tests/generator.c | 2 ++ - json-glib/tests/gvariant.c | 2 ++ - json-glib/tests/invalid.c | 2 ++ - json-glib/tests/node.c | 2 ++ - json-glib/tests/object.c | 2 ++ - json-glib/tests/parser.c | 2 ++ - json-glib/tests/path.c | 2 ++ - json-glib/tests/reader.c | 2 ++ - json-glib/tests/serialize-complex.c | 2 ++ - json-glib/tests/serialize-full.c | 2 ++ - json-glib/tests/serialize-simple.c | 2 ++ - 14 files changed, 29 insertions(+) - -commit f50f32dcfdecd552ca353731faa0fde099569c28 -Author: Emmanuele Bassi -Date: Sat Oct 27 12:06:28 2012 +0100 - - Use typed initializers for JsonNode - - json-glib/json-gobject.c | 115 +++++++++++++++++++++-------------------------- - json-glib/json-parser.c | 37 ++++++++------- - 2 files changed, 73 insertions(+), 79 deletions(-) - -commit 893c30b4b8ce10c017d10bd534c38c458da4436c -Author: Emmanuele Bassi -Date: Sat Oct 27 11:51:11 2012 +0100 - - Use the new typed JsonNode initializers - - The typed setters in JsonArray and JsonObject should use the JsonNode - typed initializers. - - json-glib/json-array.c | 54 +++++++++++++++++-------------------------------- - json-glib/json-object.c | 48 +++++++++++++++++-------------------------- - 2 files changed, 37 insertions(+), 65 deletions(-) - -commit 9dfb5000cad954431165e836e203e561ccb79c66 -Author: Emmanuele Bassi -Date: Sat Oct 27 11:48:58 2012 +0100 - - Consolidate null handling in JsonArray and JsonObject - - A null value is not only valid for JSON_NODE_NULL nodes, but also for - JSON_NODE_ARRAY and JSON_NODE_OBJECT nodes that do not have a JsonArray - or a JsonObject set. - - json-glib/json-array.c | 11 ++++++++++- - json-glib/json-object.c | 11 ++++++++++- - 2 files changed, 20 insertions(+), 2 deletions(-) - -commit 615538100a42063ca0b84b5bb9c8a6a046a89e0b -Author: Emmanuele Bassi -Date: Sat Oct 27 11:44:30 2012 +0100 - - node: Add typed initializers - - We should simplify the JsonNode API a bit, especially when it comes to - initializing nodes. Instead of a two-step "new() followed by a - set_(value)" API, we can provide a "init_(value)" API that - can take any existing JsonNode and initialize it to the given type. - - This makes the JsonNode creation more concise and reliable; it also - allows to implicitly re-initialize JsonNodes without requiring the user - to de-allocate/re-allocate them first. - - doc/reference/json-glib-sections.txt | 9 ++ - json-glib/json-glib.symbols | 9 ++ - json-glib/json-node.c | 303 +++++++++++++++++++++++++++++++---- - json-glib/json-types.h | 19 +++ - 4 files changed, 306 insertions(+), 34 deletions(-) - -commit 3fb92bc727365bce5f99da3a150a237da4da64d6 -Author: Emmanuele Bassi -Date: Sat Oct 27 10:53:49 2012 +0100 - - tests/reader: Improve test coverage - - json-glib/tests/reader.c | 24 +++++++++++++++++++----- - 1 file changed, 19 insertions(+), 5 deletions(-) - -commit 22275bc0c28682e6bd3022d36e0a9301aeb5ce56 -Author: Emmanuele Bassi -Date: Sat Oct 27 10:52:41 2012 +0100 - - reader: "null" is a value - - Even if we have a special JsonNode for it. The json_reader_is_value() - function should return TRUE for 'null' nodes as well. - - json-glib/json-reader.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -commit 9c26d466f4bbdde00225f2782f041668b1536213 -Author: Andika Triwidada -Date: Sat Oct 27 13:31:33 2012 +0700 - - Updated Indonesian translation - - po/id.po | 74 +++++++++++++++++++++++++++------------------------------------- - 1 file changed, 31 insertions(+), 43 deletions(-) - -commit 4e73239b572fcc0eb4ff6639ee3bbde05d19d404 -Author: Мирослав Николић -Date: Sat Oct 27 05:27:15 2012 +0200 - - Updated Serbian translation - - po/sr.po | 17 +++++++++-------- - po/sr@latin.po | 17 +++++++++-------- - 2 files changed, 18 insertions(+), 16 deletions(-) - -commit dee67875c1ef981bd3dc56e652df93d4a6f4feda -Author: Emmanuele Bassi -Date: Fri Oct 26 17:59:42 2012 +0100 - - scanner: Remove unused functions - - JsonScanner is an internal, modified copy of GScanner; we don't need a - bunch of the provided functions, as the type and its related API are - meant for internal use only. - - Fewer functions == better coverage == less code to maintain. - - json-glib/json-parser.c | 52 +++---- - json-glib/json-scanner.c | 393 ++++------------------------------------------- - json-glib/json-scanner.h | 45 +----- - 3 files changed, 59 insertions(+), 431 deletions(-) - -commit e83baeab7ce16db4597247e793932fd2e507e855 -Author: Emmanuele Bassi -Date: Fri Oct 26 17:21:48 2012 +0100 - - tests: Improve coverage - - json-glib/tests/serialize-full.c | 156 ++++++++++++++++++++++++++------------- - 1 file changed, 104 insertions(+), 52 deletions(-) - -commit 1e7a2ef9be305e8b1db806f364d18f704ca75a64 -Author: Emmanuele Bassi -Date: Fri Oct 26 17:20:43 2012 +0100 - - gobject: Use JsonSerializable API - - Instead of directly accessing the vfunc from the interface vtable. - - json-glib/json-gobject.c | 16 +++++++++------- - 1 file changed, 9 insertions(+), 7 deletions(-) - -commit 4fe6c5977d95c37c693d4f0b1d2dd90ae564b8b3 -Author: Emmanuele Bassi -Date: Fri Oct 26 16:40:59 2012 +0100 - - tests: Improve coverage - - json-glib/tests/array.c | 4 +++ - json-glib/tests/builder.c | 9 +++++- - json-glib/tests/generator.c | 69 ++++++++++++++++++++++++++++++++++++++++++++- - 3 files changed, 80 insertions(+), 2 deletions(-) - -commit 31b8e9c9410a90c387aaf6c9c79e5affc1a1b1be -Author: Emmanuele Bassi -Date: Fri Oct 26 16:40:10 2012 +0100 - - builder: Conform to the coding style - - Function arguments should be aligned on different lines. - - json-glib/json-builder.c | 20 ++++++++++++++------ - 1 file changed, 14 insertions(+), 6 deletions(-) - -commit b0c087d1cc88938bc7e6bb1350a175b1ed103e62 -Author: Emmanuele Bassi -Date: Fri Oct 26 11:06:26 2012 +0100 - - tests: Improve coverage - - json-glib/tests/array.c | 30 ++++++++++++++++++++++++++++++ - json-glib/tests/object.c | 13 +++++++++++++ - 2 files changed, 43 insertions(+) - -commit cce1435c280dbf63b0dbb8c9176e062c539aa9f9 -Author: Emmanuele Bassi -Date: Fri Oct 26 11:04:47 2012 +0100 - - array: Relax preconditions on array and object methods - - Similarly to what we did for the add_string_element(), we need to relax - the preconditions for add_array_element() and add_object_element(). - - json-glib/json-array.c | 2 -- - 1 file changed, 2 deletions(-) - -commit bf273f396c640c17da9f742433b4855232b2062e -Author: Emmanuele Bassi -Date: Fri Oct 26 10:59:16 2012 +0100 - - array: Relax add_string_element() preconditions - - The add_string_element() allows passing a NULL string as a shortcut to - create a 'null' node; the preconditions on the arguments are too strict. - - json-glib/json-array.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -commit 2dec8604ee58571ccc902aeb27004adf6a436ff5 -Author: Emmanuele Bassi -Date: Fri Oct 26 10:15:35 2012 +0100 - - tests/parser: Check negative numeric values - - This is the positive equivalent of the test case inside the invalid test - unit. - - json-glib/tests/parser.c | 16 +++++++++++++++- - 1 file changed, 15 insertions(+), 1 deletion(-) - -commit b9e93111a1200492b71476f7b3a1c60588a90a15 -Author: Emmanuele Bassi -Date: Fri Oct 26 10:10:53 2012 +0100 - - tests/invalid: Improve test coverage - - json-glib/tests/invalid.c | 32 ++++++++++++++++++++++++++++++++ - 1 file changed, 32 insertions(+) - -commit 028e540bc2b78f87e5a1d2f0c36126b7636f2809 -Author: Emmanuele Bassi -Date: Fri Oct 26 10:10:01 2012 +0100 - - parser: Empty member names are not valid - - When parsing a JSON object, a member name has to be a valid string, not - an empty one. - - json-glib/json-parser.c | 13 +++++++++++++ - json-glib/json-parser.h | 4 +++- - 2 files changed, 16 insertions(+), 1 deletion(-) - -commit 32d7c034dda3ccce05bec2bab0007ff0d65729ab -Author: Emmanuele Bassi -Date: Fri Oct 26 09:15:11 2012 +0100 - - build: Fix test-report generation - - We need to include the revision and date tags. - - build/autotools/Makefile.am.gtest | 20 ++++++++++++++------ - 1 file changed, 14 insertions(+), 6 deletions(-) - -commit 43a27e66bd903a4d68a31e37c3ce04103ed49258 -Author: Nilamdyuti Goswami -Date: Fri Oct 26 15:41:43 2012 +0530 - - Assamese translation updatedas.po - - po/as.po | 47 ++++++++++++++++++++++------------------------- - 1 file changed, 22 insertions(+), 25 deletions(-) - -commit ef6b1e9bb79ae0f07d412a876fd48e27854e9d38 -Author: Aurimas Černius -Date: Thu Oct 25 23:04:46 2012 +0300 - - Updated Lithuanian translation - - po/lt.po | 41 +++++++++++++++-------------------------- - 1 file changed, 15 insertions(+), 26 deletions(-) - -commit 1236c7493093357485c8ddc01eb6431d4ae7b842 -Author: Matej Urbančič -Date: Thu Oct 25 19:22:49 2012 +0200 - - Updated Slovenian translation - - po/sl.po | 46 +++++++++++++++++++++------------------------- - 1 file changed, 21 insertions(+), 25 deletions(-) - -commit 46b677b4fd818ba9343b8b569f5b951d3d8ac0a3 -Author: Emmanuele Bassi -Date: Thu Oct 25 17:39:38 2012 +0100 - - tests/invalid: Add more invalid JSON tests - - json-glib/tests/invalid.c | 113 +++++++++++++++++++++++++++++++++++++++------- - 1 file changed, 96 insertions(+), 17 deletions(-) - -commit 977c998929f4d82d93acd3ea0f99c04006e45db0 -Author: Emmanuele Bassi -Date: Thu Oct 25 17:26:25 2012 +0100 - - tests/invalid: Check invalid assignments - - json-glib/tests/invalid.c | 44 ++++++++++++++++++++++++++++++++++++++++---- - 1 file changed, 40 insertions(+), 4 deletions(-) - -commit 77ed79385795d93776e6299b9add3940ceee4245 -Author: Emmanuele Bassi -Date: Thu Oct 25 17:21:55 2012 +0100 - - parser: Use error codes for invalid assignments - - In case we're parsing an assignment we should use the 'invalid bareword' - error code. - - json-glib/json-parser.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -commit 6ebe68eb539a119f99205593b0246399923daef7 -Author: Emmanuele Bassi -Date: Thu Oct 25 17:10:39 2012 +0100 - - tests: Move the invalid JSON unit to its own file - - Instead of putting it inside the parser unit test. - - json-glib/tests/Makefile.am | 1 + - json-glib/tests/invalid.c | 93 +++++++++++++++++++++++++++++++++++++++++++++ - json-glib/tests/parser.c | 52 ------------------------- - 3 files changed, 94 insertions(+), 52 deletions(-) - -commit 6e9c38dd0c82c322a9e98315cb22c2b771b1830f -Author: Emmanuele Bassi -Date: Thu Oct 25 17:08:58 2012 +0100 - - parser: Consolidate value parsing - - Instead of doing a preliminary check when parsing arrays and objects, we - should just call json_parse_value() and let it handle all the valid - values and eventual error cases. This simplifies error handling and - makes it more reliable. - - json-glib/json-parser.c | 37 ++++++++++++------------------------- - 1 file changed, 12 insertions(+), 25 deletions(-) - -commit 5f6ef962097916ae2908e9190d5ba62533ae33ca -Author: Emmanuele Bassi -Date: Thu Oct 25 17:07:16 2012 +0100 - - parser: Show the column in the error message - - For JSON parsed from data (which tends to be in a single line) the - column holds more information than the line. - - json-glib/json-parser.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -commit 1d236453b2569cb2cb5bbc80fde1c72e7a101826 -Author: Miguel Angel Cabrera Moya -Date: Sun Oct 14 12:18:30 2012 +0200 - - parser: Fix small leak in json_parse_statement - - https://bugzilla.gnome.org/show_bug.cgi?id=686096 - - json-glib/json-parser.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -commit 626908526f9766e4f612bb4b893b83b7084766dc -Author: Sasi Bhushan Boddepalli -Date: Tue Oct 9 21:36:45 2012 +0530 - - Updated Telugu Translation - - po/te.po | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 158 insertions(+) - -commit 57bbb1cb7f75720a4d7ba0399e5a156322d34666 -Author: Timur Zhamakeev -Date: Thu Sep 27 11:56:23 2012 +0600 - - Added Kyrgyz translation - - po/ky.po | 160 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 160 insertions(+) - -commit 3f840ae31641ad800872e953ee772777e746925c -Author: Mattias Põldaru -Date: Mon Sep 24 11:26:41 2012 +0300 - - [l10n] Updated Estonian translation - - po/et.po | 61 +++++++++++++------------------------------------------------ - 1 file changed, 13 insertions(+), 48 deletions(-) - -commit 426d9f141f5e7c975324d42abdab774b5e9587b2 -Author: Mattias Põldaru -Date: Mon Sep 24 10:57:10 2012 +0300 - - [l10n] Updated Estonian translation - - po/et.po | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 158 insertions(+) - -commit b2f3ef4cf26e3bae47c82d5c3c7bf79ea762563f -Author: Sayak Sarkar -Date: Mon Sep 24 10:54:45 2012 +0530 - - Added Bengali India Translation - - po/bn_IN.po | 156 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 156 insertions(+) - -commit 655794941dbeac7f65a3ae8514fc75536c9f5ed5 -Author: A S Alam -Date: Mon Sep 24 09:00:08 2012 +0530 - - update Punjabi Translation - - po/pa.po | 68 ++++++++++++++++++++++++++-------------------------------------- - 1 file changed, 28 insertions(+), 40 deletions(-) - -commit 80c6eac77df27b739e7291e3ec7ba6fd4e62c143 -Author: Rūdolfs Mazurs -Date: Mon Sep 24 02:10:04 2012 +0300 - - Added Latvian translation - - po/lv.po | 159 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 159 insertions(+) - -commit f9feca98c714239d7a361597be6fe58b407e1037 -Author: Ani Peter -Date: Sun Sep 23 01:10:17 2012 +0530 - - Updated Malayalam file - - po/ml.po | 155 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 155 insertions(+) - -commit 7abcdadd9b49b0db881702724ef81fe571d0d750 -Author: Carles Ferrando -Date: Fri Sep 21 20:05:58 2012 +0200 - - [l10n]Added Catalan (Valencian) translation - - po/ca@valencia.po | 158 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 158 insertions(+) - -commit d1d83f78922be9e5ee98e58410c3fa998ca24d13 -Author: Gil Forcada -Date: Fri Sep 21 20:05:57 2012 +0200 - - [l10n] Added Catalan translation - - po/ca.po | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 158 insertions(+) - -commit da276c3c9f7f2d7b4abce85cbbe91258b595b8ef -Author: Seong-ho Cho -Date: Sat Sep 22 02:53:04 2012 +0900 - - Added Korean translation - - po/ko.po | 156 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 156 insertions(+) - -commit fef47f834db55a503658247b530d378ea5396949 -Author: Chandan Kumar -Date: Thu Sep 20 10:35:54 2012 +0530 - - Updated HINDI translation - - po/hi.po | 160 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 160 insertions(+) - -commit 2f14b54261746b8384df992c6eed232bf8628021 -Author: Ivaylo Valkov -Date: Tue Sep 18 19:29:36 2012 +0300 - - Updated Bulgarian translation - - po/bg.po | 157 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 157 insertions(+) - -commit 10e8cd6de555866cb7152e3d8b818db796db1261 -Author: Gabor Kelemen -Date: Tue Sep 18 01:38:19 2012 +0200 - - Added Hungarian translation - - po/hu.po | 153 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 153 insertions(+) - -commit 33ee7e91169c6943199739dce9a8f097fea770b3 -Author: Ask H. Larsen -Date: Sun Sep 16 13:43:53 2012 +0200 - - Updated Danish translation - - po/da.po | 162 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 162 insertions(+) - -commit 4b27aa4e36193757f2d4ddc14ff07f6a47ebe529 -Author: Duarte Loreto -Date: Sun Sep 9 11:29:56 2012 +0100 - - Updated Portuguese translation - - po/pt.po | 156 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 156 insertions(+) - -commit 3b21390c1c16d701bb31678919ca639075ff2729 -Author: Alexandre Franke -Date: Thu Sep 6 12:22:09 2012 +0200 - - Update French translation - - po/fr.po | 174 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 174 insertions(+) - -commit 2d376ded0367ee77382a92c58f3d7852590ed0a8 -Author: Bruce Cowan -Date: Wed Sep 5 13:45:45 2012 +0100 - - Added British English translation - - po/en_GB.po | 160 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 160 insertions(+) - -commit 7b837e9ac065d6a117c52cb25bb285fd2bb7e89a -Author: Piotr Drąg -Date: Tue Sep 4 18:18:07 2012 +0200 - - Updated Polish translation - - po/pl.po | 84 ++++++++++++++++++++++++++++------------------------------------ - 1 file changed, 37 insertions(+), 47 deletions(-) - -commit b6497b1d5ce1efa9a6f90b495472aaa917245653 -Author: Daniel Korostil -Date: Fri Aug 17 19:45:07 2012 +0300 - - Added uk translation - - po/uk.po | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 158 insertions(+) - -commit 31ca069867c5c94ffd7d42a3f91eb3828581e7a6 -Author: ManojKumar Giri -Date: Thu Aug 9 18:32:16 2012 +0530 - - Updated Odia Translation. - - po/or.po | 35 +++++++++++++++++++---------------- - 1 file changed, 19 insertions(+), 16 deletions(-) - -commit 62b6bb982ca8287b01c4b3d4abf2dd2ff19b8899 -Author: ManojKumar Giri -Date: Tue Aug 7 17:38:42 2012 +0530 - - Added odia file into the list & Updated translation for Odia. - - po/or.po | 157 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 157 insertions(+) - -commit c34ddaf33f3227c5fba7a866cfa25dba2e46d275 -Author: Takayuki KUSANO -Date: Mon Aug 6 23:04:16 2012 +0900 - - [l10n] Add new Japanese translation - - po/ja.po | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 158 insertions(+) - -commit 8b5f8e8e7928fac15b38b96017c729ee2143352f -Author: Kjartan Maraas -Date: Wed Jul 25 16:44:55 2012 +0200 - - Updated Norwegian bokmål translation - - po/nb.po | 34 +++++++++++----------------------- - 1 file changed, 11 insertions(+), 23 deletions(-) - -commit 6fdf403d06ac890127bca474275d0f62c02caf4f -Author: fenghelong -Date: Sun Jul 22 13:34:07 2012 +0800 - - Add Chinese simplified translation for ui - - po/zh_CN.po | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 165 insertions(+) - -commit 2bfb6cccf626c60571643bcc2bb12e4791dd1db6 -Author: Мирослав Николић -Date: Tue Jul 17 22:05:57 2012 +0200 - - Added Serbian translation - - po/sr.po | 156 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - po/sr@latin.po | 156 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 312 insertions(+) - -commit 9eebf9c886ae7e1e172e3a1efd64f7aa7c79c758 -Author: Emmanuele Bassi -Date: Sun Jul 15 13:25:53 2012 +0100 - - reader: Do not do strict type validation on numeric types - - JsonNode will do an implicit conversion for us. - - json-glib/json-reader.c | 21 --------------------- - 1 file changed, 21 deletions(-) - -commit 7819e630b8fd88d269dd75a2e0fb1aeb294aed96 -Author: Emmanuele Bassi -Date: Sun Jul 15 13:24:03 2012 +0100 - - node: Implicitly convert numeric types - - When retrieving an int, a double, or a boolean, we can use the C rules - of implicit conversion to move from the actual stored type inside the - JsonValue to the requested C type. - - https://bugzilla.gnome.org/show_bug.cgi?id=660795 - - json-glib/json-node.c | 18 ++++++++++++++++++ - json-glib/tests/node.c | 35 +++++++++++++++++++++++++++++++++++ - 2 files changed, 53 insertions(+) - -commit b1b50ec3ad76955651abe92696c4f4717e353840 -Author: Emmanuele Bassi -Date: Sun Jul 15 13:14:46 2012 +0100 - - generator: Use JsonValue, not GValue - - We don't need to turn a JsonValue into a GValue, given that we only care - about the JSON types when serializing to JSON. - - json-glib/json-generator.c | 33 ++++++++++++++++++--------------- - 1 file changed, 18 insertions(+), 15 deletions(-) - -commit 4cb5a1d5c25e7c1e939187740897cb1969df61e8 -Author: Aurimas Černius -Date: Sat Jul 14 18:44:21 2012 +0300 - - Added Lithuanian translation - - po/lt.po | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 170 insertions(+) - -commit b11ce6570570440c94e563917f55437ca7d2e071 -Author: Chao-Hsiung Liao -Date: Sat Jul 14 14:14:38 2012 +0800 - - Updated Traditional Chinese translation(Hong Kong and Taiwan) - - po/zh_HK.po | 166 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - po/zh_TW.po | 166 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 332 insertions(+) - -commit 1409517eb0081d8a56713ee8f6922974f3ca5af0 -Author: Nilamdyuti Goswami -Date: Fri Jul 13 20:30:07 2012 +0530 - - Assamese translation completed - - po/as.po | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 170 insertions(+) - -commit 4317540f0e389370c76ccedea4ca7d15a8aa4969 -Author: Kjartan Maraas -Date: Tue Jul 10 08:29:46 2012 +0200 - - Updated Norwegian bokmål translation - - po/nb.po | 19 ++++++++++--------- - 1 file changed, 10 insertions(+), 9 deletions(-) - -commit d713da8c3207d7df0c8632924887144fe22e6e0e -Author: Emmanuele Bassi -Date: Sat Jun 30 15:27:03 2012 +0100 - - doap: Change my email address to @gnome.org - - json-glib.doap | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit c618e6554e28a7a4c6924b2f050daebe1580c6c0 -Author: Emmanuele Bassi -Date: Sat Jun 30 15:22:20 2012 +0100 - - Post-release version bump to 0.15.3 - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 2d129e5d700db4e0932b3cdd0260ab173f13901e -Author: Emmanuele Bassi -Date: Sat Jun 30 15:19:49 2012 +0100 - - Release JSON-GLib 0.15.2 (snapshot) - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 4bb7b70c1ec13eb67b3984b684b2ca45b340ee9b -Author: Emmanuele Bassi -Date: Sat Jun 30 15:19:07 2012 +0100 - - docs: Add missing symbols - - The deprecation macros should be in the private section. - - doc/reference/json-glib-sections.txt | 2 ++ - 1 file changed, 2 insertions(+) - -commit 9c5c46228d67884a0c26557f7471c5c24da14baa -Author: Emmanuele Bassi -Date: Sat Jun 30 15:04:58 2012 +0100 - - NEWS: Update - - NEWS | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -commit 460a9f3e290be0d5139571492c54ce2b7078cb1f -Author: Emmanuele Bassi -Date: Sat Jun 30 15:04:16 2012 +0100 - - build: Drop dependency on gnome-autogen.sh - - Use autoreconf instead. - - autogen.sh | 49 ++++++++++++++++++++++++++++++++++++++++--------- - 1 file changed, 40 insertions(+), 9 deletions(-) - -commit c6011722e55c9f03fa43e213b467ee3c1b89b2ef -Author: Emmanuele Bassi -Date: Sat Jun 30 14:52:31 2012 +0100 - - symbols: Add missing functions - - json-glib/json-glib.symbols | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) - -commit f91117fcc066fb20204aa34c979d7fb199f0f38a -Author: Emmanuele Bassi -Date: Sat Jun 30 14:50:51 2012 +0100 - - build: Add abicheck.sh - - The abicheck.sh script is used to check that the actural ABI we expose - in our shared library is the same as the expected one we encode inside - the json-glib.symbols file. - - Using abicheck.sh at check time, we can verify that: a) the symbols file - is up to date and b) we're not unintentionally leaking private symbols - to the outside world. - - configure.ac | 13 ++++++++++++- - json-glib/Makefile.am | 6 ++++++ - json-glib/abicheck.sh | 6 ++++++ - 3 files changed, 24 insertions(+), 1 deletion(-) - -commit d52cd977c725f7f8aa22eef91b6305255357eaf2 -Author: Emmanuele Bassi -Date: Sat Jun 30 14:49:42 2012 +0100 - - scanner: Mark all symbols as internal - - The JsonScanner API is purely internal; the symbols it exposes should - not end up in the shared library ABI. - - json-glib/json-scanner.h | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - -commit b6aad8b53e9250c6b7e9c8c7302c5f8bde3a2c72 -Author: Emmanuele Bassi -Date: Sat Jun 30 14:39:13 2012 +0100 - - Improve test coverage - - json-glib/json-node.c | 9 ++++----- - json-glib/tests/node.c | 18 ++++++++++++++++++ - json-glib/tests/object.c | 2 ++ - 3 files changed, 24 insertions(+), 5 deletions(-) - -commit 9fd65a138d6ec46b94eaf807f9c87ea5ada11cf0 -Author: Emmanuele Bassi -Date: Sat Jun 30 14:04:31 2012 +0100 - - Use lcov instead of gcov for test coverage reports - - With lcov we get nicer reporting tools, with HTML output. - - .gitignore | 2 + - Makefile.am | 26 ++++++++- - README.md | 1 + - build/autotools/Makefile.am | 1 - - build/autotools/Makefile.am.gcov | 35 ------------ - configure.ac | 112 +++++++++++++++++++++++++++++++-------- - json-glib/Makefile.am | 7 +-- - 7 files changed, 120 insertions(+), 64 deletions(-) - -commit c135d9ea1b143382fe1372be547cf5ea76444445 -Author: Emmanuele Bassi -Date: Sat Jun 30 13:45:53 2012 +0100 - - tests: Add more coverage to JsonNode - - json-glib/tests/node.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++--- - 1 file changed, 107 insertions(+), 6 deletions(-) - -commit c836800166f2b40e605bb497d7d6e884ae85254c -Author: Emmanuele Bassi -Date: Sat Jun 30 13:26:04 2012 +0100 - - node: Replace GValue with JsonValue - - Given our needs, GValue is terribly overengineered. We do not need - transformability, and we only have four types of data which won't be - extended. At the same time, GValue is lacking: it can only be copied - around, whereas everything else inside a JsonNode is reference counted. - - We can now use the newly introduced JsonValue to replace our usage of - GValue to store values inside a JsonNode, giving us a simpler, reference - counted storage type. - - json-glib/json-node.c | 177 +++++++++++++++++++---------------------- - json-glib/json-types-private.h | 2 +- - 2 files changed, 83 insertions(+), 96 deletions(-) - -commit 7bd24bd628df97d216436e03237fc27f85a6aa8b -Author: Emmanuele Bassi -Date: Sat Jun 30 13:22:47 2012 +0100 - - Add JsonValue - - Given its ECMAScript inheritance, JSON allows only four types of values: - - - integer numbers - - floating point numbers - - booleans - - strings - - We can efficiently represent a JSON value using a simple, reference - counted structure, that behaves similarly to GValue but without the - baggage of the whole type system. - - For the time being, we should keep the whole JsonValue internal: we - already specify typed public accessors, so there's no need to complicate - the API any further. - - json-glib/Makefile.am | 5 +- - json-glib/json-types-private.h | 78 ++++++++++++++- - json-glib/json-value.c | 216 +++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 296 insertions(+), 3 deletions(-) - -commit a62619788bbcc9035fb36e58308b28829f5650d3 -Author: Nguyễn Thái Ngọc Duy -Date: Sat Jun 30 10:27:03 2012 +0700 - - Added Vietnamese translation - - po/vi.po | 166 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 166 insertions(+) - -commit 487a67e2469386751eda951222b927c9ffc2fb06 -Author: Dimitris Spingos -Date: Fri Jun 22 00:05:09 2012 +0300 - - Added Greek translation - - po/el.po | 178 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 178 insertions(+) - -commit 59247e9f8b519c97d9e4ebf67b1b117d0c1b4d66 -Author: Yuri Kozlov -Date: Sun Jun 17 20:33:51 2012 +0400 - - Added Russian translation - - po/ru.po | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 170 insertions(+) - -commit 1a7db5b528868bdf73b1e2a648134120a28bfe20 -Author: Colin Walters -Date: Fri Jun 8 11:20:12 2012 -0400 - - path: Pass int width for printf field width, not long - - json-glib/json-path.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -commit 2eb2fc40034496fa517feeb717c3ca114490c31f -Author: Luca Ferretti -Date: Sat May 19 18:49:03 2012 +0200 - - l10n: Added Italian translation - - po/it.po | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 172 insertions(+) - -commit cecb20c5e7955f62a57df802230b80d74b4d51ce -Author: Andika Triwidada -Date: Sat May 19 12:50:25 2012 +0700 - - Moved id.po to proper directory - - id.po | 171 --------------------------------------------------------------- - po/id.po | 171 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 171 insertions(+), 171 deletions(-) - -commit ed9212a8219d0f953a5f73c1b8db099e6e0977d8 -Author: Andika Triwidada -Date: Sat May 19 12:43:48 2012 +0700 - - Added Indonesian translation - - id.po | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 171 insertions(+) - -commit f3fba7486037639d37c4eb58ca9ca1a7702737ad -Author: A S Alam -Date: Wed May 16 07:32:24 2012 +0530 - - Added Punjabi Translaiton - - po/pa.po | 169 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 169 insertions(+) - -commit a62e8a14314dbe41073c16a88b6e3d2bc491cbc0 -Author: Fran Diéguez -Date: Sat Mar 24 18:03:36 2012 +0100 - - Added Galician translations - - Signed-off-by: Fran Diéguez - - po/gl.po | 168 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 168 insertions(+) - -commit 6f4b0d9286c546658af9cee4fc8c075f4f713ff1 -Author: Chun-wei Fan -Date: Thu Mar 15 16:52:48 2012 +0800 - - Fix "install" paths in VS property sheets - - build/win32/vs10/json-glib.props | 2 +- - build/win32/vs9/json-glib.vsprops | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 2913b0b55481768d5f6dcbbeaa7dbd468cbcf0ac -Author: Gabriel Speckhahn -Date: Thu Feb 16 12:48:35 2012 -0200 - - Updated Brazilian Portuguese translation - - po/pt_BR.po | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 170 insertions(+) - -commit 64fa2598e614163fa1dd71d6d74ea2b71180cd82 -Author: Daniel Nylander -Date: Sun Jan 22 00:38:39 2012 +0100 - - Added Swedish translation - - po/sv.po | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 170 insertions(+) - -commit 31bac4804acba9795cd33d510725ea27a39aac23 -Author: Emmanuele Bassi -Date: Sat Jan 14 22:16:52 2012 +0000 - - Remove JSON_DISABLE_DEPRECATED - - We have deprecations warnings from the compiler, now. - - json-glib/Makefile.am | 2 +- - json-glib/json-glib.symbols | 6 ------ - json-glib/json-gobject.h | 3 --- - json-glib/json-types.h | 2 -- - 4 files changed, 1 insertion(+), 12 deletions(-) - -commit 16f9213dc29390a933b0142ea0a39d44a7a0ab02 -Author: Ryan Lortie -Date: Mon Jan 9 16:16:57 2012 +0100 - - Prevent .po file updates on simple 'make' - - https://bugzilla.gnome.org/show_bug.cgi?id=661128 - - autogen.sh | 4 ++++ - 1 file changed, 4 insertions(+) - -commit 424244569257c280c1926deadf266aa564b795ff -Author: Ryan Lortie -Date: Mon Jan 9 16:15:06 2012 +0100 - - autogen.sh: remove out-of-tree check - - Don't verify from autogen.sh that we are in the source tree -- this - breaks out-of-tree builds in a rather direct way. - - https://bugzilla.gnome.org/show_bug.cgi?id=667454 - - autogen.sh | 7 ------- - 1 file changed, 7 deletions(-) - -commit fce3e04b970ec58f9d9a8ba2e5fb9712665ec17b -Author: Matej Urbančič -Date: Mon Dec 26 18:50:43 2011 +0100 - - Updated Slovenian translation - - po/sl.po | 70 ++++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 35 insertions(+), 35 deletions(-) - -commit b9a774d95058ae00aca03b3994f0ffc48cf50699 -Author: Kjartan Maraas -Date: Mon Dec 19 09:46:02 2011 +0100 - - Added Norwegian bokmål translation - - po/nb.po | 165 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 165 insertions(+) - -commit 7f343fc7c0571905afe39c06bec19edd56885620 -Author: Daniel Mustieles -Date: Tue Dec 6 20:22:20 2011 +0100 - - Updated Spanish translation - - po/es.po | 29 +++++++++++++++++------------ - 1 file changed, 17 insertions(+), 12 deletions(-) - -commit 0b7a5b7639163573055c569109cbc91ebd77bd77 -Author: Matej Urbančič -Date: Fri Nov 25 18:21:43 2011 +0100 - - Added Slovenian translation - - po/sl.po | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 175 insertions(+) - -commit dab93ffeb85429157851402c51246066f95f25eb -Author: Marek Černocký -Date: Tue Nov 22 10:33:51 2011 +0100 - - Czech translation - - po/cs.po | 167 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 167 insertions(+) - -commit 432f1b2184e0e574f3e09591f540f995a465a326 -Author: Muhammet Kara -Date: Wed Nov 16 12:20:54 2011 +0200 - - [l10n]Added Turkish translation - - po/tr.po | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 170 insertions(+) - -commit 9e4c685e9aa284cf67c4331942edfb8b5ace2c50 -Author: Chun-wei Fan -Date: Tue Nov 15 16:43:28 2011 +0800 - - Fix VS property sheets - - The $(GlibEtcInstallRoot)\include\glib-2.0 needs to be specified in - "AdditionalIncludeDirectories" as well so that we will not mistakenly - pick up glibconfig.h from a GLib version and other GLib headers from - another version accidently. - - build/win32/vs10/json-glib.props | 4 ++-- - build/win32/vs9/json-glib.vsprops | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -commit 89d65bb4c610b87b483b20ebb958043ea1b9d191 -Author: Daniel Mustieles -Date: Mon Nov 14 14:57:27 2011 +0100 - - Updated Spanish translation - - po/es.po | 167 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 167 insertions(+) - -commit 84f987e94a44517a6052b7e91ed2e3c42660e295 -Author: Mario Blättermann -Date: Sun Nov 13 16:53:05 2011 +0100 - - [l10n] Added German translation - - po/de.po | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 172 insertions(+) - -commit 88e5fdd588fe3a70e1e262bc7b414e3e527e21b6 -Author: Emmanuele Bassi -Date: Fri Nov 11 15:08:08 2011 +0000 - - docs: Use markdown in the README - - README | 103 --------------------------------------------------------- - README.md | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 112 insertions(+), 103 deletions(-) - -commit 7636e9de9414304f940837ee828d23e4608e9f32 -Author: Emmanuele Bassi -Date: Mon Oct 17 11:19:57 2011 +0100 - - docs: Fix typo in JsonObject's description - - https://bugzilla.gnome.org/show_bug.cgi?id=660893 - - json-glib/json-object.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 2cb5836b99fd4f03e88568de492d1a12841c4176 -Author: Emmanuele Bassi -Date: Mon Oct 17 11:06:38 2011 +0100 - - Bump up the GLib dependency - - It's the development cycle, we can start using GLib 2.31. - - configure.ac | 2 +- - json-glib/json-types.h | 6 ------ - 2 files changed, 1 insertion(+), 7 deletions(-) - -commit c2429c07107edd6acf95e80b82d968771c669c35 -Author: Emmanuele Bassi -Date: Mon Oct 17 10:52:43 2011 +0100 - - Use the new GLib deprecation scheme - - Instead of using a defined symbol to remove the deprecated functions - from the library, we should use compiler warnings. - - json-glib/Makefile.am | 1 - - json-glib/json-gobject.h | 6 ++++-- - json-glib/json-types.h | 19 +++++++++++++++++-- - 3 files changed, 21 insertions(+), 5 deletions(-) - -commit f0dad4508b63359123926f699a66aead9c782ce1 -Author: Chun-wei Fan -Date: Mon Oct 17 15:39:40 2011 +0800 - - Update VS property sheets - - Say goodbye to G_DISABLE_DEPRECATED and the build errors that it triggers - as warnings are now issued during the use of deprecated GLib items instead. - - build/win32/vs10/json-glib.props | 2 +- - build/win32/vs9/json-glib.vsprops | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 4ab8059df6ad106bf8958642aa1126925d79128c -Author: Emmanuele Bassi -Date: Wed Oct 12 12:31:27 2011 +0100 - - Use g_value_[sg]et_schar() with GLib ≥ 2.31 - - The non-explicitly signed variant is deprecated. - - json-glib/json-gobject.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -commit f904ad102004258dc7b839b93a7904517cc4c623 -Author: Matthias Clasen -Date: Wed Oct 12 07:15:23 2011 -0400 - - Adapt to the demise of single includes in GLib - - json-glib/json-scanner.h | 4 +--- - json-glib/tests/gvariant.c | 2 +- - json-glib/tests/node.c | 2 +- - 3 files changed, 3 insertions(+), 5 deletions(-) - -commit d23aa2f10c6580f503dfc6969f8550db9576367f -Author: Chun-wei Fan -Date: Tue Sep 27 15:22:00 2011 +0800 - - Update VS9 property sheet - - Separate intermediate folders so that errors/warnings caused by in-use files - during compilation can be avoided. - - build/win32/vs9/json-glib.vsprops | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 941aff3788ed5ab32e577bcad626150f5e20ce7e -Author: Colin Walters -Date: Thu Sep 22 13:51:09 2011 -0400 - - build: Fix srcdir != builddir - - We need to find the generated version.h in the builddir. - - json-glib/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit c6fed3b02fb10f4fc76b594f15c56eab6ce7c591 -Author: Emmanuele Bassi -Date: Mon Sep 19 14:40:54 2011 +0100 - - Post-branch version bump to 0.15.1 - - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 35279b587f0b884fd606be77fd06e4fef919a300 -Author: Emmanuele Bassi -Date: Mon Sep 19 14:37:45 2011 +0100 - - Release JSON-GLib 0.14.0 - - configure.ac | 4 ++-- - po/pl.po | 74 ++++++++++++++++++++++++++++++------------------------------ - 2 files changed, 39 insertions(+), 39 deletions(-) - -commit 3830326516285e6e86d3fa9c58ef7531679dfec0 -Author: Piotr Drąg -Date: Fri Sep 9 16:27:37 2011 +0200 - - Added Polish translation - - po/pl.po | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 172 insertions(+) - -commit 67a460d9ea8b485e740d1df34943b8df974f4255 -Author: Emmanuele Bassi -Date: Fri Sep 9 15:00:41 2011 +0100 - - Post-release version bump to 0.13.91 - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 1cb4ed1fac84026a19b35ce10c54df8a6ed12959 -Author: Emmanuele Bassi -Date: Fri Sep 9 14:57:13 2011 +0100 - - Release JSON-GLib 0.13.90 (0.14.0-rc1) - - NEWS | 2 ++ - configure.ac | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -commit 18a83ddad87c92ae78010c678a516087ba012859 -Author: Emmanuele Bassi -Date: Fri Sep 9 14:58:17 2011 +0100 - - build: Fix the path to the 'missing' script - - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 9f75475871cc8723e0a41d6c8971f741a405cb9f -Author: Emmanuele Bassi -Date: Fri Sep 9 14:00:36 2011 +0100 - - reader: Do more strict validation - - JsonReader should perform more strict validation, and put itself in an - error state whenever the user asks for values or information on nodes - that are not there, or not of the right type. - - https://bugzilla.gnome.org/show_bug.cgi?id=658632 - - json-glib/json-reader.c | 177 +++++++++++++++++++++++++++++++++++++++++------- - json-glib/json-reader.h | 10 ++- - 2 files changed, 163 insertions(+), 24 deletions(-) - -commit e7f2d505de39a9dbdea1a5879c13408c7a394a18 -Author: Chun-wei Fan -Date: Wed Aug 31 13:33:41 2011 +0800 - - Update Win32 and VS Readme files - - Tell people about the GNOME Live! page that outlines building - JSON-GLib and its dependencies with Visual C++. - - build/win32/vs10/README.txt | 5 +++++ - build/win32/vs9/README.txt | 5 +++++ - 2 files changed, 10 insertions(+) - -commit c2f5b8bc64f9ac06b2dda8662924d88cc759718e -Author: Emmanuele Bassi -Date: Tue Aug 23 20:42:15 2011 +0100 - - gobject: Deserialize CONSTRUCT properties - - While we have to give up deserializing CONSTRUCT_ONLY properties with - JsonSerializable, CONSTRUCT properties should just be deserialized like - any other property. - - Sadly, there's still a refuse in the json_gobject_new() code that skips - CONSTRUCT properties along with CONSTRUCT_ONLY ones — a remnant of a - period when we deserialized them both without JsonSerializable. - - https://bugzilla.gnome.org/show_bug.cgi?id=655526 - - json-glib/json-gobject.c | 13 +++++-------- - json-glib/tests/serialize-complex.c | 19 ++++++++++++++++++- - json-glib/tests/serialize-full.c | 3 ++- - 3 files changed, 25 insertions(+), 10 deletions(-) - -commit bcfac335a8e4086ff6afa5f267f9886a4d1b6370 -Author: Tristan Van Berkom -Date: Sun Jul 31 02:38:08 2011 -0400 - - Handle integer to float/double conversions in json_deserialize_pspec() - - It happens that while serializing that float/double properties are - set to round numbers, this results in deserialization as gint64 - values and a parse failure. This patch addresses it by accepting - round gint64 numbers as valid values for float/double properties. - - json-glib/json-gobject.c | 22 +++++++++++++++++++++- - 1 file changed, 21 insertions(+), 1 deletion(-) - -commit 996d89911d71f54f9a476242f1bd43c077d4428c -Author: Tristan Van Berkom -Date: Wed Jul 13 15:27:07 2011 -0400 - - Added an additional warning to json_gobject_new() - - The same warning that is fired when failing to deserialize - properties normally needed to be added for the case that - we fail to deserialize construct-only properties. - - json-glib/json-gobject.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -commit 4315308a19e4cf474451cecf8b69aceddda91f49 -Author: Tristan Van Berkom -Date: Sat Jul 9 15:23:36 2011 -0400 - - Avoid serializing default property values only after - consulting the JsonSerializable. - - This patch gives the JsonSerializable class a chance to decide - whether it's appropriate to serialize a property before - JsonGObject checks for a default value and skips the property. - - json-glib/json-gobject.c | 10 ++-------- - json-glib/json-serializable.c | 4 ++++ - 2 files changed, 6 insertions(+), 8 deletions(-) - -commit 4ba9a6a81709221ba58d0f8e067de660eb96914e -Author: Tristan Van Berkom -Date: Thu Jul 7 16:35:21 2011 -0400 - - Fixed badly handled fundamental types in json_deserialize_pspec(). - - This patch fixes json_deserialize_pspec() to return FALSE when - failing to deserialize some properties. Consequently the patch - ensures we get the intended warnings when failing to deserialize - pspecs for some fundamental types: - Failed to deserialize property "foo" of type "int" on object "bar" - - json-glib/json-gobject.c | 42 ++++++++++++++++++++++++++++++------------ - 1 file changed, 30 insertions(+), 12 deletions(-) - -commit 24fa4503ad5d85bf60027bd77c434b2a596b1c17 -Author: Laurent Bigonville -Date: Wed Jul 6 12:34:56 2011 +0200 - - Fix GVariant creation on some architectures (bug #650483) - - Fix casting issue in Gvariant creation on some architectures. - - json-glib/json-gvariant.c | 46 ++++++++++++++++++++++++++++++++++++++++------ - 1 file changed, 40 insertions(+), 6 deletions(-) - -commit dd3c30c5821f9f6bac4cc9016c49c7e6250377eb -Author: Emmanuele Bassi -Date: Tue Jul 5 15:07:20 2011 +0100 - - tests/path: Link expressions and results - - Use a structure to keep the testable expressions and their results - together. - - json-glib/tests/path.c | 74 ++++++++++++++++++++++++++++++++------------------ - 1 file changed, 47 insertions(+), 27 deletions(-) - -commit acb33a7e6bd3d05d36e7278fafdcb4c35ec88388 -Author: Emmanuele Bassi -Date: Tue Jul 5 14:23:13 2011 +0100 - - build: Replace AC_HELP_STRING with AS_HELP_STRING - - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit c296ca9ed06b8e4b54a4bd8003593b3a98b94f6b -Author: Emmanuele Bassi -Date: Tue Jul 5 14:22:13 2011 +0100 - - build: Allow m4 substitution for conditional defaults - - To compensate for AC_HELP_STRING()'s braindamage. - - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 1fb457af51a5632956fd679deca0021becb5468b -Author: Emmanuele Bassi -Date: Tue Jul 5 14:22:01 2011 +0100 - - build: Clean up configure.ac's preamble - - configure.ac | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -commit 75e370e53cb5d31d4a366fc5f126583872f1349a -Author: Chun-wei Fan -Date: Wed Jun 29 14:29:12 2011 +0800 - - Added README.txt's for Visual Studio support - - Added README.txt's and included them in distribution to tell - people how JSON-GLib can be build on Windows using Visual C++. - - build/win32/vs10/Makefile.am | 1 + - build/win32/vs10/README.txt | 87 ++++++++++++++++++++++++++++++++++++++++++++ - build/win32/vs9/Makefile.am | 1 + - build/win32/vs9/README.txt | 86 +++++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 175 insertions(+) - -commit 7da6eb52937588537754be7e0b496f51077165d2 -Author: Chun-wei Fan -Date: Wed Jun 29 12:54:52 2011 +0800 - - Re-attempt to correct EOL on VS2010 solution - - This time I realized that I needed to set autocrlf=false on my Windows side - ... ugh... - - This is one of those files that must have CRLF line endings to work - correctly :| - - build/win32/vs10/json-glib.sln | 332 ++++++++++++++++++++--------------------- - 1 file changed, 166 insertions(+), 166 deletions(-) - -commit 4ef07b2c6e7d4d444f8ec6ce93c27f7189b942a0 -Author: Travis Reitter -Date: Thu Jun 23 16:54:38 2011 -0700 - - Link the tests against the appropriate libraries. - - This avoids some linking failures. - - Closes: bgo#653295 - json-glib tests need to link against libgobject-2 - - json-glib/tests/Makefile.am | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -commit c9ac9ce2d417210ccb06d0445a809ce9cd57c7a5 -Author: Chun-wei Fan -Date: Mon Jun 20 11:59:57 2011 +0800 - - Update VS 2010 property sheet - - Make up for missed backslash - - build/win32/vs10/json-glib.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 230801c694169e50ca45df7df431adbdb89cab18 -Author: Chun-wei Fan -Date: Mon Jun 20 11:58:03 2011 +0800 - - Refine Visual C++ 2010 projects - - Should have realized that my previous commit on Visual C++ 2010 projects - (refinement) can be consolidated into the property sheet... - - build/win32/vs10/array.vcxproj | 8 -------- - build/win32/vs10/boxed.vcxproj | 8 -------- - build/win32/vs10/builder.vcxproj | 8 -------- - build/win32/vs10/generator.vcxproj | 8 -------- - build/win32/vs10/gvariant.vcxproj | 10 +--------- - build/win32/vs10/json-glib.props | 2 +- - build/win32/vs10/json-glib.vcxprojin | 8 -------- - build/win32/vs10/node.vcxproj | 10 +--------- - build/win32/vs10/object.vcxproj | 10 +--------- - build/win32/vs10/parser.vcxproj | 10 +--------- - build/win32/vs10/path.vcxproj | 10 +--------- - build/win32/vs10/reader.vcxproj | 8 -------- - build/win32/vs10/serialize-complex.vcxproj | 8 -------- - build/win32/vs10/serialize-full.vcxproj | 8 -------- - build/win32/vs10/serialize-simple.vcxproj | 8 -------- - 15 files changed, 6 insertions(+), 118 deletions(-) - -commit d6fdf92ee000666ceb7892151673b4b56517cdd9 -Author: Chun-wei Fan -Date: Mon Jun 20 01:11:18 2011 +0800 - - Further refinements to Visual C++ 2010 projects - - -Seperate the intermediate folders for each configuration so that MSB6003 - (cannot write into MSBuild log file as file is in use) errors and other - related MSBuild errors can be avoided, and will avoid rebuilding/relinking - projects when no sources are changed. - - -Fixed dependencies for the "install" project - - build/win32/vs10/array.vcxproj | 8 ++++++-- - build/win32/vs10/boxed.vcxproj | 8 ++++++-- - build/win32/vs10/builder.vcxproj | 8 ++++++-- - build/win32/vs10/generator.vcxproj | 8 ++++++-- - build/win32/vs10/gvariant.vcxproj | 9 ++++++++- - build/win32/vs10/install.vcxproj | 18 +++++++++--------- - build/win32/vs10/json-glib.vcxprojin | 8 ++++++-- - build/win32/vs10/node.vcxproj | 8 ++++++-- - build/win32/vs10/object.vcxproj | 8 ++++++-- - build/win32/vs10/parser.vcxproj | 8 ++++++-- - build/win32/vs10/path.vcxproj | 9 ++++++++- - build/win32/vs10/reader.vcxproj | 8 ++++++-- - build/win32/vs10/serialize-complex.vcxproj | 8 ++++++-- - build/win32/vs10/serialize-full.vcxproj | 8 ++++++-- - build/win32/vs10/serialize-simple.vcxproj | 8 ++++++-- - 15 files changed, 97 insertions(+), 35 deletions(-) - -commit 8518effca75d2249b8186083b950644ba4098d47 -Author: Chun-wei Fan -Date: Mon Jun 20 00:13:29 2011 +0800 - - VS 2008 project files update - - Update RootNamespace as well for consistency sake. - - Thanks to Emmanuele for updating the VS9 projects earlier due to the - changes in the filenames of the test sources - - build/win32/vs9/array.vcproj | 2 +- - build/win32/vs9/boxed.vcproj | 2 +- - build/win32/vs9/builder.vcproj | 2 +- - build/win32/vs9/generator.vcproj | 2 +- - build/win32/vs9/gvariant.vcproj | 2 +- - build/win32/vs9/node.vcproj | 2 +- - build/win32/vs9/object.vcproj | 2 +- - build/win32/vs9/parser.vcproj | 2 +- - build/win32/vs9/path.vcproj | 2 +- - build/win32/vs9/reader.vcproj | 2 +- - 10 files changed, 10 insertions(+), 10 deletions(-) - -commit 49ecbb4e2449ad55623fb46a0072fd1fbaf837e1 -Author: Chun-wei Fan -Date: Mon Jun 20 00:04:30 2011 +0800 - - Update VS2010 project files - - -Reflect on the change of filenames of test sources, and updated dist - stuff accordingly. - -Clean up projects a little bit. - - build/win32/vs10/Makefile.am | 36 ++--- - build/win32/vs10/array-test.vcxproj | 172 ----------------------- - build/win32/vs10/array-test.vcxproj.filters | 14 -- - build/win32/vs10/array.vcxproj | 171 +++++++++++++++++++++++ - build/win32/vs10/array.vcxproj.filters | 14 ++ - build/win32/vs10/boxed.vcxproj | 1 - - build/win32/vs10/builder-test.vcxproj | 172 ----------------------- - build/win32/vs10/builder-test.vcxproj.filters | 14 -- - build/win32/vs10/builder.vcxproj | 171 +++++++++++++++++++++++ - build/win32/vs10/builder.vcxproj.filters | 14 ++ - build/win32/vs10/generator-test.vcxproj | 172 ----------------------- - build/win32/vs10/generator-test.vcxproj.filters | 14 -- - build/win32/vs10/generator.vcxproj | 171 +++++++++++++++++++++++ - build/win32/vs10/generator.vcxproj.filters | 14 ++ - build/win32/vs10/gvariant-test.vcxproj | 159 ---------------------- - build/win32/vs10/gvariant-test.vcxproj.filters | 14 -- - build/win32/vs10/gvariant.vcxproj | 159 ++++++++++++++++++++++ - build/win32/vs10/gvariant.vcxproj.filters | 14 ++ - build/win32/vs10/install.vcxproj | 1 - - build/win32/vs10/json-glib.props | 1 - - build/win32/vs10/json-glib.sln | 18 +-- - build/win32/vs10/json-glib.vcxprojin | 1 - - build/win32/vs10/node-test.vcxproj | 172 ----------------------- - build/win32/vs10/node-test.vcxproj.filters | 14 -- - build/win32/vs10/node.vcxproj | 171 +++++++++++++++++++++++ - build/win32/vs10/node.vcxproj.filters | 14 ++ - build/win32/vs10/object-test.vcxproj | 172 ----------------------- - build/win32/vs10/object-test.vcxproj.filters | 13 -- - build/win32/vs10/object.vcxproj | 171 +++++++++++++++++++++++ - build/win32/vs10/object.vcxproj.filters | 13 ++ - build/win32/vs10/parser-test.vcxproj | 172 ----------------------- - build/win32/vs10/parser-test.vcxproj.filters | 14 -- - build/win32/vs10/parser.vcxproj | 171 +++++++++++++++++++++++ - build/win32/vs10/parser.vcxproj.filters | 14 ++ - build/win32/vs10/path-test.vcxproj | 159 ---------------------- - build/win32/vs10/path-test.vcxproj.filters | 14 -- - build/win32/vs10/path.vcxproj | 159 ++++++++++++++++++++++ - build/win32/vs10/path.vcxproj.filters | 14 ++ - build/win32/vs10/reader-test.vcxproj | 173 ------------------------ - build/win32/vs10/reader-test.vcxproj.filters | 14 -- - build/win32/vs10/reader.vcxproj | 172 +++++++++++++++++++++++ - build/win32/vs10/reader.vcxproj.filters | 14 ++ - build/win32/vs10/serialize-complex.vcxproj | 1 - - build/win32/vs10/serialize-full.vcxproj | 1 - - build/win32/vs10/serialize-simple.vcxproj | 1 - - 45 files changed, 1668 insertions(+), 1682 deletions(-) - -commit 54711b3e093e00457a355926516ba87c8171f17d -Author: Emmanuele Bassi -Date: Sun Jun 19 12:18:04 2011 +0100 - - build/vs9: Update after the changes in json-glib/tests - - build/win32/vs9/Makefile.am | 24 ++--- - build/win32/vs9/array-test.vcproj | 157 -------------------------------- - build/win32/vs9/array.vcproj | 157 ++++++++++++++++++++++++++++++++ - build/win32/vs9/boxed.vcproj | 2 +- - build/win32/vs9/builder-test.vcproj | 157 -------------------------------- - build/win32/vs9/builder.vcproj | 157 ++++++++++++++++++++++++++++++++ - build/win32/vs9/generator-test.vcproj | 157 -------------------------------- - build/win32/vs9/generator.vcproj | 157 ++++++++++++++++++++++++++++++++ - build/win32/vs9/gvariant-test.vcproj | 147 ------------------------------ - build/win32/vs9/gvariant.vcproj | 147 ++++++++++++++++++++++++++++++ - build/win32/vs9/json-glib.sln | 18 ++-- - build/win32/vs9/node-test.vcproj | 157 -------------------------------- - build/win32/vs9/node.vcproj | 157 ++++++++++++++++++++++++++++++++ - build/win32/vs9/object-test.vcproj | 155 ------------------------------- - build/win32/vs9/object.vcproj | 155 +++++++++++++++++++++++++++++++ - build/win32/vs9/parser-test.vcproj | 166 ---------------------------------- - build/win32/vs9/parser.vcproj | 166 ++++++++++++++++++++++++++++++++++ - build/win32/vs9/path-test.vcproj | 147 ------------------------------ - build/win32/vs9/path.vcproj | 147 ++++++++++++++++++++++++++++++ - build/win32/vs9/reader-test.vcproj | 158 -------------------------------- - build/win32/vs9/reader.vcproj | 158 ++++++++++++++++++++++++++++++++ - 21 files changed, 1423 insertions(+), 1423 deletions(-) - -commit 78e896c64e8cbccf1b55291521f11a3f5093080a -Author: Emmanuele Bassi -Date: Sun Jun 19 12:08:03 2011 +0100 - - build: Rename test binaries - - It's pointless to add the '-test' suffix to files under the tests/ directory. - - json-glib/tests/Makefile.am | 18 +- - json-glib/tests/array-test.c | 122 ------ - json-glib/tests/array.c | 122 ++++++ - json-glib/tests/builder-test.c | 161 -------- - json-glib/tests/builder.c | 161 ++++++++ - json-glib/tests/generator-test.c | 330 ---------------- - json-glib/tests/generator.c | 330 ++++++++++++++++ - json-glib/tests/gvariant-test.c | 233 ------------ - json-glib/tests/gvariant.c | 233 ++++++++++++ - json-glib/tests/node-test.c | 112 ------ - json-glib/tests/node.c | 112 ++++++ - json-glib/tests/object-test.c | 165 -------- - json-glib/tests/object.c | 165 ++++++++ - json-glib/tests/parser-test.c | 785 --------------------------------------- - json-glib/tests/parser.c | 785 +++++++++++++++++++++++++++++++++++++++ - json-glib/tests/path-test.c | 143 ------- - json-glib/tests/path.c | 143 +++++++ - json-glib/tests/reader-test.c | 134 ------- - json-glib/tests/reader.c | 134 +++++++ - 19 files changed, 2194 insertions(+), 2194 deletions(-) - -commit cef1f16cec529eeb03338f995a8b3d32b262df8b -Author: Emmanuele Bassi -Date: Sun Jun 19 12:00:01 2011 +0100 - - docs: Add index for symbols added in the 0.13 cycle - - doc/reference/json-glib-docs.xml | 5 +++++ - 1 file changed, 5 insertions(+) - -commit cc2543e101ca8fa41989bc8eb296f8d11b5b9cad -Author: Emmanuele Bassi -Date: Wed Jun 15 11:30:28 2011 +0100 - - build: Add tar-ustar and silent-rules automake options - - The tar-ustar format allows longer file names and other niceties — - though a format ratified in a standard from 1988 is still judged as - "possibly not widespread enough". I weep for the future of humanity - and software engineering. - - The silent-rules option is just added to avoid using AM_SILENT_RULES() - on a separate line. - - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -commit c106aa5b0fc0ca408328b95ba721eef6a9d560d2 -Author: Emmanuele Bassi -Date: Wed Jun 15 11:12:38 2011 +0100 - - Post-release version bump to 0.13.5 - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 02b3ee77a35624a3d6e478ae3700100cb24bf18f -Author: Emmanuele Bassi -Date: Wed Jun 15 11:08:37 2011 +0100 - - Release JSON-GLib 0.13.4 - - NEWS | 6 ++++++ - configure.ac | 2 +- - 2 files changed, 7 insertions(+), 1 deletion(-) - -commit f37878ec1759283f78a6d580c1f78e9039717862 -Author: Emmanuele Bassi -Date: Wed Jun 15 11:08:12 2011 +0100 - - docs: Fix API reference missing symbols - - doc/reference/json-glib-sections.txt | 4 ++++ - json-glib/json-gobject.h | 6 ++++++ - 2 files changed, 10 insertions(+) - -commit c994a9bfdc13aba1b7c5fd019853c68fb38148a6 -Author: Emmanuele Bassi -Date: Thu Jun 9 17:23:04 2011 +0100 - - Remove G_CONST_RETURN usage - - See GLib bug: - - https://bugzilla.gnome.org/show_bug.cgi?id=644611 - - The macro is going to be deprecated soon. - - json-glib/json-array.c | 2 +- - json-glib/json-node.c | 6 +++--- - json-glib/json-object.c | 2 +- - json-glib/json-reader.c | 6 +++--- - json-glib/json-reader.h | 6 +++--- - json-glib/json-types-private.h | 2 +- - json-glib/json-types.h | 8 ++++---- - 7 files changed, 16 insertions(+), 16 deletions(-) - -commit 74bb5d61a737cceffd04c8d9ae8d5db390eda5a2 -Author: Emmanuele Bassi -Date: Fri Jun 3 11:46:05 2011 +0100 - - Use the new atomic functions for refcounting - - The newly added g_atomic_int_dec_and_test() simplified the logic for - unreffing Object and Array. - - json-glib/json-array.c | 9 ++------- - json-glib/json-object.c | 9 ++------- - 2 files changed, 4 insertions(+), 14 deletions(-) - -commit 4f83868e3a18adac809aff111c5df5ff7af8fedf -Author: Emmanuele Bassi -Date: Fri Jun 3 11:18:27 2011 +0100 - - build: Remove deprecation disabling for GLib - - json-glib/Makefile.am | 1 - - 1 file changed, 1 deletion(-) - -commit 65a95198a4a1bca7b418af1639c4bb24b09947c5 -Author: Chun-wei Fan -Date: Fri Jun 3 15:32:55 2011 +0800 - - Visual C++ support: projects for JSONPath test - - Added projects to build test program for JSONPath (path-test.c) - - build/win32/vs10/Makefile.am | 2 + - build/win32/vs10/install.vcxproj | 8 ++ - build/win32/vs10/json-glib.sln | 26 +++-- - build/win32/vs10/path-test.vcxproj | 159 +++++++++++++++++++++++++++++ - build/win32/vs10/path-test.vcxproj.filters | 14 +++ - build/win32/vs9/Makefile.am | 1 + - build/win32/vs9/json-glib.sln | 30 ++++-- - build/win32/vs9/path-test.vcproj | 147 ++++++++++++++++++++++++++ - 8 files changed, 371 insertions(+), 16 deletions(-) - -commit 16bc9cccd32f4e1c7e9fc0da128aef969d0563b0 -Author: Chun-wei Fan -Date: Fri Jun 3 15:01:16 2011 +0800 - - Update config.h.win32.in - - Added definition of GETTEXT_PACKAGE due to the addition of the i18n - machinery (commit 67edce08670ce1da4956f87948985434ac5ae2ca) - - build/win32/config.h.win32.in | 3 +++ - 1 file changed, 3 insertions(+) - -commit d93260c477930140f2ecf2927bd9f2a2d7f4f905 -Author: Chun-wei Fan -Date: Fri Jun 3 14:47:42 2011 +0800 - - Update VS property sheets - - -Add json-path.h to the list of headers to be copied in the "install" stage - - build/win32/vs10/json-glib.props | 2 ++ - build/win32/vs9/json-glib.vsprops | 1 + - 2 files changed, 3 insertions(+) - -commit c3b367ca8bac245712f8390acab1b38a314972a9 -Author: Emmanuele Bassi -Date: Wed Jun 1 17:10:17 2011 +0100 - - serializable: Fix introspection annotations - - json-glib/json-serializable.c | 25 +++++++++++++++++++++++++ - 1 file changed, 25 insertions(+) - -commit aee5a7fbb70e5cb714bcfef79a96c000f62e80db -Author: Emmanuele Bassi -Date: Wed Jun 1 17:01:02 2011 +0100 - - Remove unused files - - - AUTHORS - - MAINTAINER - replaced by json-glib.doap - - - ChangeLog - empty, and not necessary with the foreign automake option - - AUTHORS | 1 - - ChangeLog | 6 ------ - MAINTAINERS | 3 --- - configure.ac | 5 +++-- - 4 files changed, 3 insertions(+), 12 deletions(-) - -commit 1d4cdb76b6f97c723dd6e4c634bacc52d3199999 -Author: Emmanuele Bassi -Date: Wed Jun 1 13:35:16 2011 +0100 - - Update the ignore file for the po directory - - po/.gitignore | 1 + - 1 file changed, 1 insertion(+) - -commit 8863766ca4792383dad0e48550f8fb79d4c104e4 -Author: Emmanuele Bassi -Date: Wed Jun 1 13:21:32 2011 +0100 - - Mark GError messages for translations - - These errors might find their way into a UI. - - json-glib/json-gobject.c | 4 ++-- - json-glib/json-gvariant.c | 40 ++++++++++++++++++---------------------- - json-glib/json-parser.c | 5 ++++- - json-glib/json-path.c | 13 +++++++------ - json-glib/json-reader.c | 20 ++++++++++---------- - 5 files changed, 41 insertions(+), 41 deletions(-) - -commit 67edce08670ce1da4956f87948985434ac5ae2ca -Author: Emmanuele Bassi -Date: Wed Jun 1 13:09:01 2011 +0100 - - Add i18n machinery - - We need to translate the GError messages. - - .gitignore | 2 ++ - Makefile.am | 2 +- - build/autotools/Makefile.am | 1 + - build/autotools/as-linguas.m4 | 24 ++++++++++++++++++++++++ - configure.ac | 12 ++++++++++++ - json-glib/json-gobject.c | 2 ++ - json-glib/json-gvariant.c | 6 ++++++ - json-glib/json-parser.c | 2 ++ - json-glib/json-path.c | 4 +++- - json-glib/json-reader.c | 2 ++ - po/.gitignore | 13 +++++++++++++ - po/Makevars | 7 +++++++ - po/POTFILES.in | 6 ++++++ - 13 files changed, 81 insertions(+), 2 deletions(-) - -commit e3b5883d4435da7fe677eb9a7c74d2f83980f5da -Author: Emmanuele Bassi -Date: Wed Jun 1 12:49:28 2011 +0100 - - gobject: Do not serialize default values - - If a property is set to its default value then we can skip its - serialization, to keep the number of JSON object members down. - - json-glib/json-gobject.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -commit 8c424cc133575282371bff8d17295662267049e9 -Author: Emmanuele Bassi -Date: Wed Jun 1 12:48:20 2011 +0100 - - tests/serialize-complex: Modify the instance - - Do not test the defaults: create the GObject instance with different - values than the default ones from the GParamSpec. - - json-glib/tests/serialize-complex.c | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) - -commit 96b1e6b50f355c04e794ad7366bd33b9c3d1f81b -Author: Emmanuele Bassi -Date: Wed Jun 1 12:35:58 2011 +0100 - - serializable: Allow introspecting properties - - This allows a Serializable implementation to override the property list, - and the setter and the getter function. - - json-glib/json-gobject.c | 43 ++++++++++++++++++----- - json-glib/json-gobject.h | 22 ++++++++++++ - json-glib/json-serializable.c | 81 +++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 137 insertions(+), 9 deletions(-) - -commit c85fc93f6235b8b9d584585215b2fa860f07f2c3 -Author: Emmanuele Bassi -Date: Wed Jun 1 12:36:08 2011 +0100 - - Revert "path: Add some more validation points" - - This reverts commit e8fa85705e48d03742eb351addbad53be4d8e60b. - - The validation broke the test suite; it'll need some more work. - - json-glib/json-path.c | 77 ++++++++++++++------------------------------------- - 1 file changed, 21 insertions(+), 56 deletions(-) - -commit e8fa85705e48d03742eb351addbad53be4d8e60b -Author: Emmanuele Bassi -Date: Wed Jun 1 07:55:17 2011 +0100 - - path: Add some more validation points - - Especially for the slice syntax. - - json-glib/json-path.c | 77 +++++++++++++++++++++++++++++++++++++-------------- - 1 file changed, 56 insertions(+), 21 deletions(-) - -commit 295c469329d040b4d311e9c295bec908856190d6 -Author: Emmanuele Bassi -Date: Wed Jun 1 07:54:48 2011 +0100 - - symbols: Add JsonPath public entry points - - json-glib/json-glib.symbols | 6 ++++++ - 1 file changed, 6 insertions(+) - -commit 257209ab47ebcbf36006dd3aa3fcee5545381c6f -Author: Emmanuele Bassi -Date: Wed Jun 1 07:54:26 2011 +0100 - - docs: Document JsonPath and add it to the API reference - - doc/reference/json-glib-docs.xml | 3 +- - doc/reference/json-glib-sections.txt | 20 ++++ - doc/reference/json-glib.types | 1 + - json-glib/json-path.c | 174 ++++++++++++++++++++++++++++++++++- - 4 files changed, 195 insertions(+), 3 deletions(-) - -commit ac89bb7fc7491019f8baa687a785eeb93af7213e -Merge: b5bd477 4ea8cd4 -Author: Emmanuele Bassi -Date: Tue May 31 23:16:10 2011 +0100 - - Merge branch 'wip/json-path' - - * wip/json-path: - Add initial JSONPath implementation - -commit 4ea8cd43986d5888fb8e809a198d6b0331b12480 -Author: Emmanuele Bassi -Date: Sat May 28 14:36:43 2011 +0100 - - Add initial JSONPath implementation - - JSONPath is a JSON query syntax similar to what XPath does for XML; - using JSONPath it's possible to address a specific node (or set of - nodes) inside a JSON document. - - The JsonPath class is a simple implementation of part of the JSONPath - proposal, as formalised by Stefan Gössner here: - - http://goessner.net/articles/JsonPath/ - - The covered operators are: - - • root, or '$'; - • child, both using the dot-notation and the bracket notation; - • recursive descent, or '..'; - • subscript, or '[]'; - • set, or '[,]'; - • slice, or '[start:end:step]'. - - The only missing operators are the filter, or '?()' and the script, - or '()', because implementing a JavaScript interpreter inside JSON-GLib - is not one of my greatest aspirations. It should be possible, though, - to parse and evaluate simple arithmetic conditions, in the future. - - The JsonPath methods are pretty straightforward: a JsonPath instance - should be created and used to compile an expression; the compilation - might result in a syntax error or not. Then, the JsonPath instance can - be used to match any JSON tree. Like the other JSONPath implementations, - JsonPath returns a JSON array of matching nodes. - - A simple, one-off static method called json_path_query() is also - provided; the method wraps the JsonPath creation, the expression - compilation, and the matching, as well as disposing the JsonPath - instance once done. - - For the time being, only positive testing is provided; negative testing - for the expression compilation will follow. - - json-glib/Makefile.am | 2 + - json-glib/json-debug.c | 3 +- - json-glib/json-debug.h | 3 +- - json-glib/json-glib.h | 1 + - json-glib/json-path.c | 856 ++++++++++++++++++++++++++++++++++++++++++++ - json-glib/json-path.h | 97 +++++ - json-glib/tests/Makefile.am | 1 + - json-glib/tests/path-test.c | 143 ++++++++ - 8 files changed, 1104 insertions(+), 2 deletions(-) - -commit b5bd47727c960990ba98902ee2d7099491a4178a -Author: Chun-wei Fan -Date: Mon May 30 14:26:54 2011 +0800 - - Add/update Visual C++ projects for GVariant API - - -Added/dist VS 2008/2010 projects to compile the gvariant-test test program - (yes, the gvariant-test program passes in the 32-bit and 64-bit modes) - -Updated property sheet to "install" the "new" json-gvariant.h - - build/win32/vs10/Makefile.am | 2 + - build/win32/vs10/gvariant-test.vcxproj | 159 +++++++++++++++++++++++++ - build/win32/vs10/gvariant-test.vcxproj.filters | 14 +++ - build/win32/vs10/json-glib.props | 2 + - build/win32/vs10/json-glib.sln | 10 ++ - build/win32/vs9/Makefile.am | 1 + - build/win32/vs9/gvariant-test.vcproj | 147 +++++++++++++++++++++++ - build/win32/vs9/json-glib.sln | 14 +++ - build/win32/vs9/json-glib.vsprops | 1 + - 9 files changed, 350 insertions(+) - -commit 3a1d817fd39b4b4d2bdbc93257be535c5b29780f -Author: Chun-wei Fan -Date: Mon May 30 13:07:53 2011 +0800 - - Update json-glib.symbols - - Added the JSON-GLib gvariant-related APIs. - - json-glib/json-glib.symbols | 4 ++++ - 1 file changed, 4 insertions(+) - -commit 1b7f20fe88a6647e61964db063eba071114a6f66 -Author: Chun-wei Fan -Date: Mon May 30 12:53:47 2011 +0800 - - Update $(srcroot)/Makefile.am - - Due to changes to this file in commit - 4e41d26586991d2977c846fa4871b6df39fe4106, change the order of SUBDIRS - so that "make dist" will properly run. - - This has been checked with "make distcheck" on Fedora 15 - - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 54172e25e8b62075f0aef98d21e17619466ff30f -Author: Chun-wei Fan -Date: Mon May 30 11:55:06 2011 +0800 - - Update Visual C++ Project Files - - Update the dist part too... - - build/win32/vs10/Makefile.am | 16 ++++++++-------- - build/win32/vs9/Makefile.am | 8 ++++---- - 2 files changed, 12 insertions(+), 12 deletions(-) - -commit 0715050a5a76f187f66f14288a8f3444a4eb49e4 -Author: Chun-wei Fan -Date: Mon May 30 11:53:04 2011 +0800 - - Update VS 2008/2010 Project Files - - Due to the changes in the location/names of some test programs in - commit 4e41d26586991d2977c846fa4871b6df39fe4106, update the VS - project files... - - build/win32/vs10/boxed.vcxproj | 172 +++++++++++++++++++++ - build/win32/vs10/boxed.vcxproj.filters | 14 ++ - build/win32/vs10/install.vcxproj | 8 +- - build/win32/vs10/json-glib.sln | 8 +- - build/win32/vs10/serialize-complex.vcxproj | 171 ++++++++++++++++++++ - build/win32/vs10/serialize-complex.vcxproj.filters | 14 ++ - build/win32/vs10/serialize-full.vcxproj | 172 +++++++++++++++++++++ - build/win32/vs10/serialize-full.vcxproj.filters | 14 ++ - build/win32/vs10/serialize-simple.vcxproj | 171 ++++++++++++++++++++ - build/win32/vs10/serialize-simple.vcxproj.filters | 14 ++ - build/win32/vs10/test-serialize-boxed.vcxproj | 172 --------------------- - .../vs10/test-serialize-boxed.vcxproj.filters | 14 -- - build/win32/vs10/test-serialize-complex.vcxproj | 171 -------------------- - .../vs10/test-serialize-complex.vcxproj.filters | 14 -- - build/win32/vs10/test-serialize-full.vcxproj | 172 --------------------- - .../win32/vs10/test-serialize-full.vcxproj.filters | 14 -- - build/win32/vs10/test-serialize-simple.vcxproj | 171 -------------------- - .../vs10/test-serialize-simple.vcxproj.filters | 14 -- - build/win32/vs9/boxed.vcproj | 157 +++++++++++++++++++ - build/win32/vs9/json-glib.sln | 8 +- - build/win32/vs9/serialize-complex.vcproj | 156 +++++++++++++++++++ - build/win32/vs9/serialize-full.vcproj | 157 +++++++++++++++++++ - build/win32/vs9/serialize-simple.vcproj | 156 +++++++++++++++++++ - build/win32/vs9/test-serialize-boxed.vcproj | 157 ------------------- - build/win32/vs9/test-serialize-complex.vcproj | 156 ------------------- - build/win32/vs9/test-serialize-full.vcproj | 157 ------------------- - build/win32/vs9/test-serialize-simple.vcproj | 156 ------------------- - 27 files changed, 1380 insertions(+), 1380 deletions(-) - -commit 8b778252358ddb28936c6c9192a84f76368ca122 -Author: Emmanuele Bassi -Date: Sat May 28 11:38:18 2011 +0100 - - tests: Fix up the JsonBuilder test - - Clean up some odd code, and add a unit for the empty object case outlined - in bug 651271. - - json-glib/tests/builder-test.c | 52 +++++++++++++++++++++++++++++++++++++----- - 1 file changed, 46 insertions(+), 6 deletions(-) - -commit d784cc6825607c517d7565049108d1f908a1d71b -Author: Emmanuele Bassi -Date: Sat May 28 11:36:55 2011 +0100 - - builder: Initialize state fields - - If we're calling g_free() on a field we better make sure that it's either - NULL or contains valid data. - - https://bugzilla.gnome.org/show_bug.cgi?id=651271 - - json-glib/json-builder.c | 1 + - 1 file changed, 1 insertion(+) - -commit e20a8b0faeb45d1ae2f1bd12d49d31d12e357b24 -Author: Alexandre Mazari -Date: Tue Mar 22 17:28:55 2011 +0100 - - gvariant: Fix introspection annotation - - The 'signature' arguments of the json_gvariant_deserialize functions are - optional. - - Signed-off-by: Emmanuele Bassi - - json-glib/json-gvariant.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 4e41d26586991d2977c846fa4871b6df39fe4106 -Author: Emmanuele Bassi -Date: Sat May 28 11:05:57 2011 +0100 - - tests: Move all tests under json-glib - - The test framework should live under the json-glib directory, and not be - spread across the project. - - Makefile.am | 6 - - configure.ac | 2 - - json-glib/tests/Makefile.am | 53 ++--- - json-glib/tests/boxed.c | 264 +++++++++++++++++++++++ - json-glib/tests/serialize-complex.c | 293 ++++++++++++++++++++++++++ - json-glib/tests/serialize-full.c | 402 ++++++++++++++++++++++++++++++++++++ - json-glib/tests/serialize-simple.c | 166 +++++++++++++++ - tests/Makefile.am | 34 --- - tests/test-serialize-boxed.c | 264 ----------------------- - tests/test-serialize-complex.c | 293 -------------------------- - tests/test-serialize-full.c | 402 ------------------------------------ - tests/test-serialize-simple.c | 166 --------------- - 12 files changed, 1142 insertions(+), 1203 deletions(-) - -commit 8d98b99b945423085232d358492e97399c9fd071 -Author: Chun-wei Fan -Date: Mon May 23 09:39:20 2011 +0800 - - Update Visual Studio property sheets - - -Make DLL/LIB versioning more like the autotools-compiled versions - -"Install" the headers in a more consistent way like the autotools versions - - build/win32/vs10/json-glib.props | 26 +++++++++++++------------- - build/win32/vs9/json-glib.vsprops | 32 ++++++++++++++++---------------- - 2 files changed, 29 insertions(+), 29 deletions(-) - -commit 15221448b5998a071b72299c666044dd65ea97e3 -Author: Emmanuele Bassi -Date: Thu May 19 08:32:03 2011 +0100 - - Add ignore file under build/win32 - - build/win32/.gitignore | 4 ++++ - 1 file changed, 4 insertions(+) - -commit f4651885961bf3ccc8d475cdc86af051fe1101f6 -Author: Emmanuele Bassi -Date: Wed May 18 13:44:07 2011 +0100 - - doap: Add the download-page resource - - json-glib.doap | 2 ++ - 1 file changed, 2 insertions(+) - -commit 8ef7da62a7575ebb04c69b9d98fd24efb840ab3b -Author: Emmanuele Bassi -Date: Wed May 18 13:39:38 2011 +0100 - - Post-release version bump to 0.13.3 - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit aa793a4fbcc4d44d367ba84d3782823885fec045 -Author: Emmanuele Bassi -Date: Wed May 18 13:37:38 2011 +0100 - - Release JSON-GLib 0.13.2 (snapshot) - - NEWS | 12 ++++++++++++ - configure.ac | 2 +- - 2 files changed, 13 insertions(+), 1 deletion(-) - -commit 595bdd9cc160f10edefb9e54f45cb4727f39ac24 -Merge: 46a8e57 d3db7ac -Author: Chun-wei Fan -Date: Wed May 4 01:47:14 2011 +0800 - - Merge branch 'master' into msvc-patch - -commit d3db7acc1f53491b6dd9637991a1eaf8bb5c5002 -Author: Tristan Van Berkom -Date: Tue May 3 00:20:12 2011 +0900 - - Fixed json_deserialize_pspec() to handle null nodes. - - This fixes deserialization to match serialization (bug 648539) - - json-glib/json-gobject.c | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -commit 9824a32a803bd194208d460068ce5ba91d776686 -Author: Tristan Van Berkom -Date: Sat Apr 23 18:15:37 2011 +0900 - - Warn from json_gobject_deserialize() if a listed property cannot be deserialized. - - json-glib/json-gobject.c | 3 +++ - 1 file changed, 3 insertions(+) - -commit 254e8e969968e7ed5f594238a980b20c6fabc46e -Author: Bastien Nocera -Date: Thu Apr 21 02:29:53 2011 +0100 - - reader: Fix bug in example usage - - json-glib/json-reader.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 46a8e576f2fae9563219fcd72a9866826e684559 -Author: Chun-wei Fan -Date: Wed Apr 13 00:34:05 2011 +0800 - - VS 2010 Project Files (automation support included) - - These are the VS 2010 project files to build JSON-GLib - and its test programs. The project for building the main JSON-GLib - DLL has its source files input into it by the preprocessor during - "make dist", like the VS2008 project files, simplifying its maintenance. - - build/win32/vs10/array-test.vcxproj | 172 ++++++++++++++++++ - build/win32/vs10/array-test.vcxproj.filters | 14 ++ - build/win32/vs10/builder-test.vcxproj | 172 ++++++++++++++++++ - build/win32/vs10/builder-test.vcxproj.filters | 14 ++ - build/win32/vs10/generator-test.vcxproj | 172 ++++++++++++++++++ - build/win32/vs10/generator-test.vcxproj.filters | 14 ++ - build/win32/vs10/install.vcxproj | 149 ++++++++++++++++ - build/win32/vs10/json-glib.props | 123 +++++++++++++ - build/win32/vs10/json-glib.sln | 146 +++++++++++++++ - build/win32/vs10/json-glib.vcxproj.filtersin | 20 +++ - build/win32/vs10/json-glib.vcxprojin | 196 +++++++++++++++++++++ - build/win32/vs10/node-test.vcxproj | 172 ++++++++++++++++++ - build/win32/vs10/node-test.vcxproj.filters | 14 ++ - build/win32/vs10/object-test.vcxproj | 172 ++++++++++++++++++ - build/win32/vs10/object-test.vcxproj.filters | 13 ++ - build/win32/vs10/parser-test.vcxproj | 172 ++++++++++++++++++ - build/win32/vs10/parser-test.vcxproj.filters | 14 ++ - build/win32/vs10/reader-test.vcxproj | 173 ++++++++++++++++++ - build/win32/vs10/reader-test.vcxproj.filters | 14 ++ - build/win32/vs10/test-serialize-boxed.vcxproj | 172 ++++++++++++++++++ - .../vs10/test-serialize-boxed.vcxproj.filters | 14 ++ - build/win32/vs10/test-serialize-complex.vcxproj | 171 ++++++++++++++++++ - .../vs10/test-serialize-complex.vcxproj.filters | 14 ++ - build/win32/vs10/test-serialize-full.vcxproj | 172 ++++++++++++++++++ - .../win32/vs10/test-serialize-full.vcxproj.filters | 14 ++ - build/win32/vs10/test-serialize-simple.vcxproj | 171 ++++++++++++++++++ - .../vs10/test-serialize-simple.vcxproj.filters | 14 ++ - 27 files changed, 2678 insertions(+) - -commit 6c74292e66be25840612d7ee6871f1668010eada -Author: Chun-wei Fan -Date: Wed Apr 13 00:30:38 2011 +0800 - - Updates to MSVC pre-configured headers - - Add automation support for config.h.win32(.in), so config.h.win32 - will be distributed with the correct version info during "make dist" - - Also eliminate json-version.h.win32 as it is no longer needed (distribute - json-version.h during "make dist") - - build/win32/config.h.win32 | 61 ------------------------ - build/win32/config.h.win32.in | 61 ++++++++++++++++++++++++ - build/win32/json-version.h.win32 | 100 --------------------------------------- - 3 files changed, 61 insertions(+), 161 deletions(-) - -commit a7bdf87ec150ac7a88a850190fa79359197e552e -Author: Chun-wei Fan -Date: Wed Apr 13 00:26:35 2011 +0800 - - MSVC Support with automation added (autotools part) - - This updates the autotools files so that the project to compile the main - JSON-GLib DLL will have its source files filed into the project during - "make dist". Plus, it enables the creation/distribution of json-version.h - and config.h.win32 with the correct version info during "make dist". - - These changes will simplify the maintenance of the VS project files, - and support for VS2010 is also added here, with similar automation support, - too. - - Makefile.am | 2 +- - build/win32/Makefile.am | 4 ++-- - build/win32/vs10/Makefile.am | 33 +++++++++++++++++++++++++++++++++ - build/win32/vs9/Makefile.am | 1 + - configure.ac | 2 ++ - json-glib/Makefile.am | 39 ++++++++++++++++++++++++++++++++++++++- - 6 files changed, 77 insertions(+), 4 deletions(-) - -commit 20fe28cfaa605e11c47fe53232b5dccfa47ddf8b -Author: Chun-wei Fan -Date: Wed Apr 13 00:02:48 2011 +0800 - - Update VS 2008 Project Files - - Add automation support for the VS 2008 project files - These are the updated VS 2008 Project files and property sheets - themselves. x64 compiling support is also added - - build/win32/vs9/array-test.vcproj | 132 ++++------- - build/win32/vs9/builder-test.vcproj | 134 +++++------ - build/win32/vs9/generator-test.vcproj | 134 +++++------ - build/win32/vs9/install.vcproj | 44 ++-- - build/win32/vs9/json-glib.sln | 115 +++++++++- - build/win32/vs9/json-glib.vcproj | 317 -------------------------- - build/win32/vs9/json-glib.vcprojin | 204 +++++++++++++++++ - build/win32/vs9/json-glib.vsprops | 20 +- - build/win32/vs9/node-test.vcproj | 134 +++++------ - build/win32/vs9/object-test.vcproj | 134 +++++------ - build/win32/vs9/parser-test.vcproj | 125 +++++----- - build/win32/vs9/reader-test.vcproj | 134 +++++------ - build/win32/vs9/test-serialize-boxed.vcproj | 134 +++++------ - build/win32/vs9/test-serialize-complex.vcproj | 134 +++++------ - build/win32/vs9/test-serialize-full.vcproj | 134 +++++------ - build/win32/vs9/test-serialize-simple.vcproj | 133 ++++------- - 16 files changed, 917 insertions(+), 1245 deletions(-) - -commit 61da54311018f7afedb5d1e8cbd88ae7a284714f -Author: Emmanuele Bassi -Date: Tue Apr 12 08:53:26 2011 +0100 - - doap: Fix the URI for Bugzilla - - JSON-GLib uses the GNOME Bugzilla instance. - - json-glib.doap | 19 +------------------ - 1 file changed, 1 insertion(+), 18 deletions(-) - -commit 0ff8f784848ad34c37bd60ad92791c6f76944803 -Author: Emmanuele Bassi -Date: Tue Apr 12 08:41:20 2011 +0100 - - build: List GIO in the json-glib pkgconfig file - - Building against JSON-GLib requires GIO. - - json-glib.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 8b060cd9144990aae6531982bad66050fafcb658 -Author: Emmanuele Bassi -Date: Fri Apr 8 15:17:19 2011 +0100 - - object: Use g_list_find_custom() - - Instead of manual iteration, let's use the function GList provides us. - - json-glib/json-object.c | 13 +++---------- - 1 file changed, 3 insertions(+), 10 deletions(-) - -commit 2158cecee6fe1da8786afe2fad94d1098f879786 -Author: Emmanuele Bassi -Date: Wed Mar 23 11:35:28 2011 +0000 - - build: Use AC_CANONICAL_HOST - - Since we check for the contents of the $host variable to detect - compilation on/for win32, we should also be using the canonicalization - facilities from autoconf. - - configure.ac | 20 +++++++++++--------- - 1 file changed, 11 insertions(+), 9 deletions(-) - -commit 992d966572e3e498031578558ac307d0f4909246 -Author: Rob Taylor -Date: Tue Mar 15 09:09:11 2011 +0000 - - gvariant: Pass NULL down the chain for *signature - - Some small internal change from passing the signature to a pointer to - the signature down the call chain caused all the checks for - signature==NULL to fail. - - Signed-off-by: Emmanuele Bassi - - json-glib/json-gvariant.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit af70f34b3fc46a4c464418ebd6a16d9a1f18af8a -Author: Eduardo Lima Mitev -Date: Thu Jan 27 16:58:48 2011 +0100 - - generator: Removes blank spaces from generated JSON when not pretty-print - - https://bugzilla.gnome.org/show_bug.cgi?id=640729 - - json-glib/json-generator.c | 35 +++++++++++------- - json-glib/tests/builder-test.c | 6 ++-- - json-glib/tests/generator-test.c | 34 +++++++++--------- - json-glib/tests/gvariant-test.c | 78 ++++++++++++++++++++-------------------- - 4 files changed, 82 insertions(+), 71 deletions(-) - -commit 8bb22d7de00f15ef44cad502d757639d8a4e8973 -Author: Emmanuele Bassi -Date: Tue Feb 15 16:28:07 2011 +0000 - - Fix introspection annotations - - json-glib/json-node.c | 7 ++++--- - json-glib/json-object.c | 4 ++-- - 2 files changed, 6 insertions(+), 5 deletions(-) - -commit 217127545b07f93ac27e3f137d748d61a5e199da -Author: Emmanuele Bassi -Date: Tue Feb 15 16:16:46 2011 +0000 - - tests/object: Add a set_member() unit - - Verify that setting an object member multiple times does not lead to - random values. - - json-glib/tests/object-test.c | 29 +++++++++++++++++++++++++++++ - 1 file changed, 29 insertions(+) - -commit 1a633159a593c962233a5ef4660e31e60eed96d9 -Author: Emmanuele Bassi -Date: Tue Feb 15 16:12:38 2011 +0000 - - object: Replace the name pointer in the members list - - When calling g_hash_table_replace() we also free the string holding the - member name. This means that the const gchar* pointer we store inside - the list of ordered member names now points to garbage - so if somebody - tries to iterate over the members list it will get random values instead - of a valid C string. - - Since we guaranteed insertion order, if we replace the contents of a - JsonObject member we need to find the right pointer and replace it: just - removing and prepending won't do. - - https://bugzilla.gnome.org/show_bug.cgi?id=642383 - - json-glib/json-object.c | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - -commit a125a724894a08a8d8053fdd2db92d0ad8e2dfd4 -Author: Emmanuele Bassi -Date: Sun Feb 6 23:10:54 2011 +0000 - - reader: Plug a leak - - Free the current_member string, and since we're destroying data we own - let's do it inside the finalize implementation instead of the dispose - one. - - json-glib/json-reader.c | 15 ++++++--------- - 1 file changed, 6 insertions(+), 9 deletions(-) - -commit 2c5f4563c54fa273ffd8dbe02b60a12c4b54b977 -Author: Emmanuele Bassi -Date: Sun Feb 6 12:22:49 2011 +0000 - - reader: Add accessor for the member name - - This should allow easy access to the member name during iteration. - - doc/reference/json-glib-sections.txt | 1 + - json-glib/json-glib.symbols | 1 + - json-glib/json-reader.c | 32 ++++++++++++++++++++++++++++++++ - json-glib/json-reader.h | 1 + - json-glib/tests/reader-test.c | 1 + - 5 files changed, 36 insertions(+) - -commit b2880f5a4dad07ff96a9b6578ffc5d677f75eb94 -Author: Emmanuele Bassi -Date: Sun Feb 6 11:34:22 2011 +0000 - - reader: Allow using read_element() on objects - - If we assume that a JSON object is just an array with a named mapping - then the JsonReader API should be able to descend into objects using the - same API used for arrays. - - This obviously is less useful than it sounds if we take a very strict - interpretation of JSON objects as unordered string-to-value mappings; as - the ordering is not guaranteed to be stable, parsers would be fairly - weak against various JSON definitions. - - If the JSON format parsed is guaranteed to be stable then an integer - offset might be an easy (albeit slightly less performant) way to access - data. - - json-glib/json-reader.c | 67 ++++++++++++++++++++++++++++++++----------- - json-glib/tests/reader-test.c | 6 ++++ - 2 files changed, 57 insertions(+), 16 deletions(-) - -commit 74ed11db6da9839ce17b448d6d17103ea0734dda -Author: Emmanuele Bassi -Date: Fri Feb 4 19:18:22 2011 +0000 - - reader: Add list_members() method - - Allow retrieving a list of member names from the current cursor position - of the JsonReader. It's useful if you're trying to inspect a JSON tree. - - doc/reference/json-glib-sections.txt | 1 + - json-glib/json-glib.symbols | 1 + - json-glib/json-reader.c | 46 ++++++++++++++++++++++++++++++++++++ - json-glib/json-reader.h | 1 + - json-glib/tests/reader-test.c | 19 +++++++++++++++ - 5 files changed, 68 insertions(+) - -commit eb14f92019bde75947a98f5578167af6b6a17974 -Author: Emmanuele Bassi -Date: Wed Jan 26 16:58:56 2011 +0000 - - Coding style fixes and compiler warnings removal - - G_VARIANT_CLASS_DICTIONARY is a define; GCC complais loudly when trying - to use a switch() on an enumeration type with case values not from the - enumeration. - - Plus: coding style in JSON-GLib is mostly the same as GTK+ and Clutter, - so we should adhere to it. - - json-glib/json-gvariant.c | 67 +++++++++++++++++++++++++---------------------- - 1 file changed, 36 insertions(+), 31 deletions(-) - -commit 212b243c07721242da3dc2c0e6dfe979f73ee5c6 -Author: Eduardo Lima Mitev -Date: Tue Nov 9 16:45:30 2010 +0100 - - gvariant: Adds JSON GVariant integration API, with docs and tests - - https://bugzilla.gnome.org/show_bug.cgi?id=632940 - - doc/reference/json-glib-docs.xml | 1 + - doc/reference/json-glib-sections.txt | 10 + - json-glib/Makefile.am | 2 + - json-glib/json-glib.h | 2 + - json-glib/json-gvariant.c | 1296 ++++++++++++++++++++++++++++++++++ - json-glib/json-gvariant.h | 46 ++ - json-glib/tests/Makefile.am | 4 + - json-glib/tests/gvariant-test.c | 233 ++++++ - 8 files changed, 1594 insertions(+) - -commit 822b6be848f3ad53ad113f0ce317b01f1a91a54f -Author: Emmanuele Bassi -Date: Sat Jan 15 18:36:34 2011 +0000 - - build: Do not dist a gzip tarball - - Use only bzip2, since it gives better compression ratios; the - installation script on gnome.org will create a gzipped tarball by itself - anyway. - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 7c07a6549df1ae1b4826bf40f70c62768ce7e35b -Author: Emmanuele Bassi -Date: Mon Jan 10 11:56:32 2011 +0000 - - build: Fix previous commit - - configure.ac | 7 +++++++ - 1 file changed, 7 insertions(+) - -commit bb67e146c9e883185d264e693cc4a07d1a60d191 -Author: Fan, Chun-wei -Date: Mon Jan 10 11:49:16 2011 +0000 - - build: Add Visual C++ 2008 project files - - Integrate the files inside the build, though it's still not fully - automated. - - https://bugzilla.gnome.org/show_bug.cgi?id=635484 - - Signed-off-by: Emmanuele Bassi - - build/Makefile.am | 2 +- - build/win32/Makefile.am | 3 + - build/win32/config.h.win32 | 61 +++++ - build/win32/json-version.h.win32 | 100 ++++++++ - build/win32/vs9/Makefile.am | 19 ++ - build/win32/vs9/array-test.vcproj | 189 +++++++++++++++ - build/win32/vs9/builder-test.vcproj | 189 +++++++++++++++ - build/win32/vs9/generator-test.vcproj | 189 +++++++++++++++ - build/win32/vs9/install.vcproj | 71 ++++++ - build/win32/vs9/json-glib.sln | 80 +++++++ - build/win32/vs9/json-glib.vcproj | 317 ++++++++++++++++++++++++++ - build/win32/vs9/json-glib.vsprops | 93 ++++++++ - build/win32/vs9/node-test.vcproj | 189 +++++++++++++++ - build/win32/vs9/object-test.vcproj | 187 +++++++++++++++ - build/win32/vs9/parser-test.vcproj | 189 +++++++++++++++ - build/win32/vs9/reader-test.vcproj | 190 +++++++++++++++ - build/win32/vs9/test-serialize-boxed.vcproj | 189 +++++++++++++++ - build/win32/vs9/test-serialize-complex.vcproj | 188 +++++++++++++++ - build/win32/vs9/test-serialize-full.vcproj | 189 +++++++++++++++ - build/win32/vs9/test-serialize-simple.vcproj | 189 +++++++++++++++ - 20 files changed, 2822 insertions(+), 1 deletion(-) - -commit c7cd46b8320157e223009aa2a7204461c7d301d5 -Author: Emmanuele Bassi -Date: Mon Jan 10 11:48:26 2011 +0000 - - build: Add .symbols file for win32 builds - - json-glib/Makefile.am | 2 + - json-glib/json-glib.symbols | 163 ++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 165 insertions(+) - -commit 4549af3210461a07dc84a30433a0a23764618e4c -Author: Evan Nemerson -Date: Sat Nov 20 16:25:41 2010 -0800 - - Add C include information to GIR - - Bug #635398 - - json-glib/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit f89a50e24d2088061eb7d975db7e6f39beaf853d -Author: Emmanuele Bassi -Date: Mon Jan 10 11:16:17 2011 +0000 - - object: Do some more validation in set_member() - - Check if we're setting the same node, to avoid a needless replace. - - json-glib/json-object.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -commit e828cba563f2584e848994935478a7ffd21728df -Author: Luca Bruno -Date: Thu Jan 6 17:44:46 2011 +0100 - - Add missing introspection annotations. - - https://bugzilla.gnome.org/show_bug.cgi?id=638932 - - json-glib/json-array.c | 8 ++++---- - json-glib/json-node.c | 8 ++++---- - json-glib/json-object.c | 8 ++++---- - json-glib/json-parser.c | 2 +- - json-glib/json-serializable.c | 2 +- - 5 files changed, 14 insertions(+), 14 deletions(-) - -commit 02dd77efaa60201f74349c969dc005c8bb092057 -Author: Emmanuele Bassi -Date: Mon Jan 10 10:45:39 2011 +0000 - - generator: Use g_ascii_dtostr() to avoid losing precision - - The nice format escape for g_ascii_formatd() is not really suited for a - serialization format, as it obviously loses precision. - - https://bugzilla.gnome.org/show_bug.cgi?id=637244 - - json-glib/json-generator.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -commit 3dbab961e675d0684df1121906ae3588d09653e6 -Author: Emmanuele Bassi -Date: Mon Jan 10 10:43:58 2011 +0000 - - builder-test: Do not compare serialized double values - - Serialization of floating point values might lead to odd formats, - especially when dealing with IEEE machine-neutral values. - - json-glib/tests/builder-test.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 567d7fb4dff83c9e37e64ef8611f0231fa181c34 -Author: Emmanuele Bassi -Date: Tue Dec 14 16:35:24 2010 +0000 - - reader: Use GObject ≥ 2.26 API - - Use modern API to deal with properties installation and notification. - - json-glib/json-reader.c | 35 +++++++++++++++-------------------- - 1 file changed, 15 insertions(+), 20 deletions(-) - -commit 9aed6f5a455109186ae56ec1c3e558505644d57f -Author: Emmanuele Bassi -Date: Tue Dec 14 16:26:10 2010 +0000 - - generator: Clean up and add accessors - - Instead of asking everyone to use g_object_set() to set up a - JsonGenerator the class should provide a decent API for its properties. - - While we're at it, we should also use modern API for installing and - notifying of property changes. - - doc/reference/json-glib-sections.txt | 11 +- - json-glib/json-generator.c | 256 +++++++++++++++++++++++++++++------ - json-glib/json-generator.h | 37 +++-- - 3 files changed, 247 insertions(+), 57 deletions(-) - -commit de991a0c6dc4d0b3c366248e20ba6853bd2c3e92 -Author: Emmanuele Bassi -Date: Tue Dec 14 11:39:04 2010 +0000 - - generator: Verify that the decimal separator is locale-independent - - There shouldn't be a requirement for this, since we're using the GLib - function explicitely for this reason, but it's always good to have a - comprehensive test suite. - - json-glib/tests/generator-test.c | 58 ++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 58 insertions(+) - -commit 4add0e081b8f58dec1cd68152d846be87942091e -Author: Emmanuele Bassi -Date: Tue Dec 14 11:37:25 2010 +0000 - - generator: Implement dumping bare values - - JsonGenerator is not able to generate strings for bare values, something - that completely went under the radar for all this time. - - json-glib/json-generator.c | 15 ++++++++++----- - 1 file changed, 10 insertions(+), 5 deletions(-) - -commit 20a16d5b9ecabe68ee18655b2ff3bdb17136c6f1 -Author: Emmanuele Bassi -Date: Tue Oct 19 09:59:38 2010 +0100 - - build: Resync the GTest rules with upstream - - Upstream GLib fixed the test rules to avoid repeating the test suite - three times. - - build/autotools/Makefile.am.gtest | 21 ++++++++++++--------- - 1 file changed, 12 insertions(+), 9 deletions(-) - -commit dc262a09572328342164ebb23ad698b5cb3cd8ff -Author: Emmanuele Bassi -Date: Tue Oct 19 09:49:20 2010 +0100 - - Use G_DEFINE_INTERFACE() - - json-glib/json-serializable.c | 35 +++++++---------------------------- - 1 file changed, 7 insertions(+), 28 deletions(-) - -commit 80665415cd945f3dafed6925c9975f36b916a80f -Author: Emmanuele Bassi -Date: Tue Oct 19 09:49:05 2010 +0100 - - Use G_DEFINE_BOXED_TYPE() - - json-glib/json-array.c | 13 +------------ - json-glib/json-node.c | 13 +------------ - json-glib/json-object.c | 13 +------------ - 3 files changed, 3 insertions(+), 36 deletions(-) - -commit 51e2eef48fabbee554193ee9eadfb8696ebb3ac7 -Author: Emmanuele Bassi -Date: Tue Oct 19 09:48:23 2010 +0100 - - build: Depend on GLib ≥ 2.26 - - README | 2 +- - configure.ac | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit d28db01f5d12497ec96d5e507af4003b076dd154 -Author: Emmanuele Bassi -Date: Wed Sep 29 17:25:18 2010 +0100 - - build: Use -no-undefined when compiling on win32 - - configure.ac | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -commit 5332217481b3e5fee73710bb50886fbc52a632a4 -Author: Emmanuele Bassi -Date: Sat Sep 25 12:02:36 2010 +0100 - - Post-branch version bump to 0.13.1 - - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 6b4d49b8024f672d62a7059c083455ad31f7d0eb -Author: Emmanuele Bassi -Date: Sat Sep 25 11:59:23 2010 +0100 - - Post-release version bump to 0.12.1 - - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 661a7497cc88aebdee32bf31c219d457ca143590 -Author: Emmanuele Bassi -Date: Sat Sep 25 11:28:42 2010 +0100 - - Release JSON-GLib 0.12.0 - - NEWS | 1 + - README | 6 +++--- - configure.ac | 4 ++-- - 3 files changed, 6 insertions(+), 5 deletions(-) - -commit 9b6acd68e156a45cc845bdebd99c174e82d0677c -Author: Emmanuele Bassi -Date: Sat Sep 25 11:50:38 2010 +0100 - - gobject: Fix deserialization of construct-only properties - - Commit 2d7550948dfb2e5907b851bc2c4bd296a7526086 broke the construct-only - properties; we now only check for the G_PARAM_CONSTRUCT_ONLY flag, and - pass construct-only properties to g_object_newv(); all the properties - flagged as G_PARAM_CONSTRUCT gets passed with the rest of the properties - after that. - - json-glib/json-gobject.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit d480f2e77e3dc0d00fc617686b306f96353b7177 -Author: Emmanuele Bassi -Date: Sat Sep 25 11:49:41 2010 +0100 - - test-serialize-full: Remove the dummy deserialize implementation - - If you don't override JsonSerializable, you get the default behaviour - anyway. - - tests/test-serialize-full.c | 15 +-------------- - 1 file changed, 1 insertion(+), 14 deletions(-) - -commit ff5dd56e4f864d0c015dcd66fa852f9cf7cf90dd -Author: Emmanuele Bassi -Date: Sat Sep 25 11:49:19 2010 +0100 - - debug: Add debug notes in the GObject code - - json-glib/json-gobject.c | 14 ++++++++++++-- - json-glib/json-serializable.c | 3 +++ - 2 files changed, 15 insertions(+), 2 deletions(-) - -commit 7707b18f42b3a19dd780ba73ce1dabb6b8ef3c95 -Author: Emmanuele Bassi -Date: Sat Sep 25 11:48:25 2010 +0100 - - debug: Add debug flags for GObject-related code - - json-glib/json-debug.c | 3 ++- - json-glib/json-debug.h | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -commit c6bf7ecb0a836b5b43f203cb22be577bd54b9e9a -Author: Emmanuele Bassi -Date: Sat Sep 25 11:23:43 2010 +0100 - - introspection: Update to 0.9.5 - - Add --warn-all for the scanner flags. - - Also, undefine JSON_DISABLE_DEPRECATED, to introspect deprecated API. - - configure.ac | 2 +- - json-glib/Makefile.am | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -commit 617286e4d38a93e41e1e1d974d01c1d73fd2ff66 -Author: Emmanuele Bassi -Date: Sat Sep 25 11:23:10 2010 +0100 - - Add introspection annotations - - json-glib/json-array.c | 4 ++-- - json-glib/json-gboxed.c | 14 +++++++------- - json-glib/json-gobject.c | 4 ++-- - json-glib/json-object.c | 4 ++-- - 4 files changed, 13 insertions(+), 13 deletions(-) - -commit 19b0b873c07f918e06a8610f27a439334334a83d -Author: Colin Walters -Date: Thu Sep 9 10:24:53 2010 -0400 - - introspection: Export json-glib-1.0 pkg-config file - - json-glib/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit d05e919208a47c18d001ac08900b4d2837efd4b4 -Author: Luca Bruno -Date: Sun Aug 15 20:30:21 2010 +0200 - - docs: Add transfer none annotation to JsonBuilder return values. - - json-glib/json-builder.c | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) - -commit 2c3062cbd79826b184a6f613c519e69f3ddc1ec6 -Author: Emmanuele Bassi -Date: Sun Aug 15 18:46:02 2010 +0100 - - builder: Add Since: annotations - - json-glib/json-builder.h | 54 +++++++++++++++++++++++++++--------------------- - 1 file changed, 30 insertions(+), 24 deletions(-) - -commit 2d7550948dfb2e5907b851bc2c4bd296a7526086 -Author: Emmanuele Bassi -Date: Sun Aug 15 18:44:13 2010 +0100 - - gobject: Use construct and construct-only properties - - Right now, we're checking twice for G_PARAM_CONSTRUCT_ONLY, but what we - really want is to check for both G_PARAM_CONSTRUCT and - G_PARAM_CONSTRUCT_ONLY properties when creating a new instance from a - JSON definition. - - json-glib/json-gobject.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit be48afe5801a541996bb64437c278088e70258f6 -Author: Emmanuele Bassi -Date: Sun Aug 15 18:43:49 2010 +0100 - - build: Use maintainer-clean for removing ignore files - - build/autotools/Makefile.am.gitignore | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -commit 5732cadfab58435ded4e88b0733c1a46aa0dcd2d -Author: Emmanuele Bassi -Date: Sat Aug 14 12:55:18 2010 +0100 - - build: Automate ignoring test binaries - - Use noinst_PROGRAMS to generate the list of test binaries to ignore - directly in the test directories. - - .gitignore | 11 ----------- - build/autotools/Makefile.am | 3 ++- - build/autotools/Makefile.am.gitignore | 19 +++++++++++++++++++ - json-glib/tests/Makefile.am | 4 ++++ - tests/Makefile.am | 4 ++++ - 5 files changed, 29 insertions(+), 12 deletions(-) - -commit 8b54bed521b609c373a48d27c880cc70272b6313 -Author: Emmanuele Bassi -Date: Sat Aug 14 12:26:29 2010 +0100 - - docs: Add 0.12 symbols index to the API reference - - doc/reference/json-glib-docs.xml | 5 +++++ - 1 file changed, 5 insertions(+) - -commit 9ed8d5e7fe96b9dcf82ddbba7de2db40d415cbaf -Author: Emmanuele Bassi -Date: Sat Aug 14 12:24:59 2010 +0100 - - reader: Add :root constructor property - - A JsonReader is useless without a root JsonNode to start walking the - tree from. - - json-glib/json-reader.c | 96 +++++++++++++++++++++++++++++++++++++++---- - json-glib/json-reader.h | 2 +- - json-glib/tests/reader-test.c | 4 +- - 3 files changed, 91 insertions(+), 11 deletions(-) - -commit eeeae2194223abe2515e18edec1bdbbb6a7c793d -Author: Emmanuele Bassi -Date: Sat Aug 14 09:40:44 2010 +0100 - - docs: Add the RFC draft for JSON schema - - doc/draft-zyp-json-schema-02.txt | 1345 ++++++++++++++++++++++++++++++++++++++ - 1 file changed, 1345 insertions(+) - -commit 0281176789b38973b1723f752070cb0e7340055d -Author: Emmanuele Bassi -Date: Thu Aug 12 16:09:45 2010 +0100 - - reader: Do not wrap JsonParser - - Since JsonParser has far more methods for parsing a JSON stream we - should just make JsonReader an API for reading an already parsed JSON - tree - in the same way that JsonBuilder does not generate the - stringified version of the JSON tree it builds. - - doc/reference/json-glib-sections.txt | 2 +- - json-glib/json-reader.c | 90 ++++++++++++------------------------ - json-glib/json-reader.h | 6 +-- - json-glib/tests/reader-test.c | 11 ++++- - 4 files changed, 41 insertions(+), 68 deletions(-) - -commit 149d2f3925ca798886f2137ae73488f7e2e6386b -Author: Emmanuele Bassi -Date: Thu Aug 12 15:55:54 2010 +0100 - - reader: Mirror the JsonBuilder API value accessors - - We should strive to make JsonBuilder and JsonReader similar in API. - - doc/reference/json-glib-sections.txt | 10 +++++----- - json-glib/json-reader.c | 34 +++++++++++++++++----------------- - json-glib/json-reader.h | 10 +++++----- - json-glib/tests/reader-test.c | 8 ++++---- - 4 files changed, 31 insertions(+), 31 deletions(-) - -commit b385ca3ae47e68cdf48f3641385b9fe5ac8429bc -Author: Emmanuele Bassi -Date: Thu Aug 12 15:35:17 2010 +0100 - - docs: Update NEWS - - NEWS | 2 ++ - 1 file changed, 2 insertions(+) - -commit 23866cb9935e9b9f7c88b26cdfc13ff95edfbe00 -Author: Emmanuele Bassi -Date: Thu Aug 12 15:34:09 2010 +0100 - - docs: Add JsonReader to the API reference - - doc/reference/json-glib-docs.xml | 1 + - doc/reference/json-glib-sections.txt | 41 ++++++++++++++++++++++++++++++++++++ - doc/reference/json-glib.types | 2 ++ - 3 files changed, 44 insertions(+) - -commit 10e5a1d38113b7b6e7c71da76ff11219baf1022d -Author: Emmanuele Bassi -Date: Thu Aug 12 15:29:41 2010 +0100 - - Add JsonReader - - JsonReader is a simple, cursor-based API for parsing a JSON DOM. It is - similar, in spirit, to the XmlReader API provided by various platforms - and XML parsing libraries. - - .gitignore | 1 + - json-glib/Makefile.am | 2 + - json-glib/json-glib.h | 3 + - json-glib/json-reader.c | 779 ++++++++++++++++++++++++++++++++++++++++++ - json-glib/json-reader.h | 142 ++++++++ - json-glib/tests/Makefile.am | 10 +- - json-glib/tests/reader-test.c | 101 ++++++ - 7 files changed, 1035 insertions(+), 3 deletions(-) - -commit c3215ba1d46f7965fb58272da069bec389a174df -Author: Diego Escalante Urrelo -Date: Wed Aug 11 14:42:25 2010 -0500 - - json-glib/tests: explicitely link against glib - - Tests fail to link otherwise. - - Bug #626669 - - json-glib/tests/Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -commit 7f85693922d1e2614bcce9219d2c6521580dd360 -Author: Emmanuele Bassi -Date: Mon Aug 2 18:04:21 2010 +0100 - - build: Remove all stray mentions of Shave - - We depend on automake 1.11, now. - - .gitignore | 3 --- - autogen.sh | 15 +++------------ - build/autotools/Makefile.am | 2 -- - configure.ac | 1 - - 4 files changed, 3 insertions(+), 18 deletions(-) - -commit 26efdb4cc25cffa857e4ce36f0ad7ee6efe00634 -Author: Emmanuele Bassi -Date: Mon Aug 2 17:49:32 2010 +0100 - - Post-release version bump to 0.11.3 - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit ff7a8ff73ee214d385c64501c8b5dc682ccad1cf -Author: Emmanuele Bassi -Date: Mon Aug 2 17:40:29 2010 +0100 - - Release 0.11.2 (0.12.0-rc1) - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 8a91b052fba48ae6f4a61115e2fa6839e7a21509 -Author: Emmanuele Bassi -Date: Mon Aug 2 17:45:35 2010 +0100 - - build: Fix up the tests data path - - Since we load up a test file from a directory, we should be using a - path - otherwise this will break out-of-tree builds, e.g. when doing - a distcheck. - - json-glib/tests/Makefile.am | 2 +- - json-glib/tests/parser-test.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -commit 2e3eaabd12829187f5a9ddacef68319442362729 -Author: Emmanuele Bassi -Date: Mon Aug 2 17:42:09 2010 +0100 - - build: Fix introspection dependencies - - json-glib/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit def6d5612fbb33f9b02df80294651f5a28a83ccc -Author: Emmanuele Bassi -Date: Mon Aug 2 17:15:36 2010 +0100 - - Update the NEWS file - - NEWS | 2 ++ - 1 file changed, 2 insertions(+) - -commit 385e6278477dfd35d591f8343deb1de2827ac2ff -Author: Emmanuele Bassi -Date: Mon Aug 2 17:15:22 2010 +0100 - - docs: Update the dependencies in the README file - - README | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 5e19ed2523441afd12c45a8b3f19d10fc9a37335 -Author: Emmanuele Bassi -Date: Mon Aug 2 17:14:52 2010 +0100 - - build: Revert the GLib version bump - - GIO landed in GLib 2.16, so we don't need the version bump to 2.20. - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit d9b2845572123ed79a6626d90d2d2298c9c3d5a7 -Author: Emmanuele Bassi -Date: Mon Aug 2 17:07:36 2010 +0100 - - generator: Add an OutputStream-based method - - Currently, only synchronous API. - - The output handling is pretty trivial, unlike the input handling in - JsonParser; this is a really basic convenience API. - - doc/reference/json-glib-sections.txt | 1 + - json-glib/json-generator.c | 37 ++++++++++++++++++++++++++++++++++++ - json-glib/json-generator.h | 22 +++++++++++++-------- - 3 files changed, 52 insertions(+), 8 deletions(-) - -commit c7c288b89175b1f9545d6ddff25609b7bb243041 -Author: Emmanuele Bassi -Date: Mon Aug 2 17:04:38 2010 +0100 - - Fix the include for json-types.h - - json-glib/json-parser.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit e6ea3a6bae044ec7874dfde3b50bb337f00bb3be -Author: Emmanuele Bassi -Date: Mon Aug 2 16:41:18 2010 +0100 - - Exercise the stream API in JsonParser - - json-glib/tests/Makefile.am | 2 ++ - json-glib/tests/parser-test.c | 78 ++++++++++++++++++++++++++++++++++++++++ - json-glib/tests/stream-load.json | 1 + - 3 files changed, 81 insertions(+) - -commit 8cac7f2b6987803e36ff6abe012cd3e017b5b960 -Author: Emmanuele Bassi -Date: Mon Aug 2 16:40:36 2010 +0100 - - docs: Add the new JsonParser stream API - - doc/reference/json-glib-sections.txt | 3 +++ - 1 file changed, 3 insertions(+) - -commit 107e53b2daa27b99fb629dd1e2bf9bfd2729b3dd -Author: Emmanuele Bassi -Date: Mon Aug 2 16:39:04 2010 +0100 - - parser: Add loading from a GInputStream - - JsonParser should be able to use a GInputStream (both synchronously and - asynchronously) to retrieve the JSON data and parse it. - - json-glib/json-parser.c | 258 ++++++++++++++++++++++++++++++++++++++++++++++++ - json-glib/json-parser.h | 49 +++++---- - 2 files changed, 289 insertions(+), 18 deletions(-) - -commit b164bb5180749aaff385f5d61866875bfbf9c552 -Author: Emmanuele Bassi -Date: Mon Aug 2 16:38:01 2010 +0100 - - build: Use the GIO prefix for cross-references - - doc/reference/Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -commit 6d317b129169352111ab16a0df9aee8b9aa5284b -Author: Emmanuele Bassi -Date: Mon Aug 2 16:37:32 2010 +0100 - - build: Depend on GIO - - Bump up the dependencies to be able to use GIO. - - configure.ac | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -commit 84230dd03b5db34da5ccef0a4926e18c22124952 -Author: Emmanuele Bassi -Date: Wed Jul 21 23:50:09 2010 +0100 - - docs: Fix up the cgit URL - - README | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit 67ad0f21ca554edcd6633014b0bce7dd8d216191 -Author: Emmanuele Bassi -Date: Wed Jul 21 23:49:56 2010 +0100 - - Update NEWS for the next stable release - - NEWS | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -commit 465880e5ccaca086fd1b881bd7175658d627318c -Author: Colin Walters -Date: Tue Jul 6 10:49:27 2010 -0400 - - Make GIR depend on library - - Fixes parallel builds. - - json-glib/Makefile.am | 2 ++ - 1 file changed, 2 insertions(+) - -commit 66e5f619d55433985460e8c641beb98e85832451 -Author: Emmanuele Bassi -Date: Wed Jun 16 12:07:41 2010 +0100 - - docs: Add JsonBuilder to the API reference - - And silence gtk-doc-scanner by removing an undefined argument from - json_builder_add_null_value(). - - doc/reference/json-glib-docs.xml | 3 ++- - doc/reference/json-glib-sections.txt | 32 ++++++++++++++++++++++++++++++++ - doc/reference/json-glib.types | 2 ++ - json-glib/json-builder.c | 3 ++- - 4 files changed, 38 insertions(+), 2 deletions(-) - -commit 08f3073eeb0f7e2e0973abd23ba4ec978ad302d7 -Author: Luca Bruno -Date: Wed Jun 9 21:31:06 2010 +0200 - - builder: Add convenience API for building JSON trees. - - https://bugzilla.gnome.org/show_bug.cgi?id=621141 - - Signed-off-by: Emmanuele Bassi - - .gitignore | 1 + - json-glib/Makefile.am | 2 + - json-glib/json-builder.c | 682 +++++++++++++++++++++++++++++++++++++++++ - json-glib/json-builder.h | 100 ++++++ - json-glib/json-glib.h | 1 + - json-glib/tests/Makefile.am | 3 + - json-glib/tests/builder-test.c | 121 ++++++++ - 7 files changed, 910 insertions(+) - -commit 3f8c8f99126dc1a70d847eded13afd4b64395250 -Author: Emmanuele Bassi -Date: Wed Jun 16 11:54:55 2010 +0100 - - Allow NULL as a value for strings, arrays and objects - - We should not warn when asking for a string, array or object if the - contents were 'null'. - - json-glib/json-array.c | 42 +++++++++++++++++++++++++++++++--------- - json-glib/json-object.c | 45 ++++++++++++++++++++++++++++++++++--------- - json-glib/tests/object-test.c | 4 ++++ - 3 files changed, 73 insertions(+), 18 deletions(-) - -commit 471bcf28589e0929984c4e6a097ae273b017b3f0 -Author: Anssi Hannula -Date: Fri May 28 11:57:18 2010 +0100 - - Do not hardcode paths in pkgconfig file - - The pkgconfig file correctly sets $prefix to @prefix@, but the other - paths are hardcoded to ones relative to $prefix. - - prefix=@prefix@ - exec_prefix=${prefix} - libdir=${exec_prefix}/lib - includedir=${exec_prefix}/include - - https://bugzilla.gnome.org/show_bug.cgi?id=613282 - - Signed-off-by: Emmanuele Bassi - - json-glib.pc.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit 70b9235b50dd4257e0bf196e07f65807d65f8091 -Author: Emmanuele Bassi -Date: Fri May 28 11:50:01 2010 +0100 - - docs: Remove unused field annotation - - JsonNode is fully opaque, so there are no fields to annotate. - - json-glib/json-types.h | 1 - - 1 file changed, 1 deletion(-) - -commit aaf08f5c1a08c8aaec2436653114996b98ee1f8c -Author: Emmanuele Bassi -Date: Fri May 28 11:35:05 2010 +0100 - - build: Clean up the build system - - • Use libtool m4 macros, and require libtool >= 2.2.6 - - • Ditch unused platform checks - - • Drop Shave and require automake >= 1.11 - - • Depend on gtk-doc >= 1.13 - - • Use gobject-introspection's Makefile rules, and update introspection.m4 - - README | 4 +- - build/autotools/Makefile.am | 3 -- - build/autotools/Makefile.am.silent | 6 --- - build/autotools/introspection.m4 | 6 +++ - build/autotools/shave-libtool.in | 69 --------------------------------- - build/autotools/shave.in | 79 -------------------------------------- - build/autotools/shave.m4 | 77 ------------------------------------- - configure.ac | 46 +++++++--------------- - json-glib/Makefile.am | 47 ++++++++--------------- - 9 files changed, 37 insertions(+), 300 deletions(-) - -commit 6231cf027a8f9c3b11324c1d49a350ba55353123 -Author: Emmanuele Bassi -Date: Wed May 26 08:43:10 2010 +0100 - - parser: Do not access GScanner:token - - The GScanner:token member is declared as GTokenType instead of being an - unsigned int. This means that comparing it to any other enumeration is - going to generate a warning in GCC >= 4.5. Unfortunately, extending the - GTokenType enumeration is the idiomatic way of handling new tokens. - - EPIC. FAIL. - - json-glib/json-parser.c | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -commit fcd07918d3ed2b31b047900da9d2fed23dddf7da -Author: Eiichi Sato -Date: Sat Apr 10 01:52:10 2010 +0900 - - Support for surrogate pairs in json string. - - https://bugzilla.gnome.org/show_bug.cgi?id=615799 - - Signed-off-by: Emmanuele Bassi - - json-glib/json-scanner.c | 16 +++++++++++++++- - 1 file changed, 15 insertions(+), 1 deletion(-) - -commit 37a7931f91f8d79def3f4895bc349ba621a826a1 -Author: Emmanuele Bassi -Date: Wed Apr 14 23:19:58 2010 +0100 - - Ignore json-debug.h - - The json-debug.h header is private and not installed; hence, it should - be ignored by gtk-doc. - - doc/reference/Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -commit 28edd58ddfd719d107d89aa364dc208b0126c90f -Author: Emmanuele Bassi -Date: Wed Apr 14 23:19:28 2010 +0100 - - docs: Fix typo - - There is no such thing as a 'JsonArrary' type. - - json-glib/json-parser.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit d40045bd855bfcb73c10967d894a8e91f8675409 -Author: Emmanuele Bassi -Date: Wed Apr 14 23:17:28 2010 +0100 - - docs: Fix typo in JsonParserError annotation - - json-glib/json-parser.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit b55d139ed0368f368c6c9c8f8adfab4c91f1f508 -Author: Emmanuele Bassi -Date: Sat Apr 3 14:59:00 2010 +0100 - - parser: Do not increment the index variable - - When parsing an array with a JsonParser with the debugging notes - enabled, we get an erroneous increment of the idx variable - which is - then passed to the JsonParser::array-element signal. - - Thanks to: Michael Stapelberg - - json-glib/json-parser.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 24567790d30e314ee519c8f3756b3514c0c3fd31 -Author: Emmanuele Bassi -Date: Fri Mar 19 15:45:24 2010 +0000 - - parser: Add MISSING_COLON error - - We identify a missing ':' separator between an object member name and - its value, so it would be a good thing to actually have an error code - for that. - - json-glib/json-parser.c | 3 +-- - json-glib/json-parser.h | 2 ++ - json-glib/tests/parser-test.c | 3 ++- - 3 files changed, 5 insertions(+), 3 deletions(-) - -commit 08cec3b7c9202007a5abbf548f8d2f1b54d4d0b4 -Author: Emmanuele Bassi -Date: Fri Mar 19 15:40:48 2010 +0000 - - parser: Refactor the JsonParser logic - - The array and object parsing logic in JsonParser has clearly exploded - beyond control: a simple tightening of the JSON validation almost broke - the parser in two. It it is time to... - - - - REFACTOR THE CODE! - - - - This time, we should be following the JSON state machine and try to do - more prediction of the next state based on peeking the next token. - - The code is fairly cleaner, now; and, most of all, still passes the - validation test suite - which is, you know... nice. - - json-glib/json-parser.c | 488 ++++++++++++++++++++---------------------------- - 1 file changed, 200 insertions(+), 288 deletions(-) - -commit 9ce82f8052290f3956c3d80c8739c214da314d42 -Author: Emmanuele Bassi -Date: Fri Mar 19 11:04:00 2010 +0000 - - parser: Return specific error codes - - The JsonScanner error reporting mechanism, which is basically - GScanner's, sucks beyond belief. In order to report an error code we - need to store it inside the JsonParser private structure and then use it - when creating the GError inside the error handler. - - This, frankly, is quite stupid. - - json-glib/json-parser.c | 49 ++++++++++++++++++++++++++++++++++--------- - json-glib/json-parser.h | 8 +++++++ - json-glib/tests/parser-test.c | 18 ++++++++-------- - 3 files changed, 56 insertions(+), 19 deletions(-) - -commit 9d7c58b4fb5edeb8e9413acc9d509447e13962e5 -Author: Emmanuele Bassi -Date: Thu Mar 18 22:41:14 2010 +0000 - - JSON-GLib bug tracking system has been moved - - We are now using bugzilla.gnome.org, since we're already hosted on - git.gnome.org. - - README | 2 +- - configure.ac | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 449656c68a3d6e0d8b96c36414b475e78b9cc272 -Author: Emmanuele Bassi -Date: Thu Mar 18 17:11:11 2010 +0000 - - parser-test: Add a case for double parsing in JsonObject - - json-glib/tests/parser-test.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -commit 54756457de3f01d1a487fc6b90c5bd9b5b50bcf3 -Author: Emmanuele Bassi -Date: Thu Mar 18 17:09:38 2010 +0000 - - parser: Re-use json_parse_value() - - The main switch inside json_parse_statement() is re-implementing the - bare value parsing that is also provided by json_parse_value(). We - should kill it off to avoid redundant code. - - json-glib/json-parser.c | 57 ++----------------------------------------------- - 1 file changed, 2 insertions(+), 55 deletions(-) - -commit 3355987049560b4d31af22476a7c2b20c9d6665b -Author: Emmanuele Bassi -Date: Thu Mar 18 17:08:44 2010 +0000 - - parser: Add debug annotations for json_parse_value() - - Print out the values we are parsing, for debug purposes. - - json-glib/json-parser.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -commit f622ee8d8ba54ddea6fbb7311a905ffab7842e8d -Author: Emmanuele Bassi -Date: Thu Mar 18 17:05:57 2010 +0000 - - generator: Use %g format for g_ascii_formatd() - - I should read the documentation for the functions I use: - - Converts a gdouble to a string, using the '.' as decimal point. To - format the number you pass in a printf()-style format string. Allowed - conversion specifiers are 'e', 'E', 'f', 'F', 'g' and 'G'. - -- from g_ascii_formatd() in GLib's API reference - - Epic reading fail. - - json-glib/json-generator.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 90d6e0b8c334b3fd7995c126f07dd61ba0a9e0fb -Author: Emmanuele Bassi -Date: Thu Mar 18 15:26:19 2010 +0000 - - parser-test: Add a complex nested object test - - The nested object test should use something that's really complex: an - object with a nested array and nested object definitions. - - json-glib/tests/parser-test.c | 21 ++++++++++++++++++++- - 1 file changed, 20 insertions(+), 1 deletion(-) - -commit f4c57ac4227c4edb8a4cecb784e871fbd5649ad1 -Author: Emmanuele Bassi -Date: Thu Mar 18 15:24:39 2010 +0000 - - parser: Clean up array and object parsing - - We are doing some of the work twice, especially when dealing with the - trailing commas detection and the unknown tokens after an array element - or an object member definition. - - json-glib/json-parser.c | 44 ++++++++++++++++++++++++-------------------- - 1 file changed, 24 insertions(+), 20 deletions(-) - -commit b3435c6a05ecee58c64dce669ce7e44f829afc98 -Author: Emmanuele Bassi -Date: Thu Mar 18 15:21:29 2010 +0000 - - Add debugging macros - - Similarly to what GTK+ and Clutter do, we can use macros that evaluate - to nothing if JSON_ENABLE_DEBUG is disabled; they evaluate to messages - when the JSON_DEBUG environment variable is set to a debug domain. - - json-glib/Makefile.am | 4 +++- - json-glib/json-debug.c | 37 +++++++++++++++++++++++++++++++++++++ - json-glib/json-debug.h | 45 +++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 85 insertions(+), 1 deletion(-) - -commit 88ac0d5111eb528e4c396e4c169ceee4fb046e62 -Author: Emmanuele Bassi -Date: Fri Mar 5 19:23:49 2010 +0000 - - tests: Add another trailing comma invalid test - - json-glib/tests/parser-test.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -commit c22c1151e418af9506547804d4bc9fddb60bc0f1 -Author: Emmanuele Bassi -Date: Mon Mar 1 17:42:41 2010 +0000 - - tests: Add negative tests - - Verify that invalid JSON will trigger a parser error. - - json-glib/tests/parser-test.c | 53 +++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 53 insertions(+) - -commit 26668fe238a52a7fd8374f409fc277aaa8efa826 -Author: Emmanuele Bassi -Date: Mon Mar 1 17:41:14 2010 +0000 - - parser: Improve strictness - - Apparently, some breakage crept in JsonParser which allowed invalid JSON - to actually pass. For instance: trailing and missing commas, invalid - barewords and wrong array and object closing braces. - - json-glib/json-parser.c | 117 ++++++++++++++++++++++++++++++++---------------- - 1 file changed, 78 insertions(+), 39 deletions(-) - -commit 7d156366e9062349fbe58344712a055839449098 -Author: Emmanuele Bassi -Date: Sun Jan 24 19:09:28 2010 +0000 - - build: Configure Automake - - Add the following options: - - • no-define: we don't need PACKAGE and VERSION defined in config.h - • -Wno-portability: we require GNU make - • dist-bzip2: generate a bz2 tarball when distchecking - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit ea666891cb1e6fc9e527ce6c93a306bc97145f16 -Author: Emmanuele Bassi -Date: Sun Jan 24 18:58:28 2010 +0000 - - docs: Fix the GBoxed registration example - - The registration function for serialization and deserialization has been - replaced by two separate functions before releasing 0.10, but I forgot to - update the example in the documentation. - - json-glib/json-gboxed.c | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -commit 4c15bf185dcd55ae5daf6b68d2b58d32e9ac9d5c -Author: Emmanuele Bassi -Date: Sun Jan 10 10:00:32 2010 +0000 - - build: Fix CFLAGS and LDFLAGS for the gcov target - - A copy and paste thinko duplicated the CFLAGS into the LDFLAGS, so we - need to fix that. The CFLAGS should also specify the optimization level - to 0 and turn on debugging notes, in case --enable-debug and - --enable-maintainer-flags are turned off. - - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit c09c2dc1c54c83fea4ef93486081fe3fab35452c -Author: Emmanuele Bassi -Date: Sun Jan 10 09:59:14 2010 +0000 - - Initialize every member of JsonObject on construction - - We create JsonObject structures using g_slice_new(), so we need to - initialize every member of the structure ourselves. - - json-glib/json-object.c | 1 + - 1 file changed, 1 insertion(+) - -commit cdffa0eacb52479e04460d8436a08ccecce91edf -Author: Emmanuele Bassi -Date: Sat Jan 2 23:57:31 2010 +0000 - - build: Move compiler flags to AM_CFLAGS - - The AM_CPPFLAGS variable is for pre-processor flags. - - tests/Makefile.am | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -commit f20523412e737c2dfae92ba4b9bd86177fd018a0 -Author: Emmanuele Bassi -Date: Sat Jan 2 23:56:42 2010 +0000 - - build: Enable maintainer flags when compiling tests - - The tests should be compiled under the same flags as the rest of the - library. - - json-glib/tests/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 7b72cad780fdeb42ac1d847210bd2022376f2875 -Author: Emmanuele Bassi -Date: Sat Jan 2 23:50:40 2010 +0000 - - tests: Clean up JsonGenerator test suite - - Use typed accessors instead of using GValues all around. - - json-glib/tests/generator-test.c | 145 +++++++-------------------------------- - 1 file changed, 25 insertions(+), 120 deletions(-) - -commit 3c33b61738d74b732805b497accec830b1a05796 -Author: Emmanuele Bassi -Date: Fri Jan 1 18:23:16 2010 +0000 - - tests: Verify Array.get_elements() - - While verifying Array.foreach() we should also verify that the list we - are iterating on is the same returned by the get_elements() method. - - json-glib/tests/array-test.c | 22 +++++++++++++++++----- - 1 file changed, 17 insertions(+), 5 deletions(-) - -commit c8cc10985c3e7aac5ca1c03a7b443951929ed0cb -Author: Emmanuele Bassi -Date: Fri Jan 1 18:02:03 2010 +0000 - - build: Add gcov proxy rule - - The gcov rule lives in json-glib/Makefile.am, but it would be nice to - have a similar rule in the top source directory as well. - - Makefile.am | 3 +++ - 1 file changed, 3 insertions(+) - -commit 060eddb098dd2b442f986a39aad2e7bf8c777a15 -Author: Emmanuele Bassi -Date: Tue Dec 29 23:35:00 2009 +0000 - - tests: Re-enable the nested object generator unit - - Use the JSON object example inside the RFC 4627 to verify that the - JsonGenerator creates the right output. This is now possible as we - garantee the order of a JsonObject members. - - json-glib/tests/generator-test.c | 102 +++++++++++++++++++++------------------ - 1 file changed, 56 insertions(+), 46 deletions(-) - -commit 37a9c9544447c4a8ac36d80dd58bd38f80b0aa3c -Author: Emmanuele Bassi -Date: Tue Dec 29 23:02:23 2009 +0000 - - Update the ignore file - - .gitignore | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -commit e32a157f97d96293f6f4061e7d0008d90ff16258 -Author: Emmanuele Bassi -Date: Tue Dec 29 22:59:13 2009 +0000 - - tests: Move Parser and Generator tests - - Use the json-glib/tests directory for testing the data structures of - JSON-GLib: node, object, array, parser and generator. - - The tests/ directory should be used for complex test cases, like the - GObject and GBoxed integration - but the goal is to remove the top-level - tests/ directory altogether, since the conformance test suite should be - built along the json-glib/ directory. - - json-glib/tests/Makefile.am | 26 +- - json-glib/tests/generator-test.c | 357 ++++++++++++++++++++++ - json-glib/tests/parser-test.c | 632 +++++++++++++++++++++++++++++++++++++++ - tests/Makefile.am | 8 - - tests/test-generator.c | 357 ---------------------- - tests/test-parser.c | 632 --------------------------------------- - 6 files changed, 1006 insertions(+), 1006 deletions(-) - -commit 5b4186eb60e953ddbaadcd53b1996d28b06d4a97 -Author: Emmanuele Bassi -Date: Tue Dec 29 22:53:29 2009 +0000 - - Add GCOV coverage test support - - Use GCOV, a GCC extension, to perform a coverage test on JSON-GLib when - we perform a 'make check'. - - GCOV support builds JSON-GLib with compiler and linker flags that enable - coverage reports; then the check-local target will build the gcov file - for each source file, and the coverage report will be extracted from - those. - - .gitignore | 7 ++++--- - build/autotools/Makefile.am | 3 ++- - build/autotools/Makefile.am.gcov | 35 +++++++++++++++++++++++++++++++++++ - build/autotools/Makefile.am.gtest | 2 ++ - configure.ac | 25 +++++++++++++++++++++++-- - json-glib/Makefile.am | 9 ++++++--- - 6 files changed, 72 insertions(+), 9 deletions(-) - -commit 56f56ae22d981830b696c5861e158802d31240c1 -Author: Emmanuele Bassi -Date: Tue Dec 29 21:56:42 2009 +0000 - - Bump to 0.11 - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit dae32677d140a3ba6a15e1198b53ea0b3e1716b0 -Author: Emmanuele Bassi -Date: Tue Dec 29 15:35:21 2009 +0000 - - Post-release version bump to 0.10.1 - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 5aff66e8fae3e28c9cb6b74696170154eed303a7 -Author: Emmanuele Bassi -Date: Tue Dec 29 15:33:28 2009 +0000 - - Release 0.10.0 - - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 7258a776ea90ea4b2dcc6f1e4e440bb09c581a12 -Author: Emmanuele Bassi -Date: Tue Dec 29 15:31:22 2009 +0000 - - build: Enable introspection when distchecking - - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 80c5178127052e600146ca889500e263da4ebf10 -Author: Vincent Untz -Date: Sun Dec 27 02:09:44 2009 +0100 - - Initialize out variables before using them - - Here's a small patch for json-glib, to fix some gcc warnings breaking - the build with -Werror (gcc can't know if the variable will get - initialized or not). I didn't find a product for json-glib in bugzilla, - but I guess a mail will work ;-) - - Happy holidays :-) - - Signed-off-by: Emmanuele Bassi - - json-glib/json-gobject.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit e3a57eae397926ad23e216996eda164ed6c15c63 -Author: Emmanuele Bassi -Date: Sun Nov 29 12:50:58 2009 +0000 - - Post-release bump to 0.9.3 - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 4477758b73a0712fdef5e7907f6b6f4e0878428e -Author: Emmanuele Bassi -Date: Sun Nov 29 12:34:41 2009 +0000 - - Release 0.9.2 (0.10.0-rc1) - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 654f99c6b0d771cc6b4c68790ab164b0f691307d -Author: Emmanuele Bassi -Date: Sun Nov 29 12:34:08 2009 +0000 - - Update NEWS - - NEWS | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -commit 307605046cf89ef922d1d1e7c7b95405f3ecfdfb -Author: Emmanuele Bassi -Date: Sun Nov 29 12:48:25 2009 +0000 - - docs: Fix annotation for json_gobject_to_data() - - json-glib/json-gobject.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit e7eb3ca4a9de1c7348dc82f528cf0858f52849dd -Author: Emmanuele Bassi -Date: Sun Nov 29 12:37:04 2009 +0000 - - docs: Add missing to/from_data methods - - doc/reference/json-glib-sections.txt | 2 ++ - 1 file changed, 2 insertions(+) - -commit 27bb2c060a7b2ecc4839719d39b2044efe4c3e7a -Author: Emmanuele Bassi -Date: Sun Nov 29 12:46:27 2009 +0000 - - docs: Add release notes to the README - - README | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -commit 780d82310c47c3f07bcbaab2cefbea0d6decb899 -Author: Emmanuele Bassi -Date: Sun Nov 29 12:33:45 2009 +0000 - - docs: Update the README - - README | 27 ++++++++++++++++----------- - 1 file changed, 16 insertions(+), 11 deletions(-) - -commit d122f9b8c09ad7e82b1a70da5d65ebba2111e6cc -Author: Emmanuele Bassi -Date: Sun Nov 29 12:33:01 2009 +0000 - - build: Clean up the configure summary - - Make the output of the summary a little bit nicer. - - configure.ac | 27 ++++++++++++++++++++------- - 1 file changed, 20 insertions(+), 7 deletions(-) - -commit e4c4480036a82cc5177fc1f184c18019af0e805e -Author: Emmanuele Bassi -Date: Sun Nov 29 12:31:54 2009 +0000 - - build: Require G-I 0.6.4 - - We should require at least 0.6.4 for GObject-Introspection, since that - version allows us to pass the .la file to g-ir-scanner. - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 4445bdb04d5eebc145a1db82aa5b811e8d4ed048 -Author: Emmanuele Bassi -Date: Sat Nov 28 19:13:27 2009 +0000 - - docs: Fix argument name mismatch - - gtk-doc complains that the argument name in the header does not match - the one in the documentation annotation for the GBoxed deserialization - function registration. - - json-glib/json-gobject.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 793e827feaa9be3c4ffbe5c0425ac6bcc0c9e6d1 -Author: Emmanuele Bassi -Date: Sat Nov 28 19:06:36 2009 +0000 - - build: Clean up json-glib/Makefile.am rules - - json-glib/Makefile.am | 24 ++++-------------------- - 1 file changed, 4 insertions(+), 20 deletions(-) - -commit 97584658672fe4709fc7c3b24a44b477112322f7 -Author: Emmanuele Bassi -Date: Sat Nov 28 17:39:37 2009 +0000 - - build: Fix out-of-tree enum types file generation - - build/autotools/Makefile.am.enums | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 3cf919e9c7f3201305a1a63a3c270e422a37efed -Author: Emmanuele Bassi -Date: Mon Nov 23 22:20:58 2009 +0000 - - boxed: Split (de)serialization registration - - A GBoxed type defined as: - - struct Boxed { - int foo; - gboolean bar; - int baz; - }; - - Can be represented either by a JSON object: - - { - "foo" : 1, - "bar" : true, - "baz" : 3 - } - - Or by a JSON array: - - [ 1, true, 3 ] - - The current function for registering a serialization and a - deserialization pair does not allow registering more than one - deserialization function - which means that there can only be - one way to deserialize a GBoxed type into a specific JsonNode - type. - - To allow having more than one JsonNodeType associated to a - GBoxed type and a deserialization function we need to split out - the registration of the serialization and deserialization functions - into two distinct functions. - - doc/reference/json-glib-sections.txt | 3 +- - json-glib/json-gboxed.c | 115 +++++++++++++++++++++++------------ - json-glib/json-gobject.c | 4 +- - json-glib/json-gobject.h | 63 +++++++++---------- - tests/test-serialize-boxed.c | 7 ++- - 5 files changed, 114 insertions(+), 78 deletions(-) - -commit 61d54cc9e2a3098e876e700a9248428f400a5368 -Author: Tristan Van Berkom -Date: Thu Nov 12 12:59:03 2009 +0000 - - serializable: Make Serializable in charge of parsing - - If a GObject class implements JsonSerializable and has overridden - the serialize_property() vfunc then the Serializable should be fully in - charge of serializing a property - that is: JSON-GLib should not try to - add a fallback in case the serialize_property() implementation returned - NULL. - - This is a change in semantics for JsonSerializable implementations. - - http://bugzilla.openedhand.com/show_bug.cgi?id=1859 - - Signed-off-by: Emmanuele Bassi - - json-glib/json-gobject.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -commit 63dc03da507a216c0764bc0e50fc62b2b77dc1b2 -Author: Emmanuele Bassi -Date: Thu Nov 12 12:38:29 2009 +0000 - - serializable: Add methods proxying default implementations - - If you want to use the default implementation of serialize_property() - and/or deserialize_property() from an object class implementing - JsonSerializable you currently have to peek the interface vtable and - then call the vfunc pointers. - - We can expose the default implementation through functions ourselves and - simplify the required code. - - doc/reference/json-glib-sections.txt | 4 ++ - json-glib/json-gobject.h | 28 +++++++---- - json-glib/json-serializable.c | 92 ++++++++++++++++++++++++++++++++++++ - 3 files changed, 115 insertions(+), 9 deletions(-) - -commit 5f484d8c274a2b866f9a3d38eebe2baa1939b7ac -Author: Emmanuele Bassi -Date: Thu Nov 12 12:03:13 2009 +0000 - - gobject: Add deprecation annotations - - This makes it easier to detect when building without - JSON_DISABLE_DEPRECATED. - - json-glib/json-gobject.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 3c7811bf24d4b957da730949af6795b728db5bad -Author: Emmanuele Bassi -Date: Thu Nov 12 12:02:41 2009 +0000 - - build: Build without deprecations - - Make sure that JSON-GLib is built without using deprecated API. - - json-glib/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -commit 923311ee52b77f53c5c529e497ea2a24efaf23ea -Author: Emmanuele Bassi -Date: Thu Nov 12 12:01:04 2009 +0000 - - tests: Do not use deprecated API - - Tests should not be using API marked as deprecated. - - tests/Makefile.am | 2 +- - tests/test-serialize-boxed.c | 4 ++-- - tests/test-serialize-complex.c | 2 +- - tests/test-serialize-full.c | 2 +- - tests/test-serialize-simple.c | 2 +- - 5 files changed, 6 insertions(+), 6 deletions(-) - -commit e3ae84e743e1d1a1a0202e900f443e143cb77f45 -Author: Emmanuele Bassi -Date: Thu Nov 12 11:57:45 2009 +0000 - - tests: Verify Serializable::serialize_property() - - Verify that an object with a custom serialize_property() is effectively - what we expect it to be when it is parsed. - - tests/test-serialize-complex.c | 32 ++++++++++++++++++++++++++++++++ - 1 file changed, 32 insertions(+) - -commit 7cebdd008a02e6cef0514f40327f94eba2a2088e -Author: Cornelius Hald -Date: Thu Nov 12 11:37:54 2009 +0000 - - Doubles are converted to strings containing commas - - Under some locales (e.g. de_DE) a double is converted to a string - containing a comma instead of a dot. That breaks the JSON syntax. - - Example: - Double: 0.34 is converted to 0,34 when using locale de_DE - - http://bugzilla.openedhand.com/show_bug.cgi?id=1826 - - Signed-off-by: Emmanuele Bassi - - json-glib/json-generator.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -commit 30d4efb775cb416212c00e3ececb0f0147739f40 -Author: Emmanuele Bassi -Date: Thu Nov 12 11:28:17 2009 +0000 - - Update Introspection annotations - - • Fix the transfer rules for JsonNode, JsonObject and JsonArray - getters. - - • Annotate the methods returning lists - - json-glib/json-array.c | 18 +++++++++--------- - json-glib/json-node.c | 15 ++++++++------- - json-glib/json-object.c | 25 +++++++++++++------------ - json-glib/json-parser.c | 5 +++-- - 4 files changed, 33 insertions(+), 30 deletions(-) - -commit 47cd2f678a8321faac0e2d00a3538181e7bc1cbf -Author: Emmanuele Bassi -Date: Thu Nov 12 11:27:36 2009 +0000 - - build: Add more flags to the maintainer cflags list - - configure.ac | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -commit ecc185d1c542f6ff41f84be026dc380f611a5d6e -Author: Emmanuele Bassi -Date: Thu Nov 12 10:09:17 2009 +0000 - - enum-types: Put back a missing static - - The GEnumValue array defining the enumeration type values must be - static, otherwise everything will crash when trying to retrieve the - enumeration data from the GEnumClass. - - json-glib/json-enum-types.c.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 84f5af58c23b174cc9708e81ce8ccbfffa6e68eb -Author: Emmanuele Bassi -Date: Fri Oct 30 10:46:32 2009 +0000 - - object: Return values list in insertion order - - Since we return the member names in insertion order, we should also - return the member values in the same order. - - This also allows us to get rid of the (yucky) internal copies of - g_hash_table_get_keys() and g_hash_table_get_values(), since we use - the hash table only for storage and lookup purposes. - - json-glib/json-object.c | 55 +++++++------------------------------------------ - 1 file changed, 7 insertions(+), 48 deletions(-) - -commit a25a1ded25e5d1f605cffd6da7a5e036151aa70c -Author: Mathias Hasselmann -Date: Thu Oct 29 14:01:04 2009 +0000 - - tests: Verify parsing bare values - - http://bugzilla.openedhand.com/show_bug.cgi?id=1856 - - Signed-off-by: Emmanuele Bassi - - tests/test-parser.c | 38 +++++++++++++++++++++++++++++++++----- - 1 file changed, 33 insertions(+), 5 deletions(-) - -commit 026ea0357fbe95e2acd43555e3b5d00e329c9740 -Author: Emmanuele Bassi -Date: Thu Oct 29 13:59:44 2009 +0000 - - parser: Advance when parsing bare values - - A missing get_next_token() prevents getting the contents of - the tokenizer in order to place them into the JsonNode. - - json-glib/json-parser.c | 1 + - 1 file changed, 1 insertion(+) - -commit 578111be53065a2bbeda73865bfa4e178f185649 -Author: Emmanuele Bassi -Date: Wed Oct 28 16:54:34 2009 +0000 - - introspection: Fix the GIR generation - - The rule for creating the JSON-GLib GIR file should use the - json-glib.la shared object, to avoid using the installed - copy of JSON-GLib when compiling the typelib. - - The include file for JSON-GLib is json-glib/json-gobject.h as - well: json-glib/json-object.h does not exist. - - json-glib/Makefile.am | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -commit 8f8ce87730fc0bf102a707e84c4f6106b215cfab -Author: Emmanuele Bassi -Date: Wed Oct 28 16:23:39 2009 +0000 - - gobject: Use from/to data naming convention - - Be more GLib-like, and use - - __from_data() - __to_data() - - Instead of the homebrew "construct" and "serialize", when dealing - with string buffers. - - This means: - - • adding json_gobject_from_data() to deprecate - json_construct_gobject() - • adding json_gobject_to_data() to deprecate - json_serialize_gobject() - - The json_construct_gobject() function also contains a mistake: it - uses gsize with the special value of -1 meaning "slurp the whole - string", but gsize is an unsigned type. The newly added - json_gobject_from_data() correctly uses gssize instead. - - json-glib/json-gobject.c | 63 +++++++++++++++++++++++++++++++++++++++++++++--- - json-glib/json-gobject.h | 10 ++++++++ - 2 files changed, 69 insertions(+), 4 deletions(-) - -commit 00b4d200849e232cd904d23d3593d6f95252b483 -Author: Emmanuele Bassi -Date: Wed Oct 28 16:05:19 2009 +0000 - - gobject: Uniform JSON<->GObject mapping code - - Rename json_gobject_new() to json_gobject_deserialize(), and - json_gobject_dump() to json_gobject_serialize(); this maps the - JSON GBoxed API. - - Also for consistency, change the serialize() return value and - the deserialize() argument to be JsonNodes of type JSON_NODE_OBJECT. - - doc/reference/json-glib-sections.txt | 4 +- - json-glib/json-gobject.c | 82 ++++++++++++++++++++++++------------ - json-glib/json-gobject.h | 10 ++--- - 3 files changed, 61 insertions(+), 35 deletions(-) - -commit fc0607c740b153acc96e4df12a12b042e08e831b -Author: Emmanuele Bassi -Date: Wed Oct 28 12:01:21 2009 +0000 - - docs: Add long descriptions - - The json-boxed and json-serializable sections are missing the - long description for the API reference. - - json-glib/json-gboxed.c | 49 +++++++++++++++++++++++++++++++++++++++---- - json-glib/json-serializable.c | 5 ++++- - 2 files changed, 49 insertions(+), 5 deletions(-) - -commit 498827110f3d635e545c7351732551676a06a1bf -Author: Emmanuele Bassi -Date: Wed Oct 28 10:07:39 2009 +0000 - - docs: Add the 0.10 symbols index - - doc/reference/json-glib-docs.xml | 5 +++++ - 1 file changed, 5 insertions(+) - -commit 0979bbceb654c5e4b5dadf1e6f7e85bb9df87ca5 -Author: Emmanuele Bassi -Date: Tue Oct 27 20:58:08 2009 +0000 - - docs: Split out GObject-related sections - - Like commit c176f70e593c9cfb4901cd9f27ce54b8aa7152f2 did for the - source code, the documentation should be split three-ways: - - • GObject-related API - • JsonSerializable - • GBoxed-related API - - doc/reference/Makefile.am | 15 +++++++-------- - doc/reference/json-glib-docs.xml | 2 ++ - doc/reference/json-glib-sections.txt | 33 +++++++++++++++++++++++++++------ - 3 files changed, 36 insertions(+), 14 deletions(-) - -commit 2f56ba9021ec4fe1574630404d6b24e4813cf1eb -Author: Emmanuele Bassi -Date: Tue Oct 27 20:57:52 2009 +0000 - - docs: Documentation fixes for gtk-doc - - json-glib/json-gboxed.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -commit c176f70e593c9cfb4901cd9f27ce54b8aa7152f2 -Author: Emmanuele Bassi -Date: Tue Oct 27 20:49:09 2009 +0000 - - build: Split out GBoxed and Serializable - - The json-gobject.c is getting pretty crowded; we should split out - the JsonBoxed API and the JsonSerialized implementation into their - separate source files. - - json-glib/Makefile.am | 4 + - json-glib/json-gboxed.c | 275 +++++++++++++++++++++++++++++ - json-glib/json-gobject-private.h | 39 ++++ - json-glib/json-gobject.c | 371 +-------------------------------------- - json-glib/json-serializable.c | 154 ++++++++++++++++ - 5 files changed, 476 insertions(+), 367 deletions(-) - -commit 373fa3d9b73391b38620fbd9ce9b69f358e5f4c8 -Author: Emmanuele Bassi -Date: Tue Oct 27 18:10:19 2009 +0000 - - gobject: Make GObject<->JsonObject functions public - - The functions mapping a GObject to and from a JsonObject should - be public, as they can be used by parsers. - - json-glib/json-gobject.c | 30 ++++++++++++++++++++++++++++-- - json-glib/json-gobject.h | 16 ++++++++++------ - 2 files changed, 38 insertions(+), 8 deletions(-) - -commit 85f7a8e8206168d95b3ef9c02aa584f0fae5b37e -Author: Emmanuele Bassi -Date: Tue Oct 27 18:03:11 2009 +0000 - - gobject: Reuse the list data - - Since we ignore all members that don't have a corresponding - GParamSpec for the class we cannot use: - - members = g_list_prepend (members, pspec->name); - - Because pspec might also be NULL. We can reuse the GList iterator - data field, since that points to data internal to the JsonObject - we are iterating over. - - json-glib/json-gobject.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit ff986ee5b8df45255f4f5ab01be0bbad893bc55e -Author: Emmanuele Bassi -Date: Tue Oct 27 17:53:34 2009 +0000 - - gobject: Add experimental GBoxed<->JSON transformation - - Serializing and deserializing GBoxed types is fairly complicated - currently. If a GObject implements JsonSerializable it is possible - for the class to intercept the JsonNode, parse it manually and - then set the value to the property. - - This leaves a hole opened for: - - • manual (de)serialization of GBoxed types - • (de)serialization of GBoxed properties in classes not - implementing JsonSerializable - - In order to serialize and deserialize a GBoxed JSON-GLib should - provide a mechanism similar to the GValue transformation functions: - when registering the boxed type the developer should also be able - to register a serialization and a deserialization functions pair - matching the tuple: - - (GBoxed type, JSON type) - - The serialization function would be: - - JsonNode *(* JsonBoxedSerializeFunc) (gconstpointer boxed); - - And, conversely, the deserialization function would be: - - gpointer (* JsonBoxedDeserializeFunc) (JsonNode *node); - - Obviously, the whole machinery works only for GBoxed types that - register the serialization and deserialization functions. - - .gitignore | 68 +++++------ - json-glib/json-gobject.c | 264 ++++++++++++++++++++++++++++++++++++++++++- - json-glib/json-gobject.h | 37 ++++++ - tests/Makefile.am | 8 +- - tests/test-serialize-boxed.c | 263 ++++++++++++++++++++++++++++++++++++++++++ - 5 files changed, 602 insertions(+), 38 deletions(-) - -commit 7f6a73a0964b66b15e8b5a9858b9bc76b010f67b -Author: Emmanuele Bassi -Date: Tue Oct 27 17:43:38 2009 +0000 - - node: Add a private NodeType-to-string converter - - Useful for debugging and logging purposes. - - json-glib/json-node.c | 23 ++++++++++++++++++++++- - json-glib/json-types-private.h | 2 ++ - 2 files changed, 24 insertions(+), 1 deletion(-) - -commit 3f8990f7a4c362590f19e427aae2f68f27303fe6 -Author: Emmanuele Bassi -Date: Tue Oct 27 17:42:14 2009 +0000 - - Remove a stray ';' that broke deserializing GStrv - - The stray semicolon was preventing the GPtrArray from being - updated. - - json-glib/json-gobject.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 8e550ac4dbb5500a40c7adad88868ede40397db7 -Author: Emmanuele Bassi -Date: Tue Oct 27 17:41:38 2009 +0000 - - Fix compiler warnings (remove unused variables) - - json-glib/json-gobject.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -commit 3b994a52d9c34f67e4ac52aa4bb0c380789fbd60 -Author: Emmanuele Bassi -Date: Tue Oct 27 17:40:55 2009 +0000 - - build: Export MAINTAINER_CFLAGS - - Apparently, the MAINTAINER_CFLAGS were ignored. - - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -commit 0810711a7fbb915ba9397a66e77babb30765d090 -Author: Emmanuele Bassi -Date: Tue Oct 27 17:40:23 2009 +0000 - - build: Use AM_PROG_CC_C_O - - Use the Automake macro to enable per-target compiler flags. - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit d664f886372afbe1d54e633240e7b7e06ebc45c8 -Author: Emmanuele Bassi -Date: Tue Oct 27 17:40:03 2009 +0000 - - Fix compiler warnings (remove unused variables) - - tests/test-generator.c | 4 ++-- - tests/test-serialize-full.c | 1 - - 2 files changed, 2 insertions(+), 3 deletions(-) - -commit 83dea3b3dd2281dca206e0873b5fed0a2a3d50de -Author: Emmanuele Bassi -Date: Tue Oct 27 14:01:24 2009 +0000 - - gobject: Support constructor properties - - The GObject deserialization code currently skips all the constructor - and constructor-only properties. In order to implement them we can - add a preliminary pass on the JSON object members and build a - GParameter array. - - As we don't have a GObject instance we cannot really use the - Serializable interface to provide custom parsing for complex data - structures, thus we fall back to the default deserialization code - path. - - json-glib/json-gobject.c | 98 ++++++++++++++++++++++++++++++++++++++++----- - tests/test-serialize-full.c | 11 ++--- - 2 files changed, 93 insertions(+), 16 deletions(-) - -commit 2616938c7c042fced9be197205a535a8b420534e -Author: Emmanuele Bassi -Date: Tue Oct 27 11:57:38 2009 +0000 - - build: Clean up the build environment - - Some of the rules can be moved into their own files to be included - when needed, like: - - • silent rules (QUIET_*) - • glib-mkenums rules - • glib-genmarshal rules - - Also, the test suite rules should be moved from the top-level of - the project into the build/autotools directory and then included - only where it makes sense. - - This requires changing most of the build system to use the new - files layout. - - .gitignore | 4 +- - Makefile.am | 5 ++- - Makefile.decl | 61 ------------------------- - build/Makefile.am | 12 ++++- - build/autotools/Makefile.am | 21 +++++++-- - build/autotools/Makefile.am.enums | 43 ++++++++++++++++++ - build/autotools/Makefile.am.gtest | 61 +++++++++++++++++++++++++ - build/autotools/Makefile.am.marshal | 45 +++++++++++++++++++ - build/autotools/Makefile.am.silent | 17 +++++++ - doc/Makefile.am | 12 ++++- - doc/reference/Makefile.am | 5 ++- - json-glib/Makefile.am | 88 ++++++++++++------------------------- - json-glib/tests/Makefile.am | 12 +++-- - tests/Makefile.am | 15 +++---- - 14 files changed, 252 insertions(+), 149 deletions(-) - -commit 5406301b0e3bf74c0d7ae47a618c416d5c6dc29d -Author: Emmanuele Bassi -Date: Tue Oct 27 11:30:55 2009 +0000 - - gobject: Serialize properties holding a GObject - - Like we deserialize them, we can serialize GObject properties - defined using GParamSpecObject. - - json-glib/json-gobject.c | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -commit 3a2176ebf96b33716d1b50068ca44b1d3cd9b0c8 -Author: Emmanuele Bassi -Date: Tue Oct 27 11:29:32 2009 +0000 - - tests: Use properties to change values - - The values inside _init() should match the default values of the - properties as specified by the GParamSpec. If we want to verify - a non-default value we should specify the value when instantiating - the object. - - tests/test-serialize-simple.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 1ff48cdc5d773925bda1ddf8bc904a9ea6a5e643 -Author: Emmanuele Bassi -Date: Tue Oct 27 11:18:51 2009 +0000 - - gobject: Split GObject serialization code - - Like for the deserialization of a GObject into a JsonObject we - should split out the serialization of a GObject into a JsonObject - part of json_serialize_gobject() into its own private function. - - json-glib/json-gobject.c | 113 +++++++++++++++++++++++++---------------------- - 1 file changed, 61 insertions(+), 52 deletions(-) - -commit 27afed8dc89bf9562c3536f0a053d250e70eea4d -Author: Emmanuele Bassi -Date: Tue Oct 27 10:30:27 2009 +0000 - - gobject: Recurse in GParamSpecObject properties - - Use the newly added json_gobject_new() internal function to - recurse into properties defined using GParamSpecObject. - - The same rules used by json_construct_gobject() apply to the - properties storing a GObject - including JsonSerializable - support. - - The test case for serialization and deserialization of a - GObject has been updated to include a property holding a - GObject. - - json-glib/json-gobject.c | 14 ++++++++++- - tests/test-serialize-full.c | 58 +++++++++++++++++++++++++++++++++++++++------ - 2 files changed, 64 insertions(+), 8 deletions(-) - -commit 317447b52455c56b0123168ab127ce026d7d0c22 -Author: Emmanuele Bassi -Date: Tue Oct 27 10:20:42 2009 +0000 - - gobject: Split JSON to GObject code - - If we want to be able to parse a GParamSpecObject property - we need to use the same code as json_construct_gobject(), minus - the parsing. - - json-glib/json-gobject.c | 152 ++++++++++++++++++++++++++--------------------- - 1 file changed, 83 insertions(+), 69 deletions(-) - -commit cba7db96581343e3cbd8e5eb067026efb8cac24e -Author: Emmanuele Bassi -Date: Mon Oct 26 22:36:01 2009 +0000 - - object: Guarantee insertion order - - When iterating over the members of a JsonObject, or when retrieving - the list of members, the insertion order should be preserved by the - JsonObject. This is simply implemented by keeping a mirror list of - the member names. - - Apparently, though JSON does not guarantee any ordering, it is somewhat - expected by JSON (and ECMAScript) users. - - json-glib/json-object.c | 67 ++++++++++++++++++++++-------------------- - json-glib/json-types-private.h | 3 ++ - tests/test-generator.c | 3 +- - 3 files changed, 40 insertions(+), 33 deletions(-) - -commit d5bebce0286aef5c4b4110c16c22a8ef3dc38405 -Author: Emmanuele Bassi -Date: Mon Sep 28 18:15:48 2009 +0100 - - [node] Add HOLDS macros for quick type checking - - JsonNode should mimick GValue's API and have macros for easy type checking - - doc/reference/json-glib-sections.txt | 7 ++++- - json-glib/json-types.h | 51 ++++++++++++++++++++++++++++++++++++ - json-glib/tests/node-test.c | 2 +- - 3 files changed, 58 insertions(+), 2 deletions(-) - -commit 17fc731ed54b754285bac76c7ac23eac6b96bf24 -Author: Emmanuele Bassi -Date: Mon Sep 28 14:02:14 2009 +0100 - - [tests] Add a test case for Object members with empty strings - - Both the Object API and the Parser should not choke on members with - empty strings as their value. The Object should just have a member - associated with a JSON_NODE_VALUE node type and an empty string as - the contents. - - json-glib/tests/object-test.c | 13 +++++++++++++ - tests/test-parser.c | 1 + - 2 files changed, 14 insertions(+) - -commit 5181bf24bf3cde743de590ab3ffa0471df9e4799 -Author: Emmanuele Bassi -Date: Tue Sep 22 15:42:34 2009 +0100 - - Post-branch bump to 0.9.1 - - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 3f83767109979c660469b3b5862fbd04469a8011 -Author: Emmanuele Bassi -Date: Tue Sep 22 15:39:46 2009 +0100 - - [release] 0.8.0 - - NEWS | 2 ++ - configure.ac | 8 ++++++-- - 2 files changed, 8 insertions(+), 2 deletions(-) - -commit bd604338b25884edbd86cf531505259948484323 -Author: Emmanuele Bassi -Date: Tue Sep 22 15:34:18 2009 +0100 - - [parser] Return the right expected token - - When parsing a value embedded in a Json Object or Array we need to - return the right expected token so that the generated syntax error - will be correct. - - json-glib/json-parser.c | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) - -commit f99cf3d3d038eff786f85409f3d04736e2068e74 -Author: Emmanuele Bassi -Date: Tue Sep 22 15:34:07 2009 +0100 - - [parser] Whitespace clean up - - json-glib/json-parser.c | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -commit 6c20aae2b49a6d64db5e7d1ff3a82950ea9dc58a -Author: Emmanuele Bassi -Date: Mon Sep 7 22:30:11 2009 +0100 - - [build] Prefer automake-1.11 silent rules to shave - - If we have automake-1.11 installed then we should enable the - AM_SILENT_RULES machinery instead of Shave - even though Shave's - output is a lot cleaner. - - autogen.sh | 2 +- - configure.ac | 20 ++++++++++++++++---- - json-glib/Makefile.am | 6 +++++- - 3 files changed, 22 insertions(+), 6 deletions(-) - -commit 7b4bb80930f12a366d5e5a5eea5b398972cd4891 -Author: Emmanuele Bassi -Date: Sun Sep 6 17:31:41 2009 +0100 - - [node] Add JsonNode.set_parent() - - Add the setter for JsonNode:parent, to be used in JsonParser instead - of directly accessing the JsonNode structure. - - doc/reference/json-glib-sections.txt | 1 + - json-glib/json-node.c | 18 ++++++++++++++++++ - json-glib/json-parser.c | 14 +++++++------- - json-glib/json-types.h | 2 ++ - tests/test-parser.c | 10 ++++++++++ - 5 files changed, 38 insertions(+), 7 deletions(-) - -commit c1b76a73e0b2c6e0c7afced10bd6079a0f5b0f5d -Author: Emmanuele Bassi -Date: Sun Sep 6 17:15:46 2009 +0100 - - [parser] Clean up value parsing - - The code that parses a value within an object and an array should - be moved to its own function to avoid duplication. - - json-glib/json-parser.c | 199 ++++++++++++++++++++---------------------------- - tests/test-parser.c | 9 ++- - 2 files changed, 86 insertions(+), 122 deletions(-) - -commit d3f005c27d9a8a46259205f2f8077fb01a6a3609 -Author: Emmanuele Bassi -Date: Sun Sep 6 14:44:18 2009 +0100 - - [docs] Use proper xi:include for indexes - - Instead of relying on gtk-doc we can do the proper inclusion of the - API indexes using XInclude, complete with fallbacks. - - Also, we should include the additional pages that gtk-doc generates - for us, like the annotations glossary and the object tree. - - doc/reference/json-glib-docs.xml | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) - -commit 7442a3011a860f12cbd40b6687b699b0b648d6b7 -Author: Emmanuele Bassi -Date: Wed Sep 2 16:41:51 2009 +0100 - - [docs] Small documentation fixes - - Clean up some notes, and add introspection annotations where needed. - - json-glib/json-generator.c | 11 ++++++----- - json-glib/json-gobject.c | 24 ++++++++++++------------ - json-glib/json-parser.c | 3 ++- - 3 files changed, 20 insertions(+), 18 deletions(-) - -commit d7d1e702b1d67fa1ec830a46650a02367ce1dd29 -Author: Emmanuele Bassi -Date: Sun Aug 16 05:52:46 2009 +0100 - - [docs] Remove note about normalization of member names - - The normalization of member names inside JsonObject was removed by - commit 8a7e0f381dc7e49745680df92ebb428f18bf4832. - - json-glib/json-object.c | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -commit 9362ccc891c914dbcf1be6bd067b0b37ae688057 -Author: Emmanuele Bassi -Date: Thu Aug 13 15:10:27 2009 +0100 - - [docs] Generate new symbols index for 0.6 and 0.8 - - doc/reference/json-glib-docs.xml | 8 ++++++++ - 1 file changed, 8 insertions(+) - -commit 087bfe83412dca8de1b2dd67c74f490e44ecb96a -Author: Emmanuele Bassi -Date: Thu Aug 13 15:10:07 2009 +0100 - - [docs] Remove the version number from the title - - doc/reference/json-glib-docs.xml | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -commit c7d31d55b50b23c6c1067cb3541f73dddc12127a -Author: Emmanuele Bassi -Date: Thu Aug 13 15:08:56 2009 +0100 - - [docs] Let gtk-doc build the correct index - - Use the --name-space command line argument for gtk-doc to detect the - right namespace of JSON-GLib, and create a useful index. - - doc/reference/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit be07ba7b983b34231ad2f0fd7fe60ae47b14ce7e -Author: Emmanuele Bassi -Date: Thu Aug 13 14:51:42 2009 +0100 - - [docs] Rename main file to json-glib-docs.xml - - doc/reference/Makefile.am | 36 +++++---- - doc/reference/json-glib-docs.sgml | 163 -------------------------------------- - doc/reference/json-glib-docs.xml | 163 ++++++++++++++++++++++++++++++++++++++ - 3 files changed, 182 insertions(+), 180 deletions(-) - -commit 9661ff342b439b5b398f7bf9ba931d6139d5143d -Author: Emmanuele Bassi -Date: Wed Aug 12 16:09:33 2009 +0100 - - Post-release version bump to 0.7.7 - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit d5922b42604c09ba7ebcb0adc1566d0a33a99808 -Author: Emmanuele Bassi -Date: Wed Aug 12 16:06:40 2009 +0100 - - [release] 0.7.6 (brown paper bag) - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 9a647104ca77d4c4272845fed4bfae028098afd3 -Author: Emmanuele Bassi -Date: Wed Aug 12 15:56:00 2009 +0100 - - Actually use the int64 support in the Scanner - - We switched everything to 64 bit integers but then I forgot to - enable the support for actually making the tokenizer store the - parsed integers into a 64 bit value. - - Bad Emmanuele, no cookie for you. - - json-glib/json-parser.c | 12 ++++++------ - json-glib/json-scanner.c | 1 + - 2 files changed, 7 insertions(+), 6 deletions(-) - -commit f3e0618ee1d8aa90d0ba22e9abe5c7d6b849e0ea -Author: Emmanuele Bassi -Date: Wed Aug 12 14:08:35 2009 +0100 - - Post-release version bump to 0.7.5 - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit c1c691fc6b58a990ee9bb17504189064051d5a12 -Author: Emmanuele Bassi -Date: Wed Aug 12 13:56:08 2009 +0100 - - [release] 0.7.4 - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 12bc49ea08c50da9a7ed53c475fe873421432ebe -Author: Emmanuele Bassi -Date: Wed Aug 12 14:01:49 2009 +0100 - - Update the NEWS file - - NEWS | 2 ++ - 1 file changed, 2 insertions(+) - -commit 75b888c26eebf7784c5af045a8c6af353e56b2e9 -Author: Emmanuele Bassi -Date: Wed Aug 12 13:59:52 2009 +0100 - - [build] Use our libtool for the typelib - - When compiling the GIR into a .typelib file we can use our own - libtool script; shave will proxy it to the right place. - - json-glib/Makefile.am | 20 +++++++++++--------- - 1 file changed, 11 insertions(+), 9 deletions(-) - -commit d84c0f367b06e094ff693d60a724b9f141c33ca9 -Author: Emmanuele Bassi -Date: Wed Aug 12 13:48:17 2009 +0100 - - Disallow single header file inclusion - - The correct header file for JSON-GLib is, and has always been, - json-glib.h. Anything else was not supported, as we've been - moving around stuff for a while, now. - - This commit enforces the single include file, using the same - policy enacted by other libraries, like: GLib, GTK+ and Clutter. - - json-glib/json-enum-types.h.in | 4 ++++ - json-glib/json-generator.h | 4 ++++ - json-glib/json-glib.h | 6 ++++++ - json-glib/json-parser.h | 4 ++++ - json-glib/json-types.h | 4 ++++ - json-glib/json-version.h.in | 4 ++++ - 6 files changed, 26 insertions(+) - -commit 3adba015e1c1f9edc7b7b2c4364d65f813216225 -Author: Emmanuele Bassi -Date: Wed Aug 12 13:46:46 2009 +0100 - - [introspection] Use json-gobject.h - - The json-gobject.h header file includes json-glib.h and all the - GObject-related serialization and deserialization API; we assume - that if you want introspection you should be using this header - and not the plain json-glib.h. - - json-glib/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit a9386e20bf8e16e17a89dda24781c63bf495aa97 -Author: Emmanuele Bassi -Date: Wed Aug 12 13:46:05 2009 +0100 - - [tests] Include json-glib.h - - Do not include json-types.h, use the correct global include. - - json-glib/tests/array-test.c | 2 +- - json-glib/tests/node-test.c | 2 +- - json-glib/tests/object-test.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -commit 8a7e0f381dc7e49745680df92ebb428f18bf4832 -Author: Emmanuele Bassi -Date: Wed Aug 12 12:29:34 2009 +0100 - - Do not sanitize the object member's name - - JsonObject sanitizes the name of the member to replace all - characters defined by G_STR_DELIMITERS with '_'. This is - absolutely brain damaged, since a member name can be any - valid JSON string. - - Obviously, if a member name maps to a GObject property is - entirely up to the GObject code to decide whether to sanitize - the member name or not. - - json-glib/json-object.c | 35 ++++++----------------------------- - 1 file changed, 6 insertions(+), 29 deletions(-) - -commit ad638149c2cc1a17c0d2ad1482d932c8940c64e0 -Author: Emmanuele Bassi -Date: Wed Aug 12 12:22:44 2009 +0100 - - Update NEWS - - NEWS | 2 ++ - 1 file changed, 2 insertions(+) - -commit d87b18675ac02f42be23bf4070134690b8b9934b -Author: Emmanuele Bassi -Date: Wed Aug 12 12:13:11 2009 +0100 - - Auto-promote integer types to G_TYPE_INT64 - - The JSON RFC does not specify the size of the integer type, thus - implicitly falling back to machine-size. - - This would all be fine and dandy if some demented Web Developer (and - I use the term "developer" *very much* loosely) did not decide to - use integers to store unique identifiers for objects; obviously, you - can't have more than 2^32-1 status messages in a database with - millions of users who update their status multiple times per day. - Right, Twitter? - - Anyway, some languages do a type auto-promotion from Integer to - Long, thus pushing the limit of allowed positive values -- until the - next integer overflow, that is. C, and GLib, do not do that - transparently for us so we need to: - - - always use gint64 when parsing a JSON data stream using - JsonScanner - - move all the Node, Object and Array APIs to gint64 - - auto-promote G_TYPE_INT to G_TYPE_INT64 when setting - a GValue manually - - auto-promote and auto-demote G_TYPE_INT properties when - (de)serializing GObjects. - - The GLib types used internally by JSON-GLib are, thus: - - integer -> G_TYPE_INT64 - boolean -> G_TYPE_BOOLEAN - float -> G_TYPE_DOUBLE - string -> G_TYPE_STRING - - json-glib/json-array.c | 4 +-- - json-glib/json-generator.c | 4 +-- - json-glib/json-gobject.c | 58 +++++++++++++++++++++++++++++++--------- - json-glib/json-node.c | 61 ++++++++++++++++++++++++++++++++++--------- - json-glib/json-object.c | 4 +-- - json-glib/json-types.h | 12 ++++----- - json-glib/tests/array-test.c | 2 +- - json-glib/tests/node-test.c | 14 +++++----- - json-glib/tests/object-test.c | 2 +- - tests/test-generator.c | 4 +-- - tests/test-parser.c | 4 +-- - tests/test-serialize-full.c | 9 ++----- - 12 files changed, 121 insertions(+), 57 deletions(-) - -commit 7411cadc0fdd9ffc2bd7004c9980913ac857a495 -Author: Emmanuele Bassi -Date: Sun Jun 28 23:52:34 2009 +0100 - - Indentation fixes - - tests/test-parser.c | 98 ++++++++++++++++++++++++++--------------------------- - 1 file changed, 49 insertions(+), 49 deletions(-) - -commit 112a8ec8dfd9c46304008b62e8ab256ed7714644 -Author: Emmanuele Bassi -Date: Sun Jun 28 23:49:51 2009 +0100 - - [parser] Advance the tokenizer to avoid an infinite loop - - The tokenizer is not advanced when we peek a base value and return. - This causes an endless loop which terminates only if the OOM killer - in the kernel gets the right process. - - Thanks to Thomas Weidner for catching and reporting the issue. - - json-glib/json-parser.c | 16 +++++++++++----- - 1 file changed, 11 insertions(+), 5 deletions(-) - -commit 4ecdd6bedb7961f3a33971aa1f2338115a60f7f3 -Author: Emmanuele Bassi -Date: Sun Jun 28 23:48:36 2009 +0100 - - [tests] Verify parsing base values - - A JSON document containing just a base value (null, true/false, an - integer, a floating point value or a string) is still a valid JSON - document, and JsonParser must create the correct JsonNode. - - tests/test-parser.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 59 insertions(+) - -commit 9a3b7a020716e23f1330915f1768a7c00bffbeb5 -Author: Emmanuele Bassi -Date: Thu Jun 25 10:37:43 2009 +0100 - - [docs] Fix typo in JsonObject::set_object_member() - - The passed value is a pointer to a JsonObject, not to a JsonArray. - - json-glib/json-object.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 68d872f15022217c0ff1cf516aec917d600fd762 -Author: Rodrigo Moya -Date: Wed Jun 24 14:07:18 2009 +0200 - - Use JSON_NODE_OBJECT, not JSON_NODE_ARRAY when creating the node in json_object_set_object_member - - Reviewed by Emmanuele Bassi - - json-glib/json-object.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 6e706fb2b7a371f25c169ed25d4b617f2dc05b63 -Author: Emmanuele Bassi -Date: Sun Jun 21 10:58:24 2009 +0100 - - [generator] Pre-compute the escape table - - Instead of allocating the escape table to be used with g_strescape() - for each string we can have it unrolled already in code. - - Thanks to: Christian Persch - - Fixes bug: - - http://bugzilla.openedhand.com/show_bug.cgi?id=1648 - - json-glib/json-generator.c | 43 +++++++++++++++++++++++++++++++++---------- - 1 file changed, 33 insertions(+), 10 deletions(-) - -commit a9416b7e2823f1fffe639d90bb352a337815a70e -Author: Emmanuele Bassi -Date: Thu Jun 18 11:23:56 2009 +0100 - - Post-release bump to 0.7.3 - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 1d13a409bb911141653a75d44e90feac9bfc2862 -Author: Emmanuele Bassi -Date: Thu Jun 18 11:20:35 2009 +0100 - - [release] 0.7.2 - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit ff97e679522c52be6b5dfe0f851416cdeac7f921 -Author: Emmanuele Bassi -Date: Thu Jun 18 11:14:37 2009 +0100 - - [release] Update NEWS - - NEWS | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - -commit 182ca9cd9a3fabaa2533d841154856c61c570d08 -Author: Emmanuele Bassi -Date: Thu Jun 18 11:14:13 2009 +0100 - - [build] Fixes for passing distcheck - - Makefile.am | 17 ++++++++++++----- - build/Makefile.am | 2 ++ - build/autotools/Makefile.am | 4 +++- - doc/reference/Makefile.am | 20 +++++++++++--------- - json-glib/Makefile.am | 27 ++++++++++++++------------- - 5 files changed, 42 insertions(+), 28 deletions(-) - -commit 019d8d4c1c56250cd507283c0fc478a38364e92a -Author: Emmanuele Bassi -Date: Thu Jun 18 10:05:57 2009 +0100 - - [build] Let gtk-doc ignore json-types-private.h - - The type definitions in json-types-private.h are not meant to be - documented or scanned. - - doc/reference/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -commit 41649f049637864cfce21f6615c7d8bcaf3f03b8 -Author: Emmanuele Bassi -Date: Thu Jun 18 10:03:23 2009 +0100 - - [docs] Update the README file - - README | 30 ++++++++++++++++++++---------- - 1 file changed, 20 insertions(+), 10 deletions(-) - -commit 97fc00b1a5e3878074488ee93d9b52570983da1f -Author: Emmanuele Bassi -Date: Thu Jun 18 10:03:05 2009 +0100 - - [build] Use AS_CASE m4 macro, instead of AS_IF - - configure.ac | 30 ++++++++++++++++-------------- - 1 file changed, 16 insertions(+), 14 deletions(-) - -commit 610cd260ac50c09809d6273c328ecea5a21f51bb -Author: Emmanuele Bassi -Date: Thu Jun 18 10:02:39 2009 +0100 - - [build] Require automake 1.10 - - configure.ac | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit bddc717b8b6f2f1501c30f78159c20394665d335 -Author: Emmanuele Bassi -Date: Tue Jun 9 11:48:02 2009 +0100 - - [build] Add introspection generation - - Build the Introspection data when compiling JSON-GLib; this way, the - API should be available to other languages automatically. - - .gitignore | 3 ++ - build/autotools/Makefile.am | 7 +++- - build/autotools/introspection.m4 | 88 ++++++++++++++++++++++++++++++++++++++++ - configure.ac | 13 +++--- - json-glib/Makefile.am | 30 ++++++++++++++ - 5 files changed, 135 insertions(+), 6 deletions(-) - -commit 3ddeb7a8779a4c51453289aa15af130af480eea6 -Author: Emmanuele Bassi -Date: Tue Jun 9 11:24:54 2009 +0100 - - [build] Add AS_COMPILER_FLAGS - - Use the m4 AS_COMPILER_FLAGS macro to check for the maintainer - compiler flags supported by the C compiler. This should allow the - build to handle gracefully different versions of GCC. - - .gitignore | 1 + - Makefile.am | 2 ++ - build/autotools/Makefile.am | 2 +- - build/autotools/as-compiler-flag.m4 | 62 +++++++++++++++++++++++++++++++++++++ - configure.ac | 5 ++- - 5 files changed, 70 insertions(+), 2 deletions(-) - -commit 9f817eae9fe0d09441fa78b11ef148a3f4affe22 -Author: Emmanuele Bassi -Date: Tue Jun 9 11:21:19 2009 +0100 - - [tests] Do not namespace with json- - - tests/test-generator.c | 10 +++++----- - tests/test-parser.c | 18 +++++++++--------- - 2 files changed, 14 insertions(+), 14 deletions(-) - -commit bde3da83b1a144fc0eff1db5a2aa790462bb685e -Author: Emmanuele Bassi -Date: Tue Jun 9 11:15:53 2009 +0100 - - [git ignore] Add m4 files under build/ - - .gitignore | 3 +++ - 1 file changed, 3 insertions(+) - -commit c12786444e0175464295fb9a98c600060bffa0ed -Author: Emmanuele Bassi -Date: Tue Jun 9 11:13:30 2009 +0100 - - Fix license and copyright notices - - THere is no such thing as the "Lesser General Public License - version 2": the LGPL v2 is the "Library GPL", and has been - superceded by v2.1 with the new "Lesser GPL" name. - - Also, the copyright is now Intel Corp. - - json-glib/json-array.c | 8 ++++++-- - json-glib/json-generator.c | 8 ++++++-- - json-glib/json-generator.h | 8 ++++++-- - json-glib/json-glib.h | 23 +++++++++++++++++++++++ - json-glib/json-gobject.h | 8 ++++++-- - json-glib/json-node.c | 8 ++++++-- - json-glib/json-object.c | 9 ++++++--- - json-glib/json-parser.c | 8 ++++++-- - json-glib/json-parser.h | 8 ++++++-- - json-glib/json-version.h.in | 8 ++++++-- - 10 files changed, 77 insertions(+), 19 deletions(-) - -commit 069cdc8c4ea9024b1583f074815e16e9ddf7db7f -Author: Emmanuele Bassi -Date: Tue Jun 9 11:05:23 2009 +0100 - - [node] Make JsonNode completely private - - The JsonNode structure has always been meant to be completely - opaque; we indirectly exposed the :type member, but only for - access through the JSON_NODE_TYPE() macro. - - Since that macro has become a proxy for the json_node_get_node_type() - function we can safely move everything into a private, uninstalled - header file and let JsonNode be completely opaque to the developer. - - json-glib/Makefile.am | 1 + - json-glib/json-array.c | 9 +------ - json-glib/json-generator.c | 2 ++ - json-glib/json-gobject.c | 2 ++ - json-glib/json-node.c | 2 +- - json-glib/json-object.c | 9 +------ - json-glib/json-parser.c | 2 ++ - json-glib/json-types-private.h | 61 ++++++++++++++++++++++++++++++++++++++++++ - json-glib/json-types.h | 38 ++++++++++---------------- - json-glib/tests/node-test.c | 8 +++--- - 10 files changed, 89 insertions(+), 45 deletions(-) - -commit 930fdf4c4dff1f5310a946c2a9f5b6860f7c8ba8 -Author: Emmanuele Bassi -Date: Sun May 17 19:44:41 2009 +0100 - - Add JsonArray iteration function - - Similarly to commit 3057a172 for JsonObject, the newly added - json_array_foreach_element() iterates over a JSON array data - type. - - doc/reference/json-glib-sections.txt | 2 ++ - json-glib/json-array.c | 35 ++++++++++++++++++++++++++ - json-glib/json-types.h | 21 ++++++++++++++++ - json-glib/tests/array-test.c | 48 ++++++++++++++++++++++++++++++++++++ - 4 files changed, 106 insertions(+) - -commit 3057a1722e27a13b39ddec4754fb6abda1aea199 -Author: Emmanuele Bassi -Date: Sat May 16 20:09:07 2009 +0100 - - Add JsonObject iteration function - - The json_object_foreach_member() function iterates over a JsonObject - data type. - - doc/reference/json-glib-sections.txt | 2 ++ - json-glib/json-object.c | 55 ++++++++++++++++++++++++++++++++++ - json-glib/json-types.h | 25 ++++++++++++++-- - json-glib/tests/object-test.c | 57 ++++++++++++++++++++++++++++++++++++ - 4 files changed, 137 insertions(+), 2 deletions(-) - -commit 5778210462b8b7a1a5d98466508276f712ea8c47 -Author: Emmanuele Bassi -Date: Sat May 16 13:53:58 2009 +0100 - - Update the enum types templates - - The autogenerated enumeration types registration code should - be using the same pattern used by the G_DEFINE_TYPE() macros, - with GOnce to enable atomic (and thread-safe) type registration. - - json-glib/json-enum-types.c.in | 18 +++++++++++++----- - 1 file changed, 13 insertions(+), 5 deletions(-) - -commit 43d4bd151cd6979ecc6fdad5fab3e7988117c7be -Author: Emmanuele Bassi -Date: Sun Apr 19 00:36:08 2009 +0100 - - [doap] Add a category element - - json-glib.doap | 1 + - 1 file changed, 1 insertion(+) - -commit 58999bddac74c176fbd8544fa2cd30e2f067d863 -Author: Emmanuele Bassi -Date: Fri Apr 17 15:45:42 2009 +0100 - - [node] Add is_null() method - - The json_node_is_null() function is just a quick check for - nodes set to null. - - doc/reference/json-glib-sections.txt | 1 + - json-glib/json-node.c | 20 ++++++++++++++++++++ - json-glib/json-types.h | 1 + - 3 files changed, 22 insertions(+) - -commit ba46d8e07a8e2dd50a3b1fff8b8c3303e3686480 -Author: Emmanuele Bassi -Date: Fri Apr 17 15:38:40 2009 +0100 - - [node] Make JSON_NODE_TYPE call a function - - Second pass at adding type safety to the JsonNode type checks. - - The JSON_NODE_TYPE macro now calls the json_node_get_node_type() - function which hides the JsonNode.type structure field and gives - us a little bit more of future compatibility. - - json-glib/json-types.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit d1e7d1ecd05687624f7149dad75a5fac9a645e72 -Author: Emmanuele Bassi -Date: Fri Apr 17 15:36:09 2009 +0100 - - [node] Add function version of JSON_NODE_TYPE macro - - First pass at adding some type safety to the JsonNode type checks, - and at removing every mention of the JsonNode interna fields. - - doc/reference/json-glib-sections.txt | 1 + - json-glib/json-node.c | 18 ++++++++++++++++++ - json-glib/json-types.h | 5 +++-- - 3 files changed, 22 insertions(+), 2 deletions(-) - -commit f2f43d17254317d35ea0cc8206592ecbcb856b68 -Author: Emmanuele Bassi -Date: Fri Apr 17 15:22:04 2009 +0100 - - Intern the remaining type names - - JsonArray and JsonSerializable type names should be interned like - the rest of the types. - - json-glib/json-array.c | 2 +- - json-glib/json-gobject.c | 3 ++- - 2 files changed, 3 insertions(+), 2 deletions(-) - -commit bfcc50d5b199e72ed3e5a7556ac2294442e3ac55 -Author: Emmanuele Bassi -Date: Fri Apr 17 15:19:42 2009 +0100 - - [docs] Remove newline from the version template - - The newline at the end of the version.xml.in file is retained - when using its contents as the version entity in the API reference - docbook. - - doc/reference/version.xml.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit cbc92b72b2d7870a916f24055f8c2aa2371aa4ea -Author: Emmanuele Bassi -Date: Fri Apr 17 15:02:44 2009 +0100 - - [tests] Use the typed accessors in test-generator - - Other than using the GValue-based methods we should also be using - the typed JsonNode accessors and the newly added JsonObject and - JsonArray typed accessors. - - tests/test-generator.c | 63 ++++++++------------------------------------------ - 1 file changed, 10 insertions(+), 53 deletions(-) - -commit e437ce609e333c5b8ede21174dfba032c1bbfb00 -Author: Emmanuele Bassi -Date: Fri Apr 17 14:49:25 2009 +0100 - - Add convenience accessors to JsonArray - - Like commit 5bb6ea91 did for JsonObject, we should add typed - convenience accessors to JsonArray in order to cut down the - amount of nodes needed when parsing and generating JSON data - streams. - - As for JsonObject, the amount of types is small enough to avoid - the combinatorial API explosion. - - doc/reference/json-glib-sections.txt | 22 +- - json-glib/json-array.c | 386 +++++++++++++++++++++++++++++++++++ - json-glib/json-types.h | 57 ++++-- - 3 files changed, 447 insertions(+), 18 deletions(-) - -commit 4819ca625d1b73270797f913495a3835297950c2 -Author: Emmanuele Bassi -Date: Fri Apr 17 11:44:01 2009 +0100 - - Update after the json_object_add_member() deprecation - - Since json_object_add_member() has been deprecated and it's using - a gcc compiler attribute to loudly complain while compiling the - library, we should restore the sanity and use json_object_set_member() - instead. - - json-glib/json-gobject.c | 2 +- - json-glib/json-parser.c | 6 +++--- - json-glib/tests/node-test.c | 2 +- - json-glib/tests/object-test.c | 4 ++-- - tests/test-generator.c | 26 +++++++++++++------------- - tests/test-serialize-complex.c | 4 ++-- - tests/test-serialize-full.c | 4 ++-- - 7 files changed, 24 insertions(+), 24 deletions(-) - -commit 5bb6ea91accb1d35f0ea4dae8f2b8f71bdbd134d -Author: Emmanuele Bassi -Date: Fri Apr 17 11:35:57 2009 +0100 - - Deprecate add_member() and add set_member() and friends - - The add_member() method of JsonObject has wee bit weird semantics: if - the member to be added already exists it prints a scary warning and - returns - and yet it calls g_hash_table_replace() internally as if it - overwrites the member. - - So, instead of changing semantics midway we can: - - - add a json_object_set_member() which adds a new member and - overwrites existing members - - - deprecate json_object_add_member() - - While we're at it, we can add convenience wrappers for set_member() - and get_member() that don't require us toying with nodes; luckily, - since the amount of valid types we can add to a JsonObject is limited, - this does not lead to a combinatorial API explosion. - - doc/reference/json-glib-sections.txt | 17 ++ - json-glib/json-object.c | 489 +++++++++++++++++++++++++++++++++-- - json-glib/json-types.h | 83 ++++-- - 3 files changed, 555 insertions(+), 34 deletions(-) - -commit 2a768cb5e553afc4a9ac0d9bf1dc36a183821983 -Author: Emmanuele Bassi -Date: Thu Apr 16 19:57:11 2009 +0100 - - [doap] Add GNOME extensions - - The GNOME project provides an extension to DOAP that allows the - description of the maintainer/author of a project to specify the - GNOME userid. - - json-glib.doap | 3 +++ - 1 file changed, 3 insertions(+) - -commit 17822292acb4d1c9b4f414ea0e4b858809d3b858 -Author: Emmanuele Bassi -Date: Thu Apr 16 18:18:45 2009 +0100 - - [doap] Add 0.6 releases - - Describe the releases of the 0.6 cycle. - - json-glib.doap | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -commit 470f3a4299153362deea260c806d9b87870af3de -Author: Emmanuele Bassi -Date: Thu Apr 16 18:03:31 2009 +0100 - - Add JSON-GLib DOAP description - - Use DOAP (Description Of A Project) to describe JSON-GLib. The - GNOME Cgit instance will pick up the DOAP file and update itself. - - json-glib.doap | 30 ++++++++++++++++++++++++++++++ - 1 file changed, 30 insertions(+) - -commit 764a3f79fe0d8d13e24bd921a16a46f4603bcbf1 -Author: Emmanuele Bassi -Date: Thu Apr 16 11:28:24 2009 +0100 - - Add MAINTAINERS file - - Every GNOME project needs a MAINTAINERS file. - - MAINTAINERS | 3 +++ - 1 file changed, 3 insertions(+) - -commit f9956b4eadcfc9bbd5c0bc4b861ff782779e8a9a -Author: Emmanuele Bassi -Date: Tue Apr 14 00:09:35 2009 +0100 - - [node] Do not overwrite when copying - - Bug 1353 - Copying JSON_NODE_VALUE nodes unreliable at best - - When copying a JsonNode to another we do an implicit memcpy using: - - *copy = *src - - Which works well enough with pointers, but makes a mess out of the - value-based nodes. - - We should just copy the type of the original JsonNode and leave the - rest to the switch() block. - - In order to catch potential regressions, we also need a more - thorough test unit for the JsonNode copy operation. - - json-glib/json-node.c | 2 +- - json-glib/tests/node-test.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- - 2 files changed, 44 insertions(+), 3 deletions(-) - -commit e2c65a75d68aafa26f2084928e732961e48beb99 -Author: Emmanuele Bassi -Date: Mon Apr 13 23:46:52 2009 +0100 - - [build] Improve the build system - - Clean up the configure.ac and Makefile.am files to use something - that is not entirely made of FAIL. - - Also, use Shave to sanitize the libtool and compiler incantations - and restore sanity to the build system. - - .gitignore | 5 +++ - autogen.sh | 9 ++++ - build/Makefile.am | 1 + - build/autotools/Makefile.am | 3 ++ - build/autotools/shave-libtool.in | 69 ++++++++++++++++++++++++++++++ - build/autotools/shave.in | 79 +++++++++++++++++++++++++++++++++++ - build/autotools/shave.m4 | 77 ++++++++++++++++++++++++++++++++++ - configure.ac | 90 +++++++++++++++++++++++----------------- - json-glib/Makefile.am | 89 ++++++++++++++++++++------------------- - 9 files changed, 340 insertions(+), 82 deletions(-) - -commit 8080df63b4b4eae3b59d1214fc67f48149f49773 -Author: Emmanuele Bassi -Date: Mon Apr 13 22:25:42 2009 +0100 - - [parser] Prevent leaks on error codepaths - - Static analysis of the code showed some potential leaks inside - error paths for JsonParser. - - Thanks to: Gordon Williams - - json-glib/json-parser.c | 38 +++++++++++++++++++++++++++++++++----- - 1 file changed, 33 insertions(+), 5 deletions(-) - -commit ca329a7d5c1185cdf15fb85891693eca30295de1 -Author: Emmanuele Bassi -Date: Mon Apr 13 22:30:05 2009 +0100 - - [docs] Show an example of assignment - - Since I decided to rant about assignments in JSON definitions, - I also need to show what an assignment looks like. - - json-glib/json-parser.c | 17 ++++++++++++----- - 1 file changed, 12 insertions(+), 5 deletions(-) - -commit b28d5894060aac1239e23665f42be3946b5450e7 -Author: Emmanuele Bassi -Date: Mon Apr 13 22:29:36 2009 +0100 - - Whitespace fixes - - Add more spaces and remove the ` from the error message. - - json-glib/json-parser.c | 18 ++++++++++++------ - 1 file changed, 12 insertions(+), 6 deletions(-) - -commit a19a51df9e95e36edf949e68581731bd31959081 -Author: Emmanuele Bassi -Date: Mon Apr 13 22:08:21 2009 +0100 - - [tests] Use 'static' when registering enum types - - Bug 1393 - Regression tests fails on OpenBSD - - When registering a GEnumClass we need to set the GEnumValue array - as static const because g_enum_register_static() does not contain - the word "static" just for fun. - - Reported by: Jasper - - tests/test-serialize-full.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit e583a9ec95f3d157091ec1e1a2ac8c493f0e23b2 -Author: Emmanuele Bassi -Date: Mon Apr 13 22:04:10 2009 +0100 - - [build] Use gnome-autogen script - - When setting up the build environment we should use the tools that - GNOME provides instead of calling autoreconf. - - autogen.sh | 21 ++++++++------------- - 1 file changed, 8 insertions(+), 13 deletions(-) - -commit 1d92c73bc05423872581d513f355783d4864edd5 -Author: Emmanuele Bassi -Date: Fri Nov 28 17:24:15 2008 +0000 - - Abstract the loading code into its own function - - The load_from_file() method must set the is_filename/filename fields - of the JsonParserPrivate structure, so that the error handler can - use them to print out the file, as well as the line in case of - error. - - Since load_from_data() needs to unset those two fields, to avoid - printing invalid/stale information, we need to have a generic "load" - function that can be invoked by both load_from_data() and - load_from_file(), and leave the JsonParser object set up to those - two methods. - - Hence, a private json_parser_load() has been added, moving most of - the code out of json_parser_load_from_data(). This function does not - perform type checks and requires that the length of the memory buffer - containing the JSON data stream is already a positive integer. - - json-glib/json-parser.c | 175 ++++++++++++++++++++++++++++-------------------- - 1 file changed, 103 insertions(+), 72 deletions(-) - -commit 6e7958785096806b3ffa60a4937642d713a051f2 -Author: Emmanuele Bassi -Date: Fri Nov 28 17:19:17 2008 +0000 - - Display the filename inside error messages - - Instead of just relaying the line number both when parsing files - and memory buffers, JsonParser should also print out the file name - in case it is available. - - The error message format should be make-like and emacs-friendly, - that is: - - filename:line_number: error message - - so that editors and development environments can parse the errors - easily. - - This commit adds the filename string, and a boolean flag for checking - whether the filename is set, inside the JsonParser private data - structure. The boolean flag is checked inside the JsonScanner error - handler when populating the GError or when printing the warning - directly on stderr. - - json-glib/json-parser.c | 28 ++++++++++++++++++++++++++-- - 1 file changed, 26 insertions(+), 2 deletions(-) - -commit a5bea353dead0bd69f9664df86050fc829a2dcd5 -Author: Emmanuele Bassi -Date: Mon Nov 3 16:01:03 2008 +0000 - - Bump to 0.7.1 after stable branch - - configure.ac | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit cf4c7360c69c0fe7587ec2456cd10839e1d0c1d6 -Author: Emmanuele Bassi -Date: Mon Nov 3 15:51:21 2008 +0000 - - Correctly terminate a string array - - When converting from a JsonArray of strings to a GStrv we need to - add a NULL at the end of the GPtrArray we use to perform the - conversion. - - This two lines patch fixes the issue. - - See bug 1203. - - Patch by: Kouhei Sutou - - Signed-off-by: Emmanuele Bassi - - json-glib/json-gobject.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -commit 9b94bc7f99063f45a2725861369f36b53ec3d440 -Author: Emmanuele Bassi -Date: Fri Jun 13 11:56:46 2008 +0100 - - Sync up with the current stable release numbers - - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 4dd392342003147d55eee98db50e11d344b287d4 -Author: Emmanuele Bassi -Date: Fri Jun 13 11:27:50 2008 +0100 - - Fix a variable shadowing - - json-glib/json-generator.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -commit a02a42ef47e61456747e511556097b903f07d68a -Merge: fdbad1c bc5c722 -Author: Emmanuele Bassi -Date: Fri Jun 13 11:23:08 2008 +0100 - - Merge the fix for bug #965 - - Merge branch 'bug-965' - -commit bc5c7225535ef447743ac59ecdba8c237549a108 -Author: Emmanuele Bassi -Date: Fri Jun 13 11:22:35 2008 +0100 - - Conditionally compile the test suite - - If the --disable-glibtest command line switch has been given to the - configure script, the test suite should be disabled and not built. - - This commit disables recursion in the tests/ and json-glib/tests - when the ENABLE_GLIB_TEST Makefile conditional has been set. - - Makefile.am | 6 +++++- - configure.ac | 3 +++ - json-glib/Makefile.am | 2 ++ - 3 files changed, 10 insertions(+), 1 deletion(-) - -commit fdbad1cfd6ad6da9fab631f945ab8d2e85228fdf -Author: Emmanuele Bassi -Date: Fri Jun 13 11:06:15 2008 +0100 - - Escape to special characters in JsonGenerator - - When using json-glib to write a blog system, some deserialized objects - were not been interpreted by javascript because there were line breaks - in generated strings. - - Patch from Lincoln de Sousa. - - Bug #958 - JsonGenerator does not escape special characters - - Signed-off-by: Emmanuele Bassi - - json-glib/json-generator.c | 17 ++++++++++++++++- - 1 file changed, 16 insertions(+), 1 deletion(-) - -commit 81c02ef3db6901655f8a7117e5e2675d37096daf -Author: Emmanuele Bassi -Date: Sun May 18 11:56:04 2008 +0100 - - Remove the include for json-scanner.h - - The json-scanner.h header file is not shipped with JSON-GLib anymore. - - json-glib/json-glib.h | 1 - - 1 file changed, 1 deletion(-) - -commit 9713843a4294b3e35a29125bf2bf1867a6443f27 -Author: Emmanuele Bassi -Date: Tue May 6 11:48:25 2008 +0100 - - Remove debian packaging - - debian/changelog | 5 ---- - debian/compat | 1 - - debian/control | 61 ----------------------------------------- - debian/copyright | 27 ------------------ - debian/libjson-glib-dev.install | 3 -- - debian/libjson-glib-doc.install | 1 - - debian/libjson-glib-doc.links | 1 - - debian/libjson-glib0.install | 1 - - debian/rules | 12 -------- - 9 files changed, 112 deletions(-) - -commit d67000ab6c5ae6710f48f0517c98600af7cdaa0e -Author: Emmanuele Bassi -Date: Mon May 5 23:17:58 2008 +0100 - - Update changelog for the debian packages - - debian/changelog | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -commit 0830873edc5203655f04868184cedb428b6d2d54 -Author: Emmanuele Bassi -Date: Mon May 5 23:16:38 2008 +0100 - - Update git ignore file - - .gitignore | 72 +++++++++++++++++++------------------------------------------- - 1 file changed, 22 insertions(+), 50 deletions(-) - -commit eb1cd29f78ff52e3ec3b063716fb86b5f2c5ae4a -Author: Emmanuele Bassi -Date: Mon May 5 23:13:17 2008 +0100 - - Remove Vala bindings - - Vala bindings are maintained out of tree, directly inside the Vala - repository and official packages, so there's no point in duplicating - the effort here. - - Makefile.am | 6 +- - configure.ac | 15 ----- - contrib/Makefile.am | 6 -- - contrib/json-glib-1.0.deps | 1 - - contrib/json-glib-1.0.vapi | 139 --------------------------------------------- - contrib/json-object.vala | 46 --------------- - contrib/json-test.vala | 122 --------------------------------------- - 7 files changed, 1 insertion(+), 334 deletions(-) - -commit 094acd1663210e803a8dab496f6de8066ef11f44 -Author: Emmanuele Bassi -Date: Mon May 5 12:44:29 2008 +0100 - - Bump to 0.6.1 - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit a725bac9a287883f2d4f32130c7faedb121f754b -Author: Emmanuele Bassi -Date: Mon May 5 12:39:01 2008 +0100 - - Bump to 0.6.0 - - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit cd598180b12a212525427a8cddf11bc0ed4f1836 -Author: Emmanuele Bassi -Date: Mon May 5 12:38:50 2008 +0100 - - Update NEWS for 0.6.0 - - NEWS | 5 +++++ - 1 file changed, 5 insertions(+) - -commit 26479ec3c342889a2ee822bdf73f2e5fb6e170d7 -Merge: 8b5b5f6 7ff9134 -Author: Emmanuele Bassi -Date: Mon May 5 12:35:16 2008 +0100 - - Add debian packaging to the master branch - - Merge branch 'debian-packaging' - -commit 8b5b5f6a4fdfb219897d75893889014f44ba4bb0 -Author: Emmanuele Bassi -Date: Mon May 5 12:34:35 2008 +0100 - - Add json-scanner.h to the EXTRA_DIST content - - Fix a distcheck error because json-scanner.h is not packaged inside - the tarball. - - json-glib/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -commit 705a73eb3dfa2323ec86c1d299b567a15acde7a6 -Author: Emmanuele Bassi -Date: Mon May 5 12:24:22 2008 +0100 - - Style fixes for the configure output - - configure.ac | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -commit e017d392a281594e350a8d74c142cbe014753d7e -Author: Emmanuele Bassi -Date: Mon May 5 12:24:00 2008 +0100 - - Fix typo in the libtool flags arguments - - The correct syntax for passing the versioning information to - libtool is '-version-info', not '-versio-info'. - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 2051be2f7185733bbc62d10ec096538fec924638 -Author: Emmanuele Bassi -Date: Mon May 5 12:22:59 2008 +0100 - - Add the Bugzilla URL to AC_INIT - - JSON-GLib has a bugzilla product on bugzilla.openedhand.com. By adding - the URL to the configure.ac template, the configure script will print - it when invoked with the --help command line switch. - - configure.ac | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -commit 4cb8a9078172c5f56ac5d56417b8656a7053df4a -Author: Emmanuele Bassi -Date: Mon May 5 12:21:40 2008 +0100 - - Update autogen.sh - - Make autogen.sh test for the location of the current directory, and - warn if the checkout is not complete. - - If gtk-doc is not installed (for instance, on an embedded minimal - set up), do not fail and just provide a stub gtk-doc.make. - - autogen.sh | 28 +++++++++++++++++++++++++--- - 1 file changed, 25 insertions(+), 3 deletions(-) - -commit 1571fcddd6f2a245f4bb6ad64f82d24fc9c4cec0 -Author: Emmanuele Bassi -Date: Thu May 1 23:00:28 2008 +0100 - - Test the deserialization of arrays of strings - - Arrays of strings are handled automatically by the GObject - deserialization and serialization code. We need to test that - they are correctly parsed and assigned to the instance. - - tests/test-serialize-full.c | 29 +++++++++++++++++++++++++++-- - 1 file changed, 27 insertions(+), 2 deletions(-) - -commit 4c11d0969a44bb70acf6463ef6305999ff443be2 -Author: Emmanuele Bassi -Date: Thu May 1 22:58:55 2008 +0100 - - Use an array to hold the strings in a vector - - Instead of building a GString by concatenating every string inside - an array to deserialize the array into a string vector property, - use a GPtrArray. This is far more efficient (no reallocations are - necessary, as we know the size of the array) and safe (the separator - used to build the string buffer and then split it might exist in - one of the original strings). - - json-glib/json-gobject.c | 15 +++++---------- - 1 file changed, 5 insertions(+), 10 deletions(-) - -commit 7ff91344d21b0c26d3a3a2834dbf09286cb1f904 -Author: Emmanuele Bassi -Date: Thu May 1 16:08:15 2008 +0100 - - Remove control re-generation rule - - We don't have a template control, so there's not need to clean it - up and regenerate it. - - This is why copying existing debian/rules templates is not a good - idea unless you read the Debian packaging rules. - - debian/rules | 3 --- - 1 file changed, 3 deletions(-) - -commit e75321e64f17d69beac0c2e131572fe081680b08 -Author: Emmanuele Bassi -Date: Thu May 1 15:58:31 2008 +0100 - - Add debian packaging files - - The debian packaging files are obviously needed to generate Debian - packages for JSON-GLib. - - debian/changelog | 6 ++++ - debian/compat | 1 + - debian/control | 61 +++++++++++++++++++++++++++++++++++++++++ - debian/copyright | 27 ++++++++++++++++++ - debian/libjson-glib-dev.install | 3 ++ - debian/libjson-glib-doc.install | 1 + - debian/libjson-glib-doc.links | 1 + - debian/libjson-glib0.install | 1 + - debian/rules | 15 ++++++++++ - 9 files changed, 116 insertions(+) - -commit 30f9d47ecf43a17610cd9c0074ff832bfa37593c -Author: Emmanuele Bassi -Date: Thu Apr 24 15:47:11 2008 +0100 - - Test the equality of the serialize string length - - tests/test-serialize-simple.c | 3 +++ - 1 file changed, 3 insertions(+) - -commit 07c2b916dadb4b40fbaabf49f0e80941993cc2cf -Author: Emmanuele Bassi -Date: Thu Apr 24 15:02:33 2008 +0100 - - Export only the public symbols - - All the symbols starting with an underscore or with something that - is not "json" are to considered private, and thus are not global - to the shared object. - - json-glib/Makefile.am | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -commit 179899e5da801fda0981a1d446ba420efd4021c1 -Author: Emmanuele Bassi -Date: Thu Apr 24 14:55:51 2008 +0100 - - Update git ignore file - - .gitignore | 4 ++++ - 1 file changed, 4 insertions(+) - -commit b0daf7e3a2529dd9950d77a96a10233d68778f32 -Author: Emmanuele Bassi -Date: Thu Apr 24 14:54:05 2008 +0100 - - Include the newly added json-enum-types.h header - - When including json-glib/json-glib.h we get everything json-glib - expose as a public symbol. - - json-glib/json-glib.h | 1 + - 1 file changed, 1 insertion(+) - -commit c7a7f429565195fe7aba56a254abf3637cf6fa8a -Author: Emmanuele Bassi -Date: Thu Apr 24 14:52:54 2008 +0100 - - Ignore the enumeration types header and the stamp file - - We don't need gtk-doc to look at those files; the enumeration - types are already documented, and the get_type() function and - macro are implied. - - doc/reference/Makefile.am | 2 ++ - 1 file changed, 2 insertions(+) - -commit 053bf43c813799c5f59e9241217fe31c560b5885 -Author: Emmanuele Bassi -Date: Thu Apr 24 14:52:07 2008 +0100 - - Install the autogenerated enum types header - - The enumeration GTypes are public and meant to be used by - language bindings and other users of the library. - - json-glib/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -commit 5977d95866cd9763e97a47d6c9909e6a2fbf0ed1 -Author: Emmanuele Bassi -Date: Thu Apr 24 14:50:34 2008 +0100 - - Autogenerate the GTypes for the enumerations - - json-glib/Makefile.am | 70 ++++++++++++++++++++++++++++++++++----------------- - 1 file changed, 47 insertions(+), 23 deletions(-) - -commit 356413e8840a614914b84f40b1d8476ba036ded4 -Author: Emmanuele Bassi -Date: Thu Apr 24 14:49:45 2008 +0100 - - Add enumeration types templates for glib-mkenums - - The templates for glib-mkenums keep the Makefile.am sane and - editable by mere mortals. - - json-glib/json-enum-types.c.in | 31 +++++++++++++++++++++++++++++++ - json-glib/json-enum-types.h.in | 26 ++++++++++++++++++++++++++ - 2 files changed, 57 insertions(+) - -commit 7d57ffc03783defbfeb26e21a14e3df32555c29d -Author: Emmanuele Bassi -Date: Mon Apr 21 10:57:05 2008 +0100 - - Update git ignore file - - .gitignore | 1 + - 1 file changed, 1 insertion(+) - -commit 7d259e03b9a556d155ade87417ab26830c3e7684 -Author: Emmanuele Bassi -Date: Sun Apr 20 22:43:32 2008 +0100 - - Validate the variable name in the assignment test - - Make sure that not only we report that there is an assignment - and that the returned variable is not NULL, but also that the - returned variable name is correct. - - tests/test-parser.c | 16 ++++++++++------ - 1 file changed, 10 insertions(+), 6 deletions(-) - -commit 6899bca0dcf72dac0cad9dcf1a7cd10159d471e5 -Author: Emmanuele Bassi -Date: Sat Apr 19 23:22:29 2008 +0100 - - Add more cases for the nested array parsing unit - - Try more combinations of elements inside an array with a nested - object. - - tests/test-parser.c | 2 ++ - 1 file changed, 2 insertions(+) - -commit 81addb645ac5fad28619bb660624902abe981377 -Author: Emmanuele Bassi -Date: Sat Apr 19 23:18:54 2008 +0100 - - Add verbose messages - - The unicode escaping unit should have the same verbosity as the - other units. - - tests/test-parser.c | 4 ++++ - 1 file changed, 4 insertions(+) - -commit 22a0db88c14895f98db76bca3cb078fbd3a2b07d -Author: Emmanuele Bassi -Date: Sat Apr 19 23:09:32 2008 +0100 - - Whitespace fixes in the licensing notice - - json-glib/json-scanner.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 676592cef006de16d966a1ca0469ccd0556f0e4b -Author: Emmanuele Bassi -Date: Sat Apr 19 23:09:20 2008 +0100 - - Documentation fixes in JsonNode - - json-glib/json-node.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit bf2249a1855b6bebe0b3528b4d5321a1ebe4b9e7 -Author: Emmanuele Bassi -Date: Sat Apr 19 23:08:20 2008 +0100 - - Do not copy node data if it's not there - - If the source JsonNode does not contain data yet, do not try - and copy it. - - json-glib/json-node.c | 17 +++++++++++++---- - 1 file changed, 13 insertions(+), 4 deletions(-) - -commit c191b2f8a8159457db3333390be10d6c7c0d4336 -Author: Emmanuele Bassi -Date: Sat Apr 19 23:05:03 2008 +0100 - - Ignore json-scanner.h and its types - - When generating the documentation, ignore the JsonScanner header - as it will not be installed. - - Also, we moved JsonTokenType from json-parser.h to json-scanner.h, - where it belongs, so we can remove it from the (private) subsection - of the json-parser section. - - doc/reference/Makefile.am | 7 ++++++- - doc/reference/json-glib-sections.txt | 1 - - 2 files changed, 6 insertions(+), 2 deletions(-) - -commit ffbd9063556a061ba3e7e4223b924ae4766adfbd -Author: Emmanuele Bassi -Date: Sat Apr 19 23:01:26 2008 +0100 - - Do not install the JsonScanner header - - The JsonScanner tokenizer is an internal copy of GScanner: it should - not be used outside JSON-GLib - JsonParser is the public API for - parsing JSON. - - json-glib/Makefile.am | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -commit df2a310a6ed0a3b32415f53076ff4c053b3fd925 -Author: Emmanuele Bassi -Date: Sat Apr 19 22:59:28 2008 +0100 - - Fix the external gtk-doc references - - Gtk-doc can try and resolve the external symbols using the data - currently installed in other locations. - - Since we are using GLib and GObject it would be nice to backlink - to them inside our API reference. - - doc/reference/Makefile.am | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -commit 6a3d8266efe505b29555db21658c241eba20fe2d -Author: Emmanuele Bassi -Date: Sat Apr 19 22:57:05 2008 +0100 - - Add GLIB_PREFIX variable - - The gtk-doc-fixref script needs to know the location of the - libraries documentation; in order to get it, we can ask the - pkg-config file of the library for its prefix. - - configure.ac | 5 +++++ - 1 file changed, 5 insertions(+) - -commit 4e5ec69cce8ab27f965985ba69ea11224ae39ffd -Author: Emmanuele Bassi -Date: Sat Apr 19 22:28:21 2008 +0100 - - Update the description and dependencies - - README | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -commit f65a5d5e30a1242a899149b732d1139891876014 -Author: Emmanuele Bassi -Date: Sat Apr 19 18:05:45 2008 +0100 - - Bump to 0.5.1 - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit ab0da7c61bde715e99dd16027b198c7760b30922 -Author: Emmanuele Bassi -Date: Sat Apr 19 18:01:57 2008 +0100 - - Update for 0.5.0 release - - NEWS | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -commit 203927c71231cf6cec6d88161211702b7105df2d -Author: Emmanuele Bassi -Date: Sat Apr 19 17:20:50 2008 +0100 - - Fix ignore rule - - .gitignore | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 76921ac27534aa0a25b39790ce4d99cf6e19a20c -Author: Emmanuele Bassi -Date: Sat Apr 19 17:19:30 2008 +0100 - - Verify the correct handling of Unicode escaping - - Check that JsonParser correctly handles Unicode characters escaped - using the \uXXXX notation, as per RFC. - - tests/test-parser.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 67 insertions(+) - -commit 379a2fe972c6e7436be9f345fe018bf4fe575354 -Author: Emmanuele Bassi -Date: Sat Apr 19 17:16:28 2008 +0100 - - Add support for parsing \uXXXX into Unicode - - JsonScanner was forked from GScanner in order to support the - JSON-specific Unicode escaping. - - JsonScanner now intercepts the \u escape character and, if it - is followed by a hexadecimal value, it will retrieve the - Unicode character encoded in the following 4 values and insert - the character itself in the buffer. - - This allows full compatibility with JSON. - - json-glib/json-scanner.c | 56 ++++++++++++++++++++++++++++++++++++++++++------ - 1 file changed, 50 insertions(+), 6 deletions(-) - -commit 9429ecaa88cdb6705189b6970481911f11339ff6 -Merge: d313aa1 445a3f7 -Author: Emmanuele Bassi -Date: Sat Apr 19 15:33:15 2008 +0100 - - Merge master branch back for testing JsonScanner - - Merge branch 'master' into json-scanner - -commit 445a3f71d046abed4ff99e0ab4cd9cc8e047f5be -Author: Emmanuele Bassi -Date: Sat Apr 12 13:21:21 2008 +0100 - - Allow null nodes to return a value without a warning - - Value nodes might contain 'null' as a valid value, so the fast accessors - should not barf out when encountering a JSON_NODE_NULL instead of the - expected JSON_NODE_VALUE. - - json-glib/json-node.c | 21 +++++++++++++++------ - 1 file changed, 15 insertions(+), 6 deletions(-) - -commit 4e826d9f209a8f68023bae54c91b2bbbb202a54a -Merge: 98b6e5e 2a579b5 -Author: Emmanuele Bassi -Date: Thu Apr 3 16:32:53 2008 +0100 - - Merge branch 'test-framework' - -commit 2a579b51f38df1c009201703279a3e6cb4f57eea -Author: Emmanuele Bassi -Date: Thu Apr 3 16:31:48 2008 +0100 - - Wrap the test report information section inside an info element - - Makefile.decl | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -commit 8e2e539d02b84e0fe452174f3dfab06f35a4e6a1 -Author: Emmanuele Bassi -Date: Sun Mar 9 20:52:29 2008 +0000 - - Add value testing to the JsonNode unit - - Test the GValue API for storing fundamental types into a JsonNode. - - json-glib/tests/node-test.c | 29 +++++++++++++++++++++++++++++ - 1 file changed, 29 insertions(+) - -commit 646b90e79d3424a332064a6a1e9fc62d1ce99386 -Author: Emmanuele Bassi -Date: Wed Mar 5 17:43:06 2008 +0000 - - Add package and version information to the test-report XML - - Makefile.decl | 2 ++ - 1 file changed, 2 insertions(+) - -commit b8943381b0df44d9e6e21ae8321df2376c8458a8 -Author: Emmanuele Bassi -Date: Wed Mar 5 16:03:24 2008 +0000 - - Add JsonObject test unit - - Use a similar test unit as the JsonArray one, testing creation, empty - objects, addition and removal of members. - - .gitignore | 2 ++ - json-glib/tests/Makefile.am | 17 +++++++----- - json-glib/tests/object-test.c | 62 +++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 75 insertions(+), 6 deletions(-) - -commit 7eab612d9b200aef197fa1dffa4f89b936c76b1f -Author: Emmanuele Bassi -Date: Wed Mar 5 15:46:41 2008 +0000 - - Add element removal unit to the Array test - - Remove the json_array_remove_element() call from the add-element test unit - and set up a separate test case for the element removal. This keeps the - test cases clean. - - json-glib/tests/array-test.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -commit 6aa1ddb891594e0f567bc3ebeb3bf5d3ab8e7e0c -Author: Emmanuele Bassi -Date: Tue Mar 4 13:07:08 2008 +0000 - - Clean the test-report XML output, if found - - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 6eee8282d327614380854d572b2680f40b2faaf5 -Author: Emmanuele Bassi -Date: Tue Mar 4 12:37:52 2008 +0000 - - Update gitignore file - - .gitignore | 18 ++++++++---------- - 1 file changed, 8 insertions(+), 10 deletions(-) - -commit d5cb48681c68c3d53d8ec331ef37fb60820a9421 -Author: Emmanuele Bassi -Date: Tue Mar 4 12:30:48 2008 +0000 - - Build test-serialize-full - - Complete the porting of the old test suite into the new, GTest based one. - - The new test suite is automatically run with make test; make test-report - will generate an XML report of the test. - - The API coverage for the data types is part of the json-glib/tests - directory and will be expanded later. - - tests/Makefile.am | 8 +++++-- - tests/test-serialize-full.c | 56 ++++++++++++++++++++++++++++----------------- - 2 files changed, 41 insertions(+), 23 deletions(-) - -commit 1f6307ea2d7dc6ebe279d08b9f95f3074fbdd462 -Author: Emmanuele Bassi -Date: Tue Mar 4 12:18:19 2008 +0000 - - Rename test-08 into test-serialize-full - - The test-08 case was the last numbered test unit. - - tests/test-08.c | 337 -------------------------------------------- - tests/test-serialize-full.c | 337 ++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 337 insertions(+), 337 deletions(-) - -commit cdb194e8d64343e8bcb00e046c5fbeefd677b02a -Author: Emmanuele Bassi -Date: Tue Mar 4 12:17:29 2008 +0000 - - Rename test-07 into test-serialize-complex - - The new test-serialize-complex adds a test unit for the JsonSerializable - interface; the TestObject implements the serialization interface to - create a JSON data type from a boxed GType. - - tests/Makefile.am | 4 + - tests/test-07.c | 252 --------------------------------------- - tests/test-serialize-complex.c | 261 +++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 265 insertions(+), 252 deletions(-) - -commit 4c766a029d8f6a2d06b749527020fd93fc4a4f99 -Author: Emmanuele Bassi -Date: Tue Mar 4 12:12:37 2008 +0000 - - Fix compilation of test-serialize-simple and add it to the test suite - - The new test-serialize-simple tests the GObject integration for - serializing simple GObjects into JSON. - - tests/Makefile.am | 4 ++++ - tests/test-serialize-simple.c | 5 +++-- - 2 files changed, 7 insertions(+), 2 deletions(-) - -commit 325185c5955f8942ddf8d55a9e3b5d6a8c2723d1 -Author: Emmanuele Bassi -Date: Tue Mar 4 12:10:23 2008 +0000 - - Rename test-06 to test-serialize-simple - - tests/test-06.c | 162 ------------------------------------------ - tests/test-serialize-simple.c | 162 ++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 162 insertions(+), 162 deletions(-) - -commit cbea4698c1b7284d8004fff659a7354fb3af29ee -Author: Emmanuele Bassi -Date: Tue Mar 4 12:09:44 2008 +0000 - - Move test-06 to GTest API - - First pass into replacing the last three numbered tests into named - tests. - - tests/test-06.c | 28 ++++++++++++++++++---------- - 1 file changed, 18 insertions(+), 10 deletions(-) - -commit 5cc1d3d6061830de403ccbc10c2414f29cd1cf82 -Author: Emmanuele Bassi -Date: Tue Mar 4 10:52:51 2008 +0000 - - Coalesce JsonGenerator test cases into a single test unit - - Like we did for JsonParser, JsonGenerator has now a test unit checking the - output of a DOM built and dumped into a buffer. - - For the arrays is quite easy to verify that the output is correct; - unfortunately, JsonObject does not guarantee any ordering on the members, - with it being an associative array. Hence, for the object test case we - just compare the length of the output. - - tests/Makefile.am | 4 + - tests/test-04.c | 238 ----------------------------- - tests/test-05.c | 227 ---------------------------- - tests/test-generator.c | 399 +++++++++++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 403 insertions(+), 465 deletions(-) - -commit e100c69a4fca046cbeb6db3fc8ba49160796d87c -Author: Emmanuele Bassi -Date: Tue Mar 4 10:44:56 2008 +0000 - - Append to EXTRA_DIST, since it was defined elsewhere - - contrib/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 98b6e5e2f151c4ee800754675bf01e585fee850b -Author: Emmanuele Bassi -Date: Tue Mar 4 07:05:01 2008 +0000 - - Update the README - - README | 36 ++++++++++++++++++++++++++++++++++++ - 1 file changed, 36 insertions(+) - -commit 1a078c783a5a03b3367ce59eb25248dd6e23b5c6 -Author: Emmanuele Bassi -Date: Tue Mar 4 07:05:01 2008 +0000 - - Update the README - - README | 36 ++++++++++++++++++++++++++++++++++++ - 1 file changed, 36 insertions(+) - -commit 44891ea1040ceae95a994b646174696de7779ea1 -Author: Emmanuele Bassi -Date: Tue Mar 4 06:44:59 2008 +0000 - - Update gitignore file - - .gitignore | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) - -commit 3ea189acf52ea39653c6505c136f1f45a660a24c -Author: Emmanuele Bassi -Date: Tue Mar 4 06:34:11 2008 +0000 - - Add validation to the simple object test values - - Like for the simple arrays test case, add validation of the values types - for the members of the simple objects test case. - - tests/test-parser.c | 31 ++++++++++++++++++++++++------- - 1 file changed, 24 insertions(+), 7 deletions(-) - -commit 40b3e9330f482e002aea90b0c1a4b9db2adffff0 -Author: Emmanuele Bassi -Date: Tue Mar 4 06:27:24 2008 +0000 - - Add validation of the simple array test values - - Instead of just checking that the array contains something, the simple-array - test case should validate the contents of the array. - - The test now uses a struct defining: - - the test array - - the size of the array - - an element to check - - the type of the node for the element - - the type of the value for the node - - All the fields are checked for a match. This makes the simple arrays test - case more reliable. - - tests/test-parser.c | 40 +++++++++++++++++++++++++++++++--------- - 1 file changed, 31 insertions(+), 9 deletions(-) - -commit 7e6dab14302b94979672acf81eec8710ea95e288 -Author: Emmanuele Bassi -Date: Sun Mar 2 17:44:27 2008 +0000 - - Add array-test to the JSON-GLib types unit tests - - This simple unit will test the JsonArray API, as part of the coverage - test for the JSON-GLib types. - - json-glib/tests/Makefile.am | 10 ++++++--- - json-glib/tests/array-test.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 57 insertions(+), 3 deletions(-) - -commit 441ee88a6e024fc5ab2cf8355adad1fecc276088 -Author: Emmanuele Bassi -Date: Sun Mar 2 15:09:05 2008 +0000 - - Coalesce test-03 into test-parser - - The third test under the tests/ directory was the last JsonParser test, - dealing with object parsing. Now, test-parser is complete and contains - all the JsonParser test cases. It still needs further testing to - verify the DOM created by the parser object. - - tests/test-02.c | 225 ---------------------------------------------------- - tests/test-03.c | 214 ------------------------------------------------- - tests/test-parser.c | 167 ++++++++++++++++++++++++++++++++++++-- - 3 files changed, 161 insertions(+), 445 deletions(-) - -commit 71db86d84a5544d603b03721891e0ad14f92178d -Author: Emmanuele Bassi -Date: Sun Mar 2 14:58:58 2008 +0000 - - Update the tests build to be a testing unit - - Instead of having stand alone tests, use the GTest framework and start - coalescing multiple test cases into one. - - The tests directory will be used for JsonParser, JsonGenerator and - the JSON-GObject integration API, by reusing the previous test cases - and remolding them into a more interesting test framework. - - tests/Makefile.am | 39 +++++---------------------------------- - 1 file changed, 5 insertions(+), 34 deletions(-) - -commit 1e6aa16a2a6432cf96d0a86d4650c13e63c67e43 -Author: Emmanuele Bassi -Date: Sun Mar 2 14:56:56 2008 +0000 - - Remove old, empty string test - - tests/test-01.c | 57 --------------------------------------------------------- - 1 file changed, 57 deletions(-) - -commit 989c807fd61cc65c1e4058c5d0794ae2fe438ba1 -Author: Emmanuele Bassi -Date: Sun Mar 2 14:56:28 2008 +0000 - - Rename JsonParser test, and coaelesce basic parser and array tests - - Instead of using a single test for empty strings and another test for - arrays, merge the two into a single test unit, using the GTest API. - - The JsonObject parsing test will also be merged later. - - tests/test-parser.c | 262 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 262 insertions(+) - -commit f1e1c0e7796903abb725e8216fc54f53573ecdc9 -Author: Emmanuele Bassi -Date: Sun Mar 2 10:51:09 2008 +0000 - - Port the empty string test to the GLib testing framework - - The old test-01 program tested the JsonParser with an empty string; instead - of relying on the exit code and error messages on screen, it shoul use the - new GTest API. - - This is the first test of the old test suite to be ported to the new test - framework API. - - tests/test-01.c | 44 +++++++++++++++++++++++++++++++++++--------- - 1 file changed, 35 insertions(+), 9 deletions(-) - -commit cb5b3d5fa6244b0d20258203bd9df7e3148af57b -Author: Emmanuele Bassi -Date: Sun Mar 2 10:50:17 2008 +0000 - - Add a JsonNode copy test unit - - The test unit copies a NULL JsonNode and checks that the copy and the - original nodes are equivalent. - - json-glib/tests/node-test.c | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -commit 40c757835e329fe01f8f22aba74d2e47f3a5e55c -Author: Emmanuele Bassi -Date: Sun Mar 2 10:49:52 2008 +0000 - - Update Makefile templates to include the testing framework - - contrib/Makefile.am | 2 ++ - doc/Makefile.am | 2 ++ - doc/reference/Makefile.am | 1 + - tests/Makefile.am | 38 ++++++++++++++++++++++++++++++++------ - 4 files changed, 37 insertions(+), 6 deletions(-) - -commit 75939c2b43430583150b18f0a8e82e3d60a4f4f1 -Author: Emmanuele Bassi -Date: Sat Mar 1 19:35:47 2008 +0000 - - Update gitignore file - - .gitignore | 4 ++++ - 1 file changed, 4 insertions(+) - -commit e4be0d896359cc1d0ba99dd81a66855389ebd5df -Author: Emmanuele Bassi -Date: Sat Mar 1 19:30:41 2008 +0000 - - Add initial test suite support using GLib's new testing framework - - GLib 2.15 added a new test unit framework to the GLib API. It allows - integrating unit testing into GLib and GObject based libraries and - applications. - - It requires a specially crafter Makefile holding a set of declarations, - which must be included into the project own Makefile templates; then - it is possible to drop tests inside a subdirectory, which will be built - after the library or application, and executed upon "make check". - - At the moment, there is a simple test for the JsonNode API, with a - single unit for the "null" node type. - - Makefile.am | 4 +++- - Makefile.decl | 57 +++++++++++++++++++++++++++++++++++++++++++++ - configure.ac | 3 ++- - json-glib/Makefile.am | 9 ++++++- - json-glib/tests/Makefile.am | 15 ++++++++++++ - json-glib/tests/node-test.c | 27 +++++++++++++++++++++ - 6 files changed, 112 insertions(+), 3 deletions(-) - -commit d313aa1e9e472834252ec173c0409eba11ebcff9 -Author: Emmanuele Bassi -Date: Fri Feb 29 16:40:33 2008 +0000 - - Update gitignore - - .gitignore | 1 + - 1 file changed, 1 insertion(+) - -commit 8a2bb3c4400b9df6cd864eb29920a7767e8170c7 -Author: Emmanuele Bassi -Date: Fri Feb 29 16:37:18 2008 +0000 - - Sanitize JsonScanner code - - Use a closure instead of (*eugh*) an array of gpointers and casting - to void*. - - Also, use the Slice allocator for the ScannerKey structs. - - json-glib/json-scanner.c | 42 ++++++++++++++++++++---------------------- - 1 file changed, 20 insertions(+), 22 deletions(-) - -commit 42f7800c5b1c30ff187fc824a9bb39565033488e -Author: Emmanuele Bassi -Date: Fri Feb 29 16:01:48 2008 +0000 - - Update JsonParser to fix compilation - - JsonParser now uses JsonScanner, the internal copy of GScanner. - - json-glib/json-parser.c | 33 +++++++++++++++++---------------- - 1 file changed, 17 insertions(+), 16 deletions(-) - -commit 314f24fd0c8c6b024c93b1d8d275f9049ef22951 -Author: Emmanuele Bassi -Date: Fri Feb 29 16:00:55 2008 +0000 - - Completely internalize the JsonScanner - - Rename all the API and the data types to the Json namespace, so we can - use the internal copy instead of GScanner. - - json-glib/json-scanner.c | 639 ++++++++++++++++++++++++----------------------- - json-glib/json-scanner.h | 6 +- - 2 files changed, 328 insertions(+), 317 deletions(-) - -commit 65708000ab02d0a4080b662bb409ac4b79101488 -Author: Emmanuele Bassi -Date: Fri Feb 29 16:00:30 2008 +0000 - - Add JsonScanner to the build - - json-glib/Makefile.am | 2 ++ - 1 file changed, 2 insertions(+) - -commit 8e27ac27a9b22361296564d740301c2c49b387f8 -Author: Emmanuele Bassi -Date: Fri Feb 29 15:59:57 2008 +0000 - - Bump up autotools requirements - - Do not require an ancient version of automake, and settle for one slightly - less ancient. - - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit a475b0896d5760c893a099c9411f9790e5c492ba -Author: Emmanuele Bassi -Date: Fri Feb 29 12:24:14 2008 +0000 - - Update the JsonScanner default configuration - - json-glib/json-scanner.c | 84 +++++++++++++++++++++--------------------------- - 1 file changed, 36 insertions(+), 48 deletions(-) - -commit 10ac1734b326700257ef318d9a2000c538b5cd38 -Author: Emmanuele Bassi -Date: Fri Feb 29 12:22:02 2008 +0000 - - Use JsonScanner API into JsonParser - - Rename the GScanner function calls into JsonScanner, to see what we - actually need to have public. - - Also, remove the configuration: JsonScanner will provide us with one. - - json-glib/json-parser.c | 127 +++++++++++++++++------------------------------- - 1 file changed, 44 insertions(+), 83 deletions(-) - -commit 4a4095c360fc29f766e8baba3529a78b6d736b19 -Author: Emmanuele Bassi -Date: Fri Feb 29 12:21:20 2008 +0000 - - Add json-scanner.h to the exported headers - - json-glib/json-glib.h | 1 + - 1 file changed, 1 insertion(+) - -commit 469a22e4f1fac6b4fd8110823322b7fbfa9b6552 -Author: Emmanuele Bassi -Date: Fri Feb 29 12:13:54 2008 +0000 - - Include JsonScanner into JsonParser - - json-glib/json-parser.c | 1 + - 1 file changed, 1 insertion(+) - -commit 8537549a5a65f3111a4436b69499664c167b1534 -Author: Emmanuele Bassi -Date: Fri Feb 29 12:10:16 2008 +0000 - - Move JsonTokenType into JsonScanner - - The GTokenType extension enumeration belongs with the tokenizer. - - json-glib/json-parser.h | 15 ++------------- - 1 file changed, 2 insertions(+), 13 deletions(-) - -commit 1ddd45d36a3a25aa86a95c60e0c29e83687971bd -Author: Emmanuele Bassi -Date: Fri Feb 29 12:06:19 2008 +0000 - - Copy GScanner into JSON-GLib as JsonScanner - - Instead of writing our tokenizer we can fork GScanner and make a - specialized version for JSON (as per RFC), luckily the licenses - are compatible (LGPLv2.1 with "any later" clause). - - GScanner does not support Unicode "\uNNNN" escaping and we need to - ensure UTF-8 strings as well. - - The API will mostly be the same, but the generic bits not used by - JsonParser will be hidden: this is, after all, a specialized - tokenizer. - - json-glib/json-scanner.c | 1809 ++++++++++++++++++++++++++++++++++++++++++++++ - json-glib/json-scanner.h | 167 +++++ - 2 files changed, 1976 insertions(+) - -commit 3a9ec8f1ca9bf525875c3fbfaf1ab2f3c708bf36 -Author: Emmanuele Bassi -Date: Tue Jan 29 19:13:15 2008 +0000 - - Update the JSON-GLib Vala bindings - - Add a dependencies file, so that valac can simply use the json-glib-1.0 - package and correcly chain up all the dependencies needed (at the moment, - only glib-2.0). - - Update the vapi file to match with the GLib bindings with regards to the - out length parameters and some weak pointers. The only way to properly - solve the weak assignments issue would be to make JsonNode, JsonObject - and JsonArray proper GObjects, or at least add reference counting to - JsonNode. Not going to happend in 0.6, but it's worth adding it to the - 1.0 roadmap. - - contrib/json-glib-1.0.deps | 1 + - contrib/json-glib-1.0.vapi | 14 +++++------ - contrib/json-test.vala | 62 ++++++++++++++++++++++------------------------ - 3 files changed, 38 insertions(+), 39 deletions(-) - -commit e8a59f086f43e5abd5414033ea8c9a886eb112ed -Author: Emmanuele Bassi -Date: Tue Jan 29 19:12:35 2008 +0000 - - Remove % from the pkg-config file rule - - Rules starting with '%' are a make-isms, and automake 1.10 complains a - lot about them. - - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit b6963328f3d8d8e85ca0b21f9bdeca77b5611019 -Author: Emmanuele Bassi -Date: Tue Jan 29 18:19:16 2008 +0000 - - Remove json_parser_peek_root from the gtk-doc sections - - The json_parser_peek_root() function has been removed, and so we do not - its symbol in the json-glib-sections.txt file anymore. - - doc/reference/json-glib-sections.txt | 1 - - 1 file changed, 1 deletion(-) - -commit 48079c2f580171235eecc298b0193022a67e0b79 -Author: Emmanuele Bassi -Date: Tue Jan 29 18:18:01 2008 +0000 - - Update after the JsonParser::get_root change - - Do not free the root node returned by the get_root() method in the - JSON-GObject API and in the JsonParser tests. - - json-glib/json-gobject.c | 4 +--- - tests/test-01.c | 2 +- - tests/test-02.c | 2 -- - tests/test-03.c | 2 -- - 4 files changed, 2 insertions(+), 8 deletions(-) - -commit a86a300fdc256ad4270881cf9b7b97367cd87c87 -Author: Emmanuele Bassi -Date: Tue Jan 29 18:14:49 2008 +0000 - - Revert JsonParser::get_root semantics - - The get_root() method should not return a copy of the parsed node: it is - up to the developer copying it, if it needs to be kept around across multiple - parsing runs. - - This commit reverts the 0b6b09c0 commit, by removing the peek_root() method - and restoring the previous get_root() method behaviour. - - json-glib/json-parser.c | 26 ++------------------------ - json-glib/json-parser.h | 1 - - 2 files changed, 2 insertions(+), 25 deletions(-) - -commit 9a167068edcde51b50a15bab4ee8623994eb9c04 -Author: Emmanuele Bassi -Date: Mon Jan 28 11:02:30 2008 +0000 - - Use the normalized member name in has_member - - The json_object_has_member() used the passed in member name, instead of - the correctly normalized one. - - json-glib/json-object.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit f2f08d282ac6bc69ba9029d065979b1332abd5a5 -Author: Emmanuele Bassi -Date: Sun Jan 27 21:26:51 2008 +0000 - - Extract the parser state clearing into its own function - - The JsonParser object clears its state upon starting the parsing sequence - or during the instance destruction process. It's worth moving the free - and unref calls into their own function to be called by the load_from_data() - and dispose methods. As further optimisation, inlining them should be - worth as well. - - json-glib/json-parser.c | 51 +++++++++++++++++++++++++++++-------------------- - 1 file changed, 30 insertions(+), 21 deletions(-) - -commit 629d4a54913c578d7b612f10d9b04addc8e0c7fb -Author: Emmanuele Bassi -Date: Tue Dec 25 21:44:03 2007 +0000 - - Wrap config.h include with conditionals - - Including the autotools generated config.h should always be conditional - on the HAVE_CONFIG_H definitions. - - json-glib/json-array.c | 2 ++ - json-glib/json-generator.c | 2 ++ - json-glib/json-gobject.c | 2 ++ - json-glib/json-node.c | 3 +++ - json-glib/json-object.c | 2 ++ - 5 files changed, 11 insertions(+) - -commit e172e9ccec88999e7d8433df08d8d92568537cf7 -Author: Emmanuele Bassi -Date: Tue Dec 25 21:41:44 2007 +0000 - - Kill off a few indirections - - Use an intermediary pointer to avoid a lot of pointer dereferences - - json-glib/json-parser.c | 25 ++++++++++++++----------- - 1 file changed, 14 insertions(+), 11 deletions(-) - -commit 61a6a144a2182946be4fb975d05e1c26d814c323 -Author: Emmanuele Bassi -Date: Tue Dec 25 11:55:36 2007 +0000 - - Some miscellaneous fixes to the Vala bindings - - Expose the properties as members and remove the accessor methods in case - it's obvious that they are just function proxies. - - Also, start binding the basic GObject API, even though no serializable - support is ready, yet. - - contrib/json-glib-1.0.vapi | 21 ++++++++++-- - contrib/json-object.vala | 10 ++++-- - contrib/json-test.vala | 81 +++++++++++++++++++++++++++++++++------------- - 3 files changed, 85 insertions(+), 27 deletions(-) - -commit 8ec0c93715f6f43e4829a6f3ac534f9ec05e0363 -Author: Emmanuele Bassi -Date: Tue Dec 25 11:53:04 2007 +0000 - - Provide a default implementation of JsonSerializable - - The JsonSerializable interface can provide a default implementation, using - the powers of GTypeInterface. This means that classes implementing the - interface can opt to implement both, either or none of the JsonSerializable - methods, and still be able to retain some basic functionality for the methods - they decide not to implement. - - json-glib/json-gobject.c | 208 +++++++++++++++++++++++++++-------------------- - 1 file changed, 120 insertions(+), 88 deletions(-) - -commit 5bb6dd7b77dcd0d1996f484990223287d2144ff3 -Author: Emmanuele Bassi -Date: Tue Dec 25 11:51:20 2007 +0000 - - Plug a leak when loading a new buffer with the same parser - - When the same JsonParser loads a different buffer it needs to clear out the - current state; this means clearing the variable_name string it saves when - the passed JSON stream is a JavaScript assignment. - - json-glib/json-parser.c | 2 ++ - 1 file changed, 2 insertions(+) - -commit a90a842f269314c4423de9d84d03391a8efbd7b5 -Author: Emmanuele Bassi -Date: Tue Dec 25 11:49:20 2007 +0000 - - Use gssize for the buffer length parameter - - Since we allow a negative value, meaning "take the whole string", for the - length parameter, when need a signed size_t. This also fixes the bug where - we implicitly always computed the buffer length and discarded the passed - length parameter. - - json-glib/json-parser.c | 10 +++++----- - json-glib/json-parser.h | 2 +- - 2 files changed, 6 insertions(+), 6 deletions(-) - -commit 7229b9bf0bd15c6c1e5b695f8e291218a041ab45 -Author: Emmanuele Bassi -Date: Tue Dec 25 11:47:10 2007 +0000 - - Initialise to zero when creating/copying a JsonNode - - Avoid feeding garbage to the callers by using g_slice_new0(). - - json-glib/json-node.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -commit ba7282dd23e2980203208cb73942535bfefa5906 -Author: Emmanuele Bassi -Date: Tue Dec 25 11:45:56 2007 +0000 - - Do not leak the intermediate strings when generating JSON - - Found this very dumb leak while using Valgrind. - - json-glib/json-generator.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -commit 193aca9aabbfc3db8e1faca0a65b19ac7ba96341 -Author: Emmanuele Bassi -Date: Tue Dec 25 11:44:18 2007 +0000 - - Do not free the pointer to the boxed type we get when serialising - - The pointer returned by g_value_get_boxed() is just a pointer to the internal - copy inside GValue, and it's not ours to free, as Valgrind gently pointed - out. - - tests/test-07.c | 2 -- - 1 file changed, 2 deletions(-) - -commit a6fae2d61b1cfefa742574761edc19c8d6f702f5 -Author: Emmanuele Bassi -Date: Thu Nov 22 16:00:35 2007 +0000 - - Add a simple Vala serialization example - - We don't provide the Serializable interface at the moment, because it - is too much C-oriented. This example shows how to serialize a class in - Vala to a JSON string. - - contrib/json-object.vala | 40 ++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 40 insertions(+) - -commit ea6cc8756f70d488eae128e4a01f63ce2766cc3a -Author: Emmanuele Bassi -Date: Thu Nov 22 15:59:25 2007 +0000 - - Omit the lenght argument now that we provide a default - - contrib/json-test.vala | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 9492f3439dd491bb5afadfe6b2bd49a72ec9bb1e -Author: Emmanuele Bassi -Date: Thu Nov 22 15:58:23 2007 +0000 - - Fix the Vala bindings - - Miscellaneous fixes for the Vala bindings of JSON-GLib: - * add missing return values for a couple of methods - * decorate the Object and Array constructors with their C names - * correctly transfer the ownership when adding members/elements - * add the non-null value marker for strings - * provide default values for the length argument in from_data()/to_data() - - contrib/json-glib-1.0.vapi | 20 +++++++++++--------- - 1 file changed, 11 insertions(+), 9 deletions(-) - -commit a255b4f5eb8769c444a9ac3a4cc7404fccd44ee3 -Author: Emmanuele Bassi -Date: Thu Nov 22 00:01:37 2007 +0000 - - Recurse into the contrib directory only if Vala is available - - If Vala is not available then there's no point in getting into the - contrib directory. This might change in the future, so we already - have the HAVE_VALA conditional for the Makefiles. - - Makefile.am | 8 +++++++- - configure.ac | 3 +++ - 2 files changed, 10 insertions(+), 1 deletion(-) - -commit aa8911ca4d63bfb3dd34997f9a745d70d12673af -Author: Emmanuele Bassi -Date: Wed Nov 21 20:44:08 2007 +0000 - - Update the test case for the Vala bindings - - contrib/json-test.vala | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 7083e9e6733611b5313f0708c4b93b9726ef26d0 -Author: Emmanuele Bassi -Date: Wed Nov 21 20:43:35 2007 +0000 - - Wrap the newly added API in the Vala bindings - - Add the Json.Object.dup_member() and Json.Array.dup_element() functions. - Also, export the JSON_NODE_TYPE() macro as Json.Node.type() method. - - contrib/json-glib-1.0.vapi | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -commit 9d4588e97a88960a4dd6a28debb3cb0f8d75f098 -Author: Emmanuele Bassi -Date: Wed Nov 21 20:42:07 2007 +0000 - - Add symbols of the newly committed API - - doc/reference/json-glib-sections.txt | 3 +++ - 1 file changed, 3 insertions(+) - -commit cf2eceeb69ccbda4f2ff583ee7869c7fd3cda603 -Author: Emmanuele Bassi -Date: Wed Nov 21 20:41:42 2007 +0000 - - Add API to retrieve copies of the nodes inside objects and arrays - - Getting copies of the nodes might work better for high level languages - binding the JSON-GLib API, because they can manage the lifetime of the - returned values using their own rules. - - json-glib/json-array.c | 29 +++++++++++++++++++++++++++++ - json-glib/json-object.c | 29 +++++++++++++++++++++++++++++ - json-glib/json-types.h | 4 ++++ - 3 files changed, 62 insertions(+) - -commit 5a4a8761af0562fbee8e1a56ce1771a20c1ad8e3 -Author: Emmanuele Bassi -Date: Wed Nov 21 20:07:12 2007 +0000 - - Fix leaks in the test suite - - Dispose the root node when using the JsonParser and JsonGenerator - objects after the change in sematics for their accessors. - - tests/test-01.c | 2 +- - tests/test-02.c | 2 ++ - tests/test-03.c | 2 ++ - tests/test-04.c | 8 ++++++++ - tests/test-05.c | 6 ++++++ - 5 files changed, 19 insertions(+), 1 deletion(-) - -commit ac699263493e09eeb203f9bf88c0a8296f9e4a8f -Author: Emmanuele Bassi -Date: Wed Nov 21 20:06:06 2007 +0000 - - Free the root node obtained using json_parser_get_root() - - Update json_construct_gobject() to the change of behaviour in the - root node getter function of JsonParser. - - json-glib/json-gobject.c | 2 ++ - 1 file changed, 2 insertions(+) - -commit 0b6b09c0fe2fdd21b18593192e7213d1b0098f12 -Author: Emmanuele Bassi -Date: Wed Nov 21 20:05:07 2007 +0000 - - Change json_parser_get_root() semantics - - The json_parser_get_root() returns a pointer to the root node. This does - not conform to the API naming convention inherited from GLib, where - functions returning an internal pointer are called "peek" and function - returning a copy are called "get". - - Thus, json_parser_get_root() will now return a copy of the root node and - it is left to the developer to free the returned JsonNode. - - A function returning the pointer has also been added, and it's called - json_parser_peek_root(). - - json-glib/json-parser.c | 26 ++++++++++++++++++++++++-- - json-glib/json-parser.h | 2 ++ - 2 files changed, 26 insertions(+), 2 deletions(-) - -commit 5f110dc5ad338497c95418b9ad1b267c95fb8ded -Author: Emmanuele Bassi -Date: Wed Nov 21 18:39:04 2007 +0000 - - Add JSON-GLib Vala bindings - - Add bindings for the basic JSON-GLib API. GObject API will arrive later. - - Makefile.am | 2 +- - configure.ac | 12 +++++ - contrib/Makefile.am | 4 ++ - contrib/json-glib-1.0.vapi | 118 +++++++++++++++++++++++++++++++++++++++++++++ - contrib/json-test.vala | 87 +++++++++++++++++++++++++++++++++ - 5 files changed, 222 insertions(+), 1 deletion(-) - -commit 557a60b4e0f1fd6fc0fa79efc60f9bfd777e0670 -Author: Emmanuele Bassi -Date: Wed Nov 21 14:52:15 2007 +0000 - - Use a unicode character for the indent-char property of JsonGenerator - - The indent character should be any Unicode character available instead - of a generic char. - - json-glib/json-generator.c | 16 ++++++++-------- - tests/test-05.c | 6 +++++- - 2 files changed, 13 insertions(+), 9 deletions(-) - -commit 5fc37f8f2a1594821623419f75ceaa4b95fe07cf -Author: Emmanuele Bassi -Date: Wed Nov 21 01:39:00 2007 +0000 - - Add the indent-char property to JsonGenerator - - The JsonGenerator:indent-char can be used to control the character that - indents the lines when pretty printing. - - json-glib/json-generator.c | 54 ++++++++++++++++++++++++++++++++++------------ - 1 file changed, 40 insertions(+), 14 deletions(-) - -commit 58133b51152ca76b8cb5c93b5991f9b1a565e9a9 -Author: Emmanuele Bassi -Date: Wed Nov 21 01:20:20 2007 +0000 - - Use G_TYPE_DOUBLE when dumping a value. - - JsonNode of type value for floating point numbers is G_TYPE_DOUBLE - and not G_TYPE_FLOAT anymore. - - json-glib/json-generator.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 80006db7bcea2bd8c44a648a64ba3da6a05a6fd1 -Author: Emmanuele Bassi -Date: Tue Nov 20 18:30:42 2007 +0000 - - Test correct deserialization of enum values - - Update the GObject deserialization test suite to check for the correct - deserialization of the enum/flags values. - - tests/test-08.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++------- - 1 file changed, 53 insertions(+), 7 deletions(-) - -commit 1110e098fa879abf7f67f24af2a1b736ce359dd6 -Author: Emmanuele Bassi -Date: Tue Nov 20 18:20:33 2007 +0000 - - Allow deserialization of strings into enums/flags - - If the target value is a G_TYPE_ENUM or a G_TYPE_FLAGS we can effectively - deserialize a string into the corresponding value (or bit mask) using - the introspection API for the GEnum and GFlags types. - - This code is taken from ClutterScript and it was adapted from GtkBuilder. - - json-glib/json-gobject.c | 170 +++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 170 insertions(+) - -commit 2674ce68e574cebeca147944cf748b41fbe27507 -Author: Emmanuele Bassi -Date: Tue Nov 13 11:34:05 2007 +0000 - - Bump up to 0.5.0 - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit c1547eb3aba6f09b3ce4c23bd66a798e03b35a34 -Author: Emmanuele Bassi -Date: Tue Nov 13 11:29:19 2007 +0000 - - Bump up to 0.4.0 - - NEWS | 9 +++++++++ - configure.ac | 2 +- - 2 files changed, 10 insertions(+), 1 deletion(-) - -commit 03325e108e40d5deba979852ee402d7d6579ac81 -Author: Emmanuele Bassi -Date: Tue Nov 13 11:20:34 2007 +0000 - - Fix variable shadowing for distcheck - - json-glib/json-parser.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit afeec9b40468d289351c78007b5122ff716bb977 -Author: Emmanuele Bassi -Date: Tue Nov 13 11:16:51 2007 +0000 - - Add 0.4 symbols index - - doc/reference/json-glib-docs.sgml | 4 ++++ - 1 file changed, 4 insertions(+) - -commit 32023e03ca9c976e66b9af949d4aea36e1d4d874 -Author: Emmanuele Bassi -Date: Tue Nov 13 10:59:14 2007 +0000 - - Change "responsible" to "asked" in the (de)serialization functions docs - - We provide fallbacks in case a JsonSerializable object does not translate - a property into a JSON object member and vice versa. - - json-glib/json-gobject.c | 15 ++++++++------- - 1 file changed, 8 insertions(+), 7 deletions(-) - -commit c669a28d37795be68f3a51e9353f6f9d8e695a52 -Author: Emmanuele Bassi -Date: Tue Nov 13 10:55:23 2007 +0000 - - Add new symbols to the documentation - - doc/reference/json-glib-sections.txt | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -commit b83a2bfa96885837ca48bacb6492fd68a2b5b564 -Merge: 1f9b3e5 198ed83 -Author: Emmanuele Bassi -Date: Tue Nov 13 10:51:58 2007 +0000 - - Merge branch 'gobject-deserialize' into work - -commit 198ed839424dc7791d22dede152f4d7abc16a8b2 -Author: Emmanuele Bassi -Date: Tue Nov 13 10:51:31 2007 +0000 - - Use the fallback value-to-node generator even for serializables - - To avoid reimplementing the same code all over again, if the implementation - of the serialize_property virtual function of JsonSerializable returns NULL - we will fall back to the simple value-to-node generator we provide for - non-serializable classes. - - json-glib/json-gobject.c | 17 +++++++++++------ - tests/test-07.c | 13 +------------ - 2 files changed, 12 insertions(+), 18 deletions(-) - -commit 10e937a68bd802a4f5948d900aa2201344cfc138 -Author: Emmanuele Bassi -Date: Tue Nov 13 10:46:02 2007 +0000 - - Add test unit for the GObject deserialization - - .gitignore | 2 + - tests/Makefile.am | 4 +- - tests/test-08.c | 291 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 296 insertions(+), 1 deletion(-) - -commit 7b93db7ad996b29a6c576db33803029dc94e16fc -Author: Emmanuele Bassi -Date: Tue Nov 13 10:45:23 2007 +0000 - - Fix a couple of dumb typos in the GObject deserialization code - - We need to skip if the CONSTRUCT_ONLY flag is set, not unset. We also need - to copy the value from the JSON node into the target GValue, not the other - way around. - - json-glib/json-gobject.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -commit 9e61004365982017bfe9b76889e2a7d1a0320350 -Author: Emmanuele Bassi -Date: Tue Nov 13 10:11:34 2007 +0000 - - Update git ignore file - - .gitignore | 2 ++ - 1 file changed, 2 insertions(+) - -commit 4b496c7d906c81dceafe6a5f442b55b6e161f762 -Author: Emmanuele Bassi -Date: Tue Nov 13 10:11:00 2007 +0000 - - Add node-to-property simple fallback parser for deserialization - - The fallback parser for json_construct_gobject() is invoked if the GType - does not implement the JsonSerializable interface, or if the interface - was not handling the property. - - It will natively convert integers, booleans, strings and double precision - floating point values; it also handles string vectors in form of arrays. - - json-glib/json-gobject.c | 94 +++++++++++++++++++++++++++++++++++++++++++----- - 1 file changed, 85 insertions(+), 9 deletions(-) - -commit a7c39c910e08093ee0d0723685005623f26b9eae -Author: Emmanuele Bassi -Date: Tue Nov 13 09:28:57 2007 +0000 - - Add the JsonGenerator:root property - - JsonGenerator now has a :root property, so it can be constructed using - just g_object_new(): - - generator = g_object_new (JSON_TYPE_GENERATOR, - "pretty", TRUE, - "indent", 4, - "root", node, - NULL); - - This means that the root node is copied inside the generator, instead of - just taking ownership (it was quite confusing). The documentation now - clearly states what happens, and that you can safely free the node after - feeding it to the JsonGenerator. - - json-glib/json-generator.c | 30 ++++++++++++++++++++++++++++-- - 1 file changed, 28 insertions(+), 2 deletions(-) - -commit 6132d7325c33e26740b4c955d8ccbe53fd817cd8 -Author: Emmanuele Bassi -Date: Tue Nov 13 09:26:02 2007 +0000 - - Fix member name in json_node_get_value_type() - - JsonNode payload is inside a union. - - json-glib/json-node.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit f051b948714e4928a7d7f903e891639ce4ba82fd -Author: Emmanuele Bassi -Date: Tue Nov 13 09:17:22 2007 +0000 - - Add a GType for JsonNode - - We need a GType for nodes if we want to add JsonNode properties or signal - marshallers to a GObject class. We could use pointers, but we'd loose type - safety, so it's a no-no. - - json-glib/json-node.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ - json-glib/json-types.h | 8 ++++++-- - 2 files changed, 54 insertions(+), 2 deletions(-) - -commit 1f9b3e50282f8aa4a421c83ad596f6186ef82ec9 -Author: Emmanuele Bassi -Date: Sat Nov 10 15:12:20 2007 +0000 - - When parsing a full assignment, also swallow any trailing semi-colon - - There's no end to web developers insanity when they can twist and turn a - perfectly simple and elegant notation into something that allows lazyness - and breakage. - - json-glib/json-parser.c | 12 +++++++++++- - tests/test-02.c | 1 + - 2 files changed, 12 insertions(+), 1 deletion(-) - -commit 261d05a4cdcc1f64824615cdc81b4b467d0a5f57 -Author: Emmanuele Bassi -Date: Sat Nov 10 02:15:44 2007 +0000 - - Add support for parsing assignments - - Some JSON web APIs return a full JavaScript assignment instead of just - the data structure (and I'm looking at you, Tumblr). This is done in clear - violation of the grammar published in the RFC 4627, and it's evidently - done because most web developers are too lazy for doing a - - var foo = eval('(' + text ')'); - - and want everything defined for them. JsonParser will blissfully ignore - the left-hand part of the assignment but, in the interest of the developer - who cares, will record: 1. that the parsed statement was in fact an - assignment and 2. the name of the variable used. - - The function json_parser_has_assignment() can be used to query both the - presence of an assignment and the variable name at the same time. - - doc/reference/json-glib-sections.txt | 1 + - json-glib/json-parser.c | 80 +++++++++++++++++++++++++++++++++++- - json-glib/json-parser.h | 5 +++ - tests/test-02.c | 5 +++ - 4 files changed, 89 insertions(+), 2 deletions(-) - -commit 45c697263364a975fd6a54373f999f2932436b6f -Author: Emmanuele Bassi -Date: Sat Nov 10 01:26:46 2007 +0000 - - Initial implementation of GObject deserialization function - - The json_construct_gobject() function takes a GType and a JSON data stream - and constructs a new instance for the given type. If the type is a - JsonSerializable, it will use the JsonSerializable interface for parsing - the JsonNodes of each object member. - - This is the initial implementation of the function: the JsonNode-to-GValue - fallback parser is just a stub. - - doc/reference/json-glib-sections.txt | 1 + - json-glib/json-gobject.c | 182 ++++++++++++++++++++++++++++++++--- - json-glib/json-gobject.h | 8 +- - 3 files changed, 177 insertions(+), 14 deletions(-) - -commit 4eade1089355ebcf0614d0cfbc9c441513b7d97a -Author: Emmanuele Bassi -Date: Mon Oct 29 22:23:36 2007 +0000 - - Fix objects test suite to match the arrays one - - tests/test-03.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -commit 3948d83795d68d665b8b969c08b6c40498eb2661 -Author: Emmanuele Bassi -Date: Mon Oct 29 22:23:07 2007 +0000 - - More sanity checks for objects - - Add a check for commas after complex data types inside object members. - - json-glib/json-parser.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -commit 6182457fa305a1f159e9009d3fbef42a93f2768e -Author: Emmanuele Bassi -Date: Mon Oct 29 22:17:44 2007 +0000 - - Fix the test suite for arrays - - Fix a typo in test number 7 (missing comma to separate the C strings) and - use G_TYPE_DOUBLE instead of G_TYPE_FLOAT for the floating point values. - - tests/test-02.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -commit 25cdc18be8acdad54561f919c5805ad4fa9b3ac9 -Author: Emmanuele Bassi -Date: Mon Oct 29 22:16:31 2007 +0000 - - Add more sanity checks to the parser - - Catch missing commas after an array element or an object member. - - json-glib/json-parser.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -commit 812422e4ed4df83374cdda6d94637448ab94dfef -Author: Emmanuele Bassi -Date: Mon Oct 29 18:18:34 2007 +0000 - - Backport fixes from Clutter trunk - - The copy of JSON-GLib in Clutter trunk has two fixes for the JsonParser - object: - - * support for negative numbers (ints and floats); - * correct parse error propagation - - which should make the JsonParser hopefully complete. - - json-glib/json-parser.c | 123 ++++++++++++++++++++++++++++++++++++++++-------- - 1 file changed, 103 insertions(+), 20 deletions(-) - -commit 72d007d865a822875dfa311698fb2d13f5d3df69 -Author: Emmanuele Bassi -Date: Mon Oct 29 18:16:24 2007 +0000 - - Check if the payload is set in json_node_free() - - Before calling json_object_unref() or json_array_unref() in json_node_free() - we need to check if the payload of JsonNode is set to avoid a critical. - - json-glib/json-node.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -commit 59a66484befba457eda2ee7a9540f2b33ff04031 -Author: Emmanuele Bassi -Date: Tue Oct 16 23:20:22 2007 +0100 - - Add test unit for the JsonSerializable interface - - This should have been done before relasing 0.2.0. Well, that's what - point releases are for. - - tests/Makefile.am | 4 +- - tests/test-07.c | 265 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 268 insertions(+), 1 deletion(-) - -commit 34515af7bb1d69317b9e52d0ced92beaf6770e7d -Author: Emmanuele Bassi -Date: Tue Oct 16 23:19:35 2007 +0100 - - We need the actual implementation of the JsonSerializable GType function - - A placeholder, while syntactically correct, won't do. - - json-glib/json-gobject.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -commit 0656c4bee8e14c375481c89a62f0e6e95be758ce -Author: Emmanuele Bassi -Date: Tue Oct 16 23:18:47 2007 +0100 - - Fix the compiler fixes - - This is what happens when you fix a compiler warning about a shadowing - variable and you don't run the test suite to check the results. - - json-glib/json-generator.c | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -commit 88794df33e08cb409f71d1aaf702cd509b600954 -Author: Emmanuele Bassi -Date: Tue Oct 16 19:53:27 2007 +0100 - - Bump up to 0.3.0 - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 0ce3bf30d84aedcf5f8f75e6c1112d91dcc1d654 -Author: Emmanuele Bassi -Date: Tue Oct 16 19:49:42 2007 +0100 - - Bump up to 0.2.0 - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 77248800533f3dabfb09dfa8ba32e3084ea62d5f -Author: Emmanuele Bassi -Date: Tue Oct 16 19:43:27 2007 +0100 - - Fix DISTCHECK configure flags - - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 70be36c97a8cd598af061eb9ac5a9a5852858682 -Author: Emmanuele Bassi -Date: Tue Oct 16 19:42:05 2007 +0100 - - Fix compilation errors with extra maintainer CFLAGS - - json-glib/json-array.c | 2 +- - json-glib/json-generator.c | 16 ++++++++-------- - json-glib/json-parser.c | 4 ++-- - 3 files changed, 11 insertions(+), 11 deletions(-) - -commit 57c39582818b8a6579fed327f5c6e2fc34e93694 -Author: Emmanuele Bassi -Date: Tue Oct 16 19:41:18 2007 +0100 - - Drop -Wextra from the maintainer CFLAGS - - Some autogenerated code caused -Werror to croak, so -Wextra has to go. - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 9c690da734ee4513f19841f93a08ae35bbaa65b1 -Author: Emmanuele Bassi -Date: Tue Oct 16 18:20:19 2007 +0100 - - Autogenerate the ChangeLog when disting - - Makefile.am | 5 +++++ - 1 file changed, 5 insertions(+) - -commit 95fc9c4fb5af82c766d2f4f515b361028bc348e7 -Author: Emmanuele Bassi -Date: Tue Oct 16 18:20:01 2007 +0100 - - Fix EXTRA_DIST files for distcheck - - json-glib/Makefile.am | 16 +++++++++------- - 1 file changed, 9 insertions(+), 7 deletions(-) - -commit 87a36b8a5e23f3cf80730627f9b89061934a5bbf -Author: Emmanuele Bassi -Date: Tue Oct 16 17:40:06 2007 +0100 - - Add the JsonSerializable interface - - The JsonSerializable interface allows implementations to override the - GObject-to-JSON serialization process, by providing two virtual methods - to control the (de)serialization of GObject properties. This way it's - possible to serialize GObjects with properties holding complex data types. - - doc/reference/json-glib-sections.txt | 15 +++ - json-glib/json-gobject.c | 188 +++++++++++++++++++++++++++++------ - json-glib/json-gobject.h | 51 ++++++++++ - json-glib/json-types.h | 1 + - 4 files changed, 224 insertions(+), 31 deletions(-) - -commit 85cb0f44c4c7297a75141999674f3eb0fdf6a308 -Author: Emmanuele Bassi -Date: Tue Oct 16 17:25:08 2007 +0100 - - Add a method for getting all the nodes from a JsonObject - - To map json_array_get_elements(), a json_object_get_values() method has - been added which returns the list of JsonNodes contained by a JsonObject. - - doc/reference/json-glib-sections.txt | 1 + - json-glib/json-object.c | 41 ++++++++++++++++++++++++++++++++++++ - json-glib/json-types.h | 1 + - 3 files changed, 43 insertions(+) - -commit 474ecf1cc6aae35b184edffc75fc8626c3f12f61 -Author: Emmanuele Bassi -Date: Tue Oct 16 16:40:57 2007 +0100 - - Add a note in the JsonObject documentation for the member name normalization - - json-glib/json-object.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -commit 93e26b94d9bb1909f3b16a4b0500f27660d7e621 -Author: Emmanuele Bassi -Date: Tue Oct 16 16:37:01 2007 +0100 - - Normalize every member name before using it - - Every member name is stored inside the internal hash table of JsonObject - using a normalized string: every delimiter found matching G_STR_DELIMITERS - is automatically transformed in an underscore ('_'). - - This means that "member-name" and "member_name" are completely equivalent - for a JsonObject. - - json-glib/json-object.c | 31 ++++++++++++++++++++++++++----- - 1 file changed, 26 insertions(+), 5 deletions(-) - -commit 73a7671dedfd3bb9bc1a8c197a68dcef90e627f7 -Author: Emmanuele Bassi -Date: Mon Oct 15 10:28:39 2007 +0100 - - Provide an internal g_hash_table_get_keys() and bump down GLib dependency - - Even though GLib 2.14 is now available, many systems still come out with - GLib 2.12. Since we are using just a single 2.14 function for retrieving - the members from a JsonObject, we can provide an internal version of that - function and hideit behind a pre-processor macro. - - configure.ac | 2 +- - json-glib/json-object.c | 25 +++++++++++++++++++++++++ - 2 files changed, 26 insertions(+), 1 deletion(-) - -commit 28928a2f1cbe83a2f1bf699c915daa6eca80f587 -Author: Emmanuele Bassi -Date: Mon Oct 15 10:25:09 2007 +0100 - - Add API for removing nodes from arrays and objects - - Write and document json_object_remove_member() and json_array_remove_element() - which can be used to remove a JsonNode from a JsonObject or a JsonArray - respectively. This way, the JsonObject and JsonArray are API-complete and - the object model can be manipulated in code. - - doc/reference/json-glib-sections.txt | 2 + - json-glib/json-array.c | 18 +++++ - json-glib/json-object.c | 17 +++++ - json-glib/json-types.h | 126 ++++++++++++++++++----------------- - 4 files changed, 102 insertions(+), 61 deletions(-) - -commit b3ecd6e2fbdd58250427f406c43d60b8cb8d2644 -Author: Emmanuele Bassi -Date: Wed Oct 10 12:03:59 2007 +0100 - - Parse bare root values - - If the root node contains just a bare value (true, false, null, fundamental - type) then it's still valid JSON. - - Also, use the commodity JsonNode API to avoid using values in the parser - code. - - json-glib/json-parser.c | 79 ++++++++++++++++++------------------------------- - 1 file changed, 29 insertions(+), 50 deletions(-) - -commit a7839a06da53d32eb372b4813e5883a04e1c36b7 -Author: Emmanuele Bassi -Date: Tue Oct 9 20:52:56 2007 +0100 - - Add the forgotten JsonGenerator type function - - doc/reference/json-glib.types | 1 + - 1 file changed, 1 insertion(+) - -commit daeef3345c3a7f3325cea8c945f0e1d814defcc1 -Author: Emmanuele Bassi -Date: Mon Oct 8 18:29:44 2007 +0100 - - Add json_node_dup_string() - - The newly added json_node_dup_string() is a convenience function for - getting a copy of the string contained inside a JsonNode. - - doc/reference/json-glib-sections.txt | 1 + - json-glib/json-node.c | 20 ++++++++++++++++++++ - json-glib/json-types.h | 1 + - 3 files changed, 22 insertions(+) - -commit b12efcec57fff6e7637fc924fc50333b97eb2594 -Author: Emmanuele Bassi -Date: Sun Oct 7 00:47:32 2007 +0100 - - Fix documentation about the ownership of the nodes - - When adding a JsonNode to a JsonObject or a JsonArray, the containers - take ownership of the node. - - json-glib/json-array.c | 7 +++++-- - json-glib/json-object.c | 13 ++++++++----- - 2 files changed, 13 insertions(+), 7 deletions(-) - -commit bd5a60ca658257752993ccea47950b97cdc45246 -Author: Emmanuele Bassi -Date: Fri Oct 5 18:24:27 2007 +0100 - - Add convenience accessors for fundamental types in JsonNode - - This commit adds some convenience accessors for setting and - getting fundamental types in and from a JsonNode, to avoid - jumping through all the GValue hoops. - - doc/reference/json-glib-sections.txt | 8 ++ - json-glib/json-node.c | 201 +++++++++++++++++++++++++++++++++++ - json-glib/json-types.h | 12 +++ - 3 files changed, 221 insertions(+) - -commit ad95c8bf8e4103058d42ae71f47e6980e3b52c34 -Author: Emmanuele Bassi -Date: Fri Oct 5 18:23:15 2007 +0100 - - Use doubles when parsing, not floats - - GScanner advertise the floating point values as floats, but it really - uses doubles. Hence, we need to use G_TYPE_DOUBLE when saving the - parsed constants into a GValue. - - json-glib/json-parser.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -commit 220838e4e61c5a8fd9cf627da7309acf44fa82f0 -Author: Emmanuele Bassi -Date: Fri Oct 5 16:39:10 2007 +0100 - - Add line/position getters to JsonParser - - Add two methods to JsonParser to retrieve the currently parsed line - and position within that line. These methods works only while parsing, - so within the signal handlers and inside subclasses. - - doc/reference/json-glib-sections.txt | 6 +++++ - json-glib/json-parser.c | 46 +++++++++++++++++++++++++++++++++--- - json-glib/json-parser.h | 21 +++++++++------- - 3 files changed, 61 insertions(+), 12 deletions(-) - -commit ea5ee264a5b82fd1d09fa84ec81e17c4ea0d0c4a -Author: Emmanuele Bassi -Date: Fri Oct 5 15:13:21 2007 +0100 - - Document the newly added signals - - json-glib/json-parser.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++ - json-glib/json-parser.h | 10 +++++++- - 2 files changed, 73 insertions(+), 1 deletion(-) - -commit fa9d1676da588306be5a14bcab100ad58a41b799 -Author: Emmanuele Bassi -Date: Fri Oct 5 11:59:44 2007 +0100 - - Add more signals to the JsonParser class - - JsonParser should emit signals in critical places, like: start/end of - the parsing process; start and end of a JsonObject and a JsonArray; - completion of every member and element of a JsonObject and a JsonArray. - These signals require the addition of some custom marshaller. - - json-glib/json-marshal.list | 4 ++ - json-glib/json-parser.c | 118 ++++++++++++++++++++++++++++++++++++++++++-- - json-glib/json-parser.h | 25 ++++++++-- - 3 files changed, 141 insertions(+), 6 deletions(-) - -commit aa2b31234f7cfac63b870e8d9d74e682b3121d4a -Author: Emmanuele Bassi -Date: Fri Oct 5 11:57:53 2007 +0100 - - Implement the GType functions for JsonObject and JsonArray - - The type functions for the JsonObject and JsonArray types were declared, - albeit with the wrong return value, but not implemented. This commit - fixed the return value and implements them. - - JsonObject and JsonArray are boxed types because we don't need them to - be GObjects (no signals, no inheritance and their implementation must be - completely opaque for the developer). - - json-glib/json-array.c | 13 +++++++++++++ - json-glib/json-object.c | 13 +++++++++++++ - json-glib/json-types.h | 4 ++-- - 3 files changed, 28 insertions(+), 2 deletions(-) - -commit bd41854505f47d2176ea4cfba8083ce998c482cc -Author: Emmanuele Bassi -Date: Tue Oct 2 12:13:23 2007 +0100 - - Document the GObject integration API into the API reference - - doc/reference/json-glib-docs.sgml | 6 ++++++ - doc/reference/json-glib-sections.txt | 6 ++++++ - 2 files changed, 12 insertions(+) - -commit cea3f69f2cde1cb4e6ea9242f6014b31864ad80f -Author: Emmanuele Bassi -Date: Tue Oct 2 12:12:49 2007 +0100 - - Add test case for GObject integration - - .gitignore | 2 + - tests/Makefile.am | 4 +- - tests/test-06.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 159 insertions(+), 1 deletion(-) - -commit 3666613e47b66d67a28bc06c6dcf678fe97eae50 -Author: Emmanuele Bassi -Date: Tue Oct 2 12:11:55 2007 +0100 - - Add GObject serialization support for JSON-GLib - - This commit adds json-gobject.h and json_serialize_gobject() to - JSON-GLib, to serialize a GObject instance into a JSON data stream. - - .gitignore | 1 + - json-glib/Makefile.am | 2 + - json-glib/json-gobject.c | 169 +++++++++++++++++++++++++++++++++++++++++++++++ - json-glib/json-gobject.h | 33 +++++++++ - 4 files changed, 205 insertions(+) - -commit 8398253c76cf5dda23891b49b1aaa49e57d95a8d -Author: Emmanuele Bassi -Date: Tue Oct 2 10:03:00 2007 +0100 - - Complete the tests suite with the object deserialization - - Add a test unit for JSON object generation using JsonGenerator. The - empty, simple (1-depth) and complex (nested object and array) cases - are exercised. - - The complex object generation is taken from the RFC 4627, Examples - section. - - .gitignore | 2 + - tests/Makefile.am | 4 +- - tests/test-05.c | 217 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 222 insertions(+), 1 deletion(-) - -commit 2b25dbfa802f9af6e76fbe72140b687535cae8e5 -Author: Emmanuele Bassi -Date: Tue Oct 2 08:07:56 2007 +0100 - - Add objects support - - JsonGenerator can now create objects and array-nested objects, with and without - pretty printing. The test suite has been updated accordingly. - - json-glib/json-generator.c | 125 +++++++++++++++++++++++++++++++++++++++++++-- - tests/test-04.c | 68 ++++++++++++++++++++++++ - 2 files changed, 190 insertions(+), 3 deletions(-) - -commit 326cdead6f1c7b1bbaae0961d28bfe5ca3af0a1a -Author: Emmanuele Bassi -Date: Mon Oct 1 23:07:18 2007 +0100 - - Add nested arrays support - - JsonGenerator now supports nested arrays, both with and without pretty - printing. The tests suite has been updated accordingly. - - json-glib/json-generator.c | 10 ++++++++ - tests/test-04.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 71 insertions(+) - -commit 6f4dd6b154a150e8b4221800b61f85e5c4277d1b -Author: Emmanuele Bassi -Date: Mon Oct 1 22:58:04 2007 +0100 - - Simple arrays generation - - JsonGenerator now can create simple arrays, with "pretty" enabled and disabled. - Simple arrays are just one-level, value-only arrays. - - The test unit has been updated to exercise this new feature. - - json-glib/json-generator.c | 160 +++++++++++++++++++++++++++++++++++++++++++-- - tests/test-04.c | 86 ++++++++++++++++++++++-- - 2 files changed, 234 insertions(+), 12 deletions(-) - -commit 7f0232eaab0af434e2e086c83b68395146e410f9 -Author: Emmanuele Bassi -Date: Mon Oct 1 22:22:12 2007 +0100 - - Update list of git ignored files - - .gitignore | 5 +++++ - 1 file changed, 5 insertions(+) - -commit 47b34271f989cb5f2ba01a633d003adb6052cbd1 -Author: Emmanuele Bassi -Date: Mon Oct 1 22:20:23 2007 +0100 - - Add initial test unit for the JsonGenerator object - - tests/Makefile.am | 4 +++- - tests/test-04.c | 29 +++++++++++++++++++++++++++++ - 2 files changed, 32 insertions(+), 1 deletion(-) - -commit 8edb4ef3232428ac9e548ae6c1dfa2328bf7198c -Author: Emmanuele Bassi -Date: Mon Oct 1 22:19:28 2007 +0100 - - Add missing json-generator.h header - - json-glib/json-glib.h | 1 + - 1 file changed, 1 insertion(+) - -commit f09acae8e0d6ceba5d13de75551491835a7e71de -Author: Emmanuele Bassi -Date: Mon Oct 1 19:49:43 2007 +0100 - - Document the new public functions - - Now that we moved the constructors and setters for the JSON data types into - the public symbols we need to document them to get back to 100% doc coverage. - - doc/reference/json-glib-sections.txt | 26 +++++++++++- - json-glib/json-array.c | 22 ++++++++++ - json-glib/json-node.c | 78 ++++++++++++++++++++++++++++++++++++ - json-glib/json-object.c | 15 +++++++ - json-glib/json-types.h | 2 + - 5 files changed, 141 insertions(+), 2 deletions(-) - -commit 228a5e4efe65995778847f48d2be43f3df988e10 -Author: Emmanuele Bassi -Date: Mon Oct 1 18:01:20 2007 +0100 - - Move data types ctors and setters into the public headers - - Now that we are providing a generator class we need to provide the - constructors and setters for JsonNode, JsonObject and JsonArray. This - also means that the json-private.h header is now useless, so we can - remove it from the build and repository. - - json-glib/Makefile.am | 2 +- - json-glib/json-array.c | 1 - - json-glib/json-generator.c | 1 - - json-glib/json-node.c | 1 - - json-glib/json-object.c | 1 - - json-glib/json-parser.c | 1 - - json-glib/json-private.h | 35 ----------------------------------- - json-glib/json-types.h | 38 +++++++++++++++++++++++++++++++------- - 8 files changed, 32 insertions(+), 48 deletions(-) - -commit bfa60e9ef9da71e3c0d171f81cd08e8eac749061 -Author: Emmanuele Bassi -Date: Mon Oct 1 17:48:34 2007 +0100 - - Add stub class for JsonGenerator - - JsonGenerator is an object that creates JSON data streams from a data - model tree. This commit adds the JsonGenerator class to the build and - API reference. - - doc/reference/json-glib-docs.sgml | 1 + - doc/reference/json-glib-sections.txt | 25 ++++ - json-glib/Makefile.am | 2 + - json-glib/json-generator.c | 255 +++++++++++++++++++++++++++++++++++ - json-glib/json-generator.h | 82 +++++++++++ - 5 files changed, 365 insertions(+) - -commit 41849494890f1f51bc7c4429f0ee7b5d168da302 -Author: Emmanuele Bassi -Date: Mon Oct 1 16:37:14 2007 +0100 - - Fix ids inside the main documentation index - - doc/reference/json-glib-docs.sgml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit c3f8ea960ef7f8733969d9fb0f71531bc7449a16 -Author: Emmanuele Bassi -Date: Mon Oct 1 16:25:47 2007 +0100 - - Complete API reference of JSON-GLib - - With this commit, we reach 100% coverage. - - json-glib/json-parser.h | 19 +++++++++++++++++++ - json-glib/json-types.h | 20 ++++++++++++++++++++ - 2 files changed, 39 insertions(+) - -commit 2211e4e60b90b92d868c9b5f6b61e133d2435b4d -Author: Emmanuele Bassi -Date: Mon Oct 1 16:25:11 2007 +0100 - - Implement json_node_get_parent() - - It seems that the parent accessor fell through. This commit implements - the declared json_node_get_parent() function. - - json-glib/json-node.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -commit 29feafc236f888021b817fdfe0cfe685f5e3b65e -Author: Emmanuele Bassi -Date: Mon Oct 1 16:16:15 2007 +0100 - - Add licensing informations to the source code - - json-glib/json-array.c | 29 +++++++++++++++++++++++++ - json-glib/json-node.c | 52 ++++++++++++++++++++++++++++++++++++++------- - json-glib/json-object.c | 34 +++++++++++++++++++++++++---- - json-glib/json-parser.c | 28 ++++++++++++++++++++++-- - json-glib/json-parser.h | 19 +++++++++++++++++ - json-glib/json-types.h | 35 ++++++++++++++++++++++++++++++ - json-glib/json-version.h.in | 19 +++++++++++++++++ - 7 files changed, 202 insertions(+), 14 deletions(-) - -commit 6eb1a5e94957d3555e7de5f6744a8777cd89efaf -Author: Emmanuele Bassi -Date: Mon Oct 1 15:55:04 2007 +0100 - - Fix a stray newline in the documentation - - doc/reference/json-glib-docs.sgml | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -commit a5ecf553082816a1ce6c4354ff23e8addf8d9c80 -Author: Emmanuele Bassi -Date: Mon Oct 1 15:52:54 2007 +0100 - - Update git ignore file - - .gitignore | 22 ++++++++++++++++++++++ - 1 file changed, 22 insertions(+) - -commit 9bdee4c01adef7e9d7ed18d5dd94671057f1459b -Author: Emmanuele Bassi -Date: Mon Oct 1 15:50:49 2007 +0100 - - Add API reference for JSON-GLib - - Use gtk-doc to build the various bits and pieces of the API reference - for JSON-GLib. - - doc/Makefile.am | 1 + - doc/reference/Makefile.am | 2 +- - doc/reference/json-glib-docs.sgml | 153 +++++++++++++++++++++++++++++++++++ - doc/reference/json-glib-sections.txt | 92 +++++++++++++++++++++ - doc/reference/json-glib.types | 1 + - json-glib/json-node.c | 2 +- - json-glib/json-version.h.in | 8 ++ - 7 files changed, 257 insertions(+), 2 deletions(-) - -commit 2e362edd46f11f2fd1fa327877372b902b70c280 -Author: Emmanuele Bassi -Date: Mon Oct 1 14:57:39 2007 +0100 - - Add more test cases for the object parsing - - tests/test-03.c | 3 +++ - 1 file changed, 3 insertions(+) - -commit 79423943a8588a8ed6d5bedbc038255111897261 -Author: Emmanuele Bassi -Date: Mon Oct 1 14:57:25 2007 +0100 - - Swallow the comma earlier in the parser - - The comma is used as a member and element separator, so it should be - swallowed by the parser as soon as possible. - - json-glib/json-parser.c | 25 ++++++++++++++++--------- - 1 file changed, 16 insertions(+), 9 deletions(-) - -commit e711b883dba88d68b6986d87f14a06361cf54be7 -Author: Emmanuele Bassi -Date: Mon Oct 1 14:46:31 2007 +0100 - - Update gitignore - - .gitignore | 3 +++ - 1 file changed, 3 insertions(+) - -commit 591989c80b16fe68bdd79bcc7759a4249fdaf129 -Author: Emmanuele Bassi -Date: Mon Oct 1 14:45:42 2007 +0100 - - Test object parsing - - Add JSON object parsing testing to the test units. - - tests/Makefile.am | 8 ++- - tests/test-02.c | 73 +++++++++++++++++-- - tests/test-03.c | 211 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 285 insertions(+), 7 deletions(-) - -commit ba3a6e6afed0d4fe3853b8e7400516557a20f775 -Author: Emmanuele Bassi -Date: Mon Oct 1 14:44:51 2007 +0100 - - Add JSON object parsing - - This commit completes the JsonParser class by adding the ability to - parse JSON objects, either alone or inside arrays. JsonParser is now - a JSON parser. - - json-glib/json-parser.c | 235 ++++++++++++++++++++++++++++++++++++++++++++---- - 1 file changed, 220 insertions(+), 15 deletions(-) - -commit fd89ad3d7127e68df06345fa52863e73ada93689 -Author: Emmanuele Bassi -Date: Mon Oct 1 14:43:12 2007 +0100 - - Declare json_node_take_object() and json_node_take_array() - - JsonParser uses the take variant of JsonNode setters for objects and arrays - since it's the one creating the objects. This way, we avoid leaks and the - extra complexity of unreffing the newly created complex containers after - setting them into the JsonNodes. - - json-glib/json-private.h | 4 ++++ - 1 file changed, 4 insertions(+) - -commit b2ee98f9b0baac019540020e177189b6a3780b83 -Author: Emmanuele Bassi -Date: Mon Oct 1 13:01:32 2007 +0100 - - Chain up nodes to their parent - - When parsing a JSON node we need to correctly set up the parent node - of the newly created ones. - - json-glib/json-parser.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -commit 88b11be5eec1da769328e93189bc2f3316c9cd0a -Author: Emmanuele Bassi -Date: Mon Oct 1 12:57:46 2007 +0100 - - Add JsonNode, a generic container for JSON types - - This huge commit removes JsonData and adds JsonNode, the generic container - for fundamental and complex data types extracted from a JSON stream. The - contents of a JsonNode can be extracted from it in form of a GValue for - fundamental types (integers, floats, strings, booleans) or in form of - JsonObject and JsonArray objects. JsonObject and JsonArray now accept - JsonNodes instead of GValues. - - The JsonParser object builds the data model tree when parsing a JSON stream; - the tree can be recursed by getting the root node and walking it using the - GValue API for the fundamental types and the objects/arrays API for complex - types. - - The API has been updated and the tests now recurse through the generated - data model tree. - - json-glib/Makefile.am | 2 +- - json-glib/json-array.c | 64 +++++------ - json-glib/json-data.c | 93 ---------------- - json-glib/json-node.c | 269 +++++++++++++++++++++++++++++++++++++++++++++++ - json-glib/json-object.c | 44 +++----- - json-glib/json-parser.c | 87 +++++++++++---- - json-glib/json-parser.h | 2 +- - json-glib/json-private.h | 38 ++++--- - json-glib/json-types.h | 59 ++++++----- - tests/test-01.c | 2 +- - tests/test-02.c | 112 +++++++++++++++++++- - 11 files changed, 535 insertions(+), 237 deletions(-) - -commit c11ebd32f73a1e21d6097bf9eba8e12f7e35497a -Author: Emmanuele Bassi -Date: Fri Sep 21 21:07:12 2007 +0100 - - Add JsonData, an opaque container for JSON data types - - JsonData is like GValue, but it stores JSON data types (objects and - arrays) and allows us to retrieve them safely. This way we can actually - know the type of the objects returned by the parser and by the other - object walking functions. - - json-glib/Makefile.am | 1 + - json-glib/json-data.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++ - json-glib/json-private.h | 7 ++++ - json-glib/json-types.h | 53 ++++++++++++++++++--------- - 4 files changed, 138 insertions(+), 16 deletions(-) - -commit f661c7e1a04c2fb198279030c9dd812f357240a3 -Author: Emmanuele Bassi -Date: Fri Sep 21 21:05:12 2007 +0100 - - Skip the token check after parsing a nested array - - Since there cannot be any other token except for the comma, which we - eat anyway, there's no point in going through the switch() check - after we have finished parsing a nested array. - - json-glib/json-parser.c | 2 ++ - 1 file changed, 2 insertions(+) - -commit ae3a66e6a90b6cfd71cb8c41c0d752fd1b0a67cc -Author: Emmanuele Bassi -Date: Fri Sep 21 20:15:52 2007 +0100 - - Update gitignore file - - .gitignore | 7 +++++++ - 1 file changed, 7 insertions(+) - -commit 7875c5f573fdc6c2a39e958d2032f4c26d1f91ff -Author: Emmanuele Bassi -Date: Fri Sep 21 20:14:49 2007 +0100 - - Start the test suite - - Add the first two test units: - - - test-01.c: build/empty test unit - - test-02.c: array test unit - - Every test unit must follow the same naming policy, so we can add - a run-tests script later on and a pre-commit hook to invoke it - and catch regressions automagically. - - tests/Makefile.am | 12 ++++++++++++ - tests/test-01.c | 31 +++++++++++++++++++++++++++++++ - tests/test-02.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 95 insertions(+) - -commit 81ad2e5c61db2391d2d98a6b5df1247e3abf16ec -Author: Emmanuele Bassi -Date: Fri Sep 21 20:12:02 2007 +0100 - - Parse JSON arrays - - Add the array parsing code. The parser identifies and builds nested - levels of arrays, but the storage is not quite right. That is a problem - of the parser object, though, so this can be considered a first raw - pass at the problem. - - json-glib/json-parser.c | 114 ++++++++++++++++++++++++++++++++++++++++-------- - 1 file changed, 97 insertions(+), 17 deletions(-) - -commit b433703db6722785e33f968830e23c5806230ac2 -Author: Emmanuele Bassi -Date: Fri Sep 21 12:16:15 2007 +0100 - - Add RFC 4627 text, where JSON is defined - - doc/rfc4627.txt | 563 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 563 insertions(+) - -commit c77af0ec13e3e11cdb784510e6a75125bb8ef667 -Author: Emmanuele Bassi -Date: Fri Sep 21 12:08:09 2007 +0100 - - Top-levels in JSON can only be objects or arrays - - JSON is an object serialisation format (thanks, RFC4627), so it can - only express objects and/or arrays as top-levels. - - json-glib/json-parser.c | 24 ++++++++++++++---------- - 1 file changed, 14 insertions(+), 10 deletions(-) - -commit 0ff67fb63c5e021b88d6a3d17c5e34dc95ac2676 -Author: Emmanuele Bassi -Date: Fri Sep 21 11:58:00 2007 +0100 - - Update gitignore file - - .gitignore | 4 ++++ - 1 file changed, 4 insertions(+) - -commit d98d8c3d245192abe6ec5a531c9d0d678b07d061 -Author: Emmanuele Bassi -Date: Fri Sep 21 11:54:40 2007 +0100 - - Add stubs to JsonParser for actually parsing a JSON stream - - Initial commit for getting JsonParser to work. Because GScanner API - is old and mostly sucks, we need to do some magic with signals. - - If json_parser_load_from_data() fails, the passed GError will be set - with a JSON_PARSER_ERROR code and message; unfortunately, we can't get - the nice error message out of GScanner. We can, however, override the - default message handler and make it emit a signal on the JsonParser - object. - - So, to make a long story short: the GError passed to the load_from_data() - method is filled with a short error message; the *real* error message - is passed to the ::error signal handlers so they can actually use it. - - GScanner should really get a way to retrieve the last error message. - - json-glib/json-parser.c | 266 +++++++++++++++++++++++++++++++++++++++++++++++- - json-glib/json-parser.h | 28 ++++- - 2 files changed, 290 insertions(+), 4 deletions(-) - -commit cd1040e2fb6f6da50aaf72017746b33234c39704 -Author: Emmanuele Bassi -Date: Fri Sep 21 11:08:06 2007 +0100 - - Add marshallers generation to the build - - Use glib-genmarshal to generate the marshallers we need. For the - time being, we just need a (void,pointer). - - json-glib/Makefile.am | 30 +++++++++++++++++++++++++----- - json-glib/json-marshal.list | 1 + - 2 files changed, 26 insertions(+), 5 deletions(-) - -commit 821ac3e602f936318f9a2c3b831f135408ca5d74 -Author: Emmanuele Bassi -Date: Thu Sep 20 20:41:09 2007 +0100 - - Add gitignore file - - .gitignore | 29 +++++++++++++++++++++++++++++ - 1 file changed, 29 insertions(+) - -commit c5bfb22f964b8f1feecdc8fb29d8a74b36861d32 -Author: Emmanuele Bassi -Date: Thu Sep 20 17:33:28 2007 +0100 - - Initial import of JSON-GLib - - JSON-GLib is a JSON parser library written with GLib and GObject. - - JSON is the JavaScript Object Notation, and it's used to define objects - and object hierarchies in a human-readable way. - - AUTHORS | 1 + - COPYING | 504 ++++++++++++++++++++++++++++++++++++++ - ChangeLog | 6 + - Makefile.am | 15 ++ - NEWS | 0 - README | 39 +++ - autogen.sh | 4 + - configure.ac | 119 +++++++++ - doc/Makefile.am | 0 - doc/reference/Makefile.am | 82 +++++++ - doc/reference/json-glib-docs.sgml | 0 - doc/reference/version.xml.in | 1 + - json-glib.pc.in | 11 + - json-glib/Makefile.am | 52 ++++ - json-glib/json-array.c | 176 +++++++++++++ - json-glib/json-glib.h | 8 + - json-glib/json-object.c | 201 +++++++++++++++ - json-glib/json-parser.c | 152 ++++++++++++ - json-glib/json-parser.h | 57 +++++ - json-glib/json-private.h | 26 ++ - json-glib/json-types.h | 32 +++ - json-glib/json-version.h.in | 65 +++++ - tests/Makefile.am | 0 - 23 files changed, 1551 insertions(+) diff --git a/Makefile.am b/Makefile.am index d2dbe69..8a05190 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,15 @@ ACLOCAL_AMFLAGS = -I build/autotools -EXTRA_DIST = +EXTRA_DIST = \ + meson.build \ + meson_options.txt \ + doc/reference/meson.build \ + doc/reference/xml/meson.build \ + doc/reference/xml/gtkdocentities.ent.in \ + json-glib/meson.build \ + json-glib/tests/meson.build \ + po/meson.build \ + $() SUBDIRS = json-glib doc build po diff --git a/Makefile.in b/Makefile.in index ae7010b..828a823 100644 --- a/Makefile.in +++ b/Makefile.in @@ -407,7 +407,17 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I build/autotools -EXTRA_DIST = +EXTRA_DIST = \ + meson.build \ + meson_options.txt \ + doc/reference/meson.build \ + doc/reference/xml/meson.build \ + doc/reference/xml/gtkdocentities.ent.in \ + json-glib/meson.build \ + json-glib/tests/meson.build \ + po/meson.build \ + $() + SUBDIRS = json-glib doc build po DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man --enable-maintainer-flags --enable-introspection all: config.h @@ -646,7 +656,7 @@ distdir: $(DISTFILES) ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r "$(distdir)" dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz $(am__post_remove_distdir) dist-bzip2: distdir @@ -671,7 +681,7 @@ dist-shar: distdir @echo WARNING: "Support for shar distribution archives is" \ "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz $(am__post_remove_distdir) dist-zip: distdir @@ -689,7 +699,7 @@ dist dist-all: distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lz*) \ @@ -699,7 +709,7 @@ distcheck: dist *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac diff --git a/NEWS b/NEWS index 7b4cffe..d71c068 100644 --- a/NEWS +++ b/NEWS @@ -13,6 +13,10 @@ Overview of changes for 1.2 • Allow making JSON types optionally immutable, in order to allow efficient hashing and equality tests [Philip Withnal - #756121] • Improve the build under MSVC [Chun-wei Fan] +• Add Meson build system [Thibault Saunier - #773603] +• Support Visual Studio 2017 [Chun-wei Fan] +• Allow using G_DECLARE_INTERFACE with JsonSerializable +• Allow empty strings as JsonObject member names [Dr. David Alan Gilbert - #747279] Overview of changes for 1.0 ============================== diff --git a/aclocal.m4 b/aclocal.m4 index 06c0d02..8f7f346 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -21,7 +21,7 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -dnl serial 11 (pkg-config-0.29) +dnl serial 11 (pkg-config-0.29.1) dnl dnl Copyright © 2004 Scott James Remnant . dnl Copyright © 2012-2015 Dan Nicholson @@ -63,7 +63,7 @@ dnl dnl See the "Since" comment for each macro you use to see what version dnl of the macros you require. m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29]) +[m4_define([PKG_MACROS_VERSION], [0.29.1]) m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) ])dnl PKG_PREREQ diff --git a/build/Makefile-newvs.am b/build/Makefile-newvs.am index 97b2459..c36de59 100644 --- a/build/Makefile-newvs.am +++ b/build/Makefile-newvs.am @@ -9,9 +9,17 @@ # Author: Fan, Chun-wei # November 05, 2012 -# MSVC_VER_LONG: Long Version of Visual Studio (2012, 2013, 14 and so on) -# MSVC_VER: Short Version of Visual Studio (11 for 2012, 12 for 2013, 14 for 2015 and so on) -# MSVC_FORMAT_VER: Use 12 for MSVC 2012 through 2015 +# MSVC_VER_LONG: Long Version of target Visual Studio (2012, 2013, 14, 15 and so on) +# MSVC_VER: Short Version of target Visual Studio (11 for 2012, 12 for 2013, 14 for 2015, 15 for 2017) +# MSVC_TOOLSET: Use if target MSVC toolset is not in the form v$(MSVC_VER)0, meaning v$(MSVC_TOOLSET) + +if MSVC_BASE_NO_TOOLSET_SET +MSVC_BASE_TOOLSET = $(MSVC_BASE_VER)0 +endif + +if MSVC_NO_TOOLSET_SET +MSVC_TOOLSET = $(MSVC_VER)0 +endif %.sln: sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp @@ -25,12 +33,12 @@ %.vcxproj: if test -e $(top_srcdir)/build/win32/vs10/$@; then \ - sed 's/v100/v$(MSVC_VER)0/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ else \ - sed 's/v100/v$(MSVC_VER)0/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ fi -%.props: +%.props: $(top_builddir)/build/win32/vs10/Makefile if test -e $(top_srcdir)/build/win32/vs10/$@; then \ sed 's/10<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ else \ diff --git a/build/Makefile.msvcproj b/build/Makefile.msvcproj index 9449a5b..166d1d2 100644 --- a/build/Makefile.msvcproj +++ b/build/Makefile.msvcproj @@ -60,10 +60,19 @@ $(1).sourcefiles: $(top_builddir)/build/win32/vs9/$(1).vcproj $(1).vs10.sourcefiles: $(top_builddir)/build/win32/vs9/$(1).vcproj $(1).vs10.sourcefiles.filters: $(top_builddir)/build/win32/vs9/$(1).vcproj -$(top_builddir)/build/win32/vs9/$(1).vcproj: +$(top_builddir)/build/win32/vs9/$(1).vcproj: Makefile -$(RM) $(top_builddir)/build/win32/vs9/$(1).vcproj -$(RM) $(top_builddir)/build/win32/vs10/$(1).vcxproj -$(RM) $(top_builddir)/build/win32/vs10/$(1).vcxproj.filters + -$(RM) $(top_builddir)/build/win32/vs11/$(1).vcxproj + -$(RM) $(top_builddir)/build/win32/vs11/$(1).vcxproj.filters + -$(RM) $(top_builddir)/build/win32/vs12/$(1).vcxproj + -$(RM) $(top_builddir)/build/win32/vs12/$(1).vcxproj.filters + -$(RM) $(top_builddir)/build/win32/vs14/$(1).vcxproj + -$(RM) $(top_builddir)/build/win32/vs14/$(1).vcxproj.filters + -$(RM) $(top_builddir)/build/win32/vs15/$(1).vcxproj + -$(RM) $(top_builddir)/build/win32/vs15/$(1).vcxproj.filters + for F in $(_proj_files); do \ case $$$$F in \ @@ -87,7 +96,7 @@ $(top_builddir)/build/win32/vs9/$(1).vcproj: $(top_builddir)/build/win32/vs10/$(1).vs10.headers: $(top_builddir)/build/win32/vs9/$(1).headers -$(top_builddir)/build/win32/vs9/$(1).headers: +$(top_builddir)/build/win32/vs9/$(1).headers: Makefile -$(RM) $(top_builddir)/build/win32/vs9/$(1).headers -$(RM) $(top_builddir)/build/win32/vs10/$(1).vs10.headers diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am index ae561b3..f7d49a3 100644 --- a/build/win32/Makefile.am +++ b/build/win32/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = vs9 vs10 vs11 vs12 vs14 +SUBDIRS = vs9 vs10 vs11 vs12 vs14 vs15 if HAVE_INTROSPECTION GENERATED_ITEMS = \ @@ -24,6 +24,9 @@ EXTRA_DIST = \ detectenv-msvc.mak \ introspection-msvc.mak \ json-glib-introspection-msvc.mak \ + jsonglibpc.py \ + pc_base.py \ + replace.py \ $(GENERATED_ITEMS) DISTCLEANFILES = $(GENERATED_ITEMS) diff --git a/build/win32/Makefile.in b/build/win32/Makefile.in index 818945f..88bd19b 100644 --- a/build/win32/Makefile.in +++ b/build/win32/Makefile.in @@ -380,7 +380,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = vs9 vs10 vs11 vs12 vs14 +SUBDIRS = vs9 vs10 vs11 vs12 vs14 vs15 @HAVE_INTROSPECTION_FALSE@GENERATED_ITEMS = @HAVE_INTROSPECTION_TRUE@GENERATED_ITEMS = \ @HAVE_INTROSPECTION_TRUE@ introspection.body.mak \ @@ -392,6 +392,9 @@ EXTRA_DIST = \ detectenv-msvc.mak \ introspection-msvc.mak \ json-glib-introspection-msvc.mak \ + jsonglibpc.py \ + pc_base.py \ + replace.py \ $(GENERATED_ITEMS) DISTCLEANFILES = $(GENERATED_ITEMS) diff --git a/build/win32/config.h.win32 b/build/win32/config.h.win32 index fe26a84..8aadbd8 100644 --- a/build/win32/config.h.win32 +++ b/build/win32/config.h.win32 @@ -78,7 +78,7 @@ #define PACKAGE_NAME "json-glib" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "json-glib 1.2.2" +#define PACKAGE_STRING "json-glib 1.2.4" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "json-glib" @@ -87,7 +87,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.2.2" +#define PACKAGE_VERSION "1.2.4" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 diff --git a/build/win32/detectenv-msvc.mak b/build/win32/detectenv-msvc.mak index 61f979d..6fd96cc 100644 --- a/build/win32/detectenv-msvc.mak +++ b/build/win32/detectenv-msvc.mak @@ -40,8 +40,10 @@ VSVER = 10 VSVER = 11 !elseif $(VCVERSION) > 1799 && $(VCVERSION) < 1900 VSVER = 12 -!elseif $(VCVERSION) > 1899 && $(VCVERSION) < 2000 +!elseif $(VCVERSION) > 1899 && $(VCVERSION) < 1910 VSVER = 14 +!elseif $(VCVERSION) > 1909 && $(VCVERSION) < 2000 +VSVER = 15 !else VSVER = 0 !endif diff --git a/build/win32/jsonglibpc.py b/build/win32/jsonglibpc.py new file mode 100644 index 0000000..33f4bb4 --- /dev/null +++ b/build/win32/jsonglibpc.py @@ -0,0 +1,27 @@ +#!/usr/bin/python +# +# Utility script to generate .pc files for JSON-GLib +# for Visual Studio builds, to be used for +# building introspection files + +# Author: Fan, Chun-wei +# Date: March 10, 2016 + +import os +import sys + +from replace import replace_multi +from pc_base import BasePCItems + +def main(argv): + base_pc = BasePCItems() + + base_pc.setup(argv) + + # Generate json-glib.pc + replace_multi(base_pc.top_srcdir + '/json-glib/json-glib.pc.in', + base_pc.srcdir + '/json-glib.pc', + base_pc.base_replace_items) + +if __name__ == '__main__': + sys.exit(main(sys.argv)) diff --git a/build/win32/pc_base.py b/build/win32/pc_base.py new file mode 100644 index 0000000..587ba83 --- /dev/null +++ b/build/win32/pc_base.py @@ -0,0 +1,124 @@ +#!/usr/bin/python +# +# Simple utility script to generate the basic info +# needed in a .pc (pkg-config) file, used especially +# for introspection purposes + +# This can be used in various projects where +# there is the need to generate .pc files, +# and is copied from GLib's $(srcroot)/build/win32 + +# Author: Fan, Chun-wei +# Date: March 10, 2016 + +import os +import sys +import argparse + +class BasePCItems: + def __init__(self): + self.base_replace_items = {} + self.exec_prefix = '' + self.includedir = '' + self.libdir = '' + self.prefix = '' + self.srcdir = os.path.dirname(__file__) + self.top_srcdir = self.srcdir + '\\..\\..' + self.version = '' + + def setup(self, argv, parser=None): + if parser is None: + parser = argparse.ArgumentParser(description='Setup basic .pc file info') + parser.add_argument('--prefix', help='prefix of the installed library', + required=True) + parser.add_argument('--exec-prefix', + help='prefix of the installed programs, \ + if different from the prefix') + parser.add_argument('--includedir', + help='includedir of the installed library, \ + if different from ${prefix}/include') + parser.add_argument('--libdir', + help='libdir of the installed library, \ + if different from ${prefix}/lib') + parser.add_argument('--version', help='Version of the package', + required=True) + args = parser.parse_args() + + self.version = args.version + + # check whether the prefix and exec_prefix are valid + if not os.path.exists(args.prefix): + raise SystemExit('Specified prefix \'%s\' is invalid' % args.prefix) + + # use absolute paths for prefix + self.prefix = os.path.abspath(args.prefix).replace('\\','/') + + # check and setup the exec_prefix + if getattr(args, 'exec_prefix', None) is None: + exec_prefix_use_shorthand = True + self.exec_prefix = '${prefix}' + else: + if args.exec_prefix.startswith('${prefix}'): + exec_prefix_use_shorthand = True + input_exec_prefix = args.prefix + args.exec_prefix[len('${prefix}'):] + else: + exec_prefix_use_shorthand = False + input_exec_prefix = args.exec_prefix + if not os.path.exists(input_exec_prefix): + raise SystemExit('Specified exec_prefix \'%s\' is invalid' % + args.exec_prefix) + if exec_prefix_use_shorthand is True: + self.exec_prefix = args.exec_prefix.replace('\\','/') + else: + self.exec_prefix = os.path.abspath(input_exec_prefix).replace('\\','/') + + # check and setup the includedir + if getattr(args, 'includedir', None) is None: + self.includedir = '${prefix}/include' + else: + if args.includedir.startswith('${prefix}'): + includedir_use_shorthand = True + input_includedir = args.prefix + args.includedir[len('${prefix}'):] + else: + if args.includedir.startswith('${exec_prefix}'): + includedir_use_shorthand = True + input_includedir = input_exec_prefix + args.includedir[len('${exec_prefix}'):] + else: + includedir_use_shorthand = False + input_includedir = args.includedir + if not os.path.exists(input_includedir): + raise SystemExit('Specified includedir \'%s\' is invalid' % + args.includedir) + if includedir_use_shorthand is True: + self.includedir = args.includedir.replace('\\','/') + else: + self.includedir = os.path.abspath(input_includedir).replace('\\','/') + + # check and setup the libdir + if getattr(args, 'libdir', None) is None: + self.libdir = '${prefix}/lib' + else: + if args.libdir.startswith('${prefix}'): + libdir_use_shorthand = True + input_libdir = args.prefix + args.libdir[len('${prefix}'):] + else: + if args.libdir.startswith('${exec_prefix}'): + libdir_use_shorthand = True + input_libdir = input_exec_prefix + args.libdir[len('${exec_prefix}'):] + else: + libdir_use_shorthand = False + input_libdir = args.libdir + if not os.path.exists(input_libdir): + raise SystemExit('Specified libdir \'%s\' is invalid' % + args.libdir) + if libdir_use_shorthand is True: + self.libdir = args.libdir.replace('\\','/') + else: + self.libdir = os.path.abspath(input_libdir).replace('\\','/') + + # setup dictionary for replacing items in *.pc.in + self.base_replace_items.update({'@VERSION@': self.version}) + self.base_replace_items.update({'@prefix@': self.prefix}) + self.base_replace_items.update({'@exec_prefix@': self.exec_prefix}) + self.base_replace_items.update({'@libdir@': self.libdir}) + self.base_replace_items.update({'@includedir@': self.includedir}) diff --git a/build/win32/replace.py b/build/win32/replace.py new file mode 100644 index 0000000..a81bab9 --- /dev/null +++ b/build/win32/replace.py @@ -0,0 +1,109 @@ +#!/usr/bin/python +# +# Simple utility script to manipulate +# certain types of strings in a file + +# This can be used in various projects where +# there is the need to replace strings in files, +# and is copied from GLib's $(srcroot)/build/win32 + +# Author: Fan, Chun-wei +# Date: September 03, 2014 + +import os +import sys +import re +import string +import argparse + +valid_actions = ['remove-prefix', + 'replace-var', + 'replace-str', + 'remove-str'] + +def replace_multi(src, dest, replace_items): + with open(src, 'r') as s: + with open(dest, 'w') as d: + for line in s: + replace_dict = dict((re.escape(key), value) \ + for key, value in replace_items.items()) + replace_pattern = re.compile("|".join(replace_dict.keys())) + d.write(replace_pattern.sub(lambda m: \ + replace_dict[re.escape(m.group(0))], line)) + +def replace(src, dest, instring, outstring): + replace_item = {instring: outstring} + replace_multi(src, dest, replace_item) + +def check_required_args(args, params): + for param in params: + if getattr(args, param, None) is None: + raise SystemExit('%s: error: --%s argument is required' % (__file__, param)) + +def warn_ignored_args(args, params): + for param in params: + if getattr(args, param, None) is not None: + print('%s: warning: --%s argument is ignored' % (__file__, param)) + +def main(argv): + + parser = argparse.ArgumentParser(description='Process strings in a file.') + parser.add_argument('-a', + '--action', + help='Action to carry out. Can be one of:\n' + 'remove-prefix\n' + 'replace-var\n' + 'replace-str\n' + 'remove-str', + choices=valid_actions) + parser.add_argument('-i', '--input', help='Input file') + parser.add_argument('-o', '--output', help='Output file') + parser.add_argument('--instring', help='String to replace or remove') + parser.add_argument('--var', help='Autotools variable name to replace') + parser.add_argument('--outstring', + help='New String to replace specified string or variable') + parser.add_argument('--removeprefix', help='Prefix of string to remove') + + args = parser.parse_args() + + input_string = '' + output_string = '' + + # We must have action, input, output for all operations + check_required_args(args, ['action','input','output']) + + # Build the arguments by the operation that is to be done, + # to be fed into replace() + + # Get rid of prefixes from a string + if args.action == 'remove-prefix': + check_required_args(args, ['instring','removeprefix']) + warn_ignored_args(args, ['outstring','var']) + input_string = args.removeprefix + args.instring + output_string = args.instring + + # Replace an m4-style variable (those surrounded by @...@) + if args.action == 'replace-var': + check_required_args(args, ['var','outstring']) + warn_ignored_args(args, ['instring','removeprefix']) + input_string = '@' + args.var + '@' + output_string = args.outstring + + # Replace a string + if args.action == 'replace-str': + check_required_args(args, ['instring','outstring']) + warn_ignored_args(args, ['var','removeprefix']) + input_string = args.instring + output_string = args.outstring + + # Remove a string + if args.action == 'remove-str': + check_required_args(args, ['instring']) + warn_ignored_args(args, ['var','outstring','removeprefix']) + input_string = args.instring + output_string = '' + + replace(args.input, args.output, input_string, output_string) + +if __name__ == '__main__': + sys.exit(main(sys.argv)) diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am index e0465ec..5e8b093 100644 --- a/build/win32/vs10/Makefile.am +++ b/build/win32/vs10/Makefile.am @@ -6,6 +6,10 @@ GENERATED_ITEMS = \ json-glib-install.props json-glib-install.props: $(top_srcdir)/build/win32/vs10/json-glib-install.propsin json-glib.vs10.headers + -$(RM) $(top_builddir)/build/win32/vs11/json-glib-install.props + -$(RM) $(top_builddir)/build/win32/vs12/json-glib-install.props + -$(RM) $(top_builddir)/build/win32/vs14/json-glib-install.props + -$(RM) $(top_builddir)/build/win32/vs15/json-glib-install.props $(CPP) -P - <$(top_srcdir)/build/win32/vs10/json-glib-install.propsin >$@ rm json-glib.vs10.headers @@ -32,6 +36,7 @@ EXTRA_DIST = \ gvariant.vcxproj \ gvariant.vcxproj.filters \ json-glib-install.vcxproj \ + json-glib-install.vcxproj.filters \ node.vcxproj \ node.vcxproj.filters \ object.vcxproj \ diff --git a/build/win32/vs10/Makefile.in b/build/win32/vs10/Makefile.in index 774bc59..a03ae5e 100644 --- a/build/win32/vs10/Makefile.in +++ b/build/win32/vs10/Makefile.in @@ -116,7 +116,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = json-glib-version-paths.props CONFIG_CLEAN_VPATH_FILES = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -138,7 +138,8 @@ am__can_run_installinfo = \ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -am__DIST_COMMON = $(srcdir)/Makefile.in +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(srcdir)/json-glib-version-paths.props.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -349,6 +350,7 @@ EXTRA_DIST = \ gvariant.vcxproj \ gvariant.vcxproj.filters \ json-glib-install.vcxproj \ + json-glib-install.vcxproj.filters \ node.vcxproj \ node.vcxproj.filters \ object.vcxproj \ @@ -404,6 +406,8 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +json-glib-version-paths.props: $(top_builddir)/config.status $(srcdir)/json-glib-version-paths.props.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -rm -f *.lo @@ -566,6 +570,10 @@ uninstall-am: json-glib-install.props: $(top_srcdir)/build/win32/vs10/json-glib-install.propsin json-glib.vs10.headers + -$(RM) $(top_builddir)/build/win32/vs11/json-glib-install.props + -$(RM) $(top_builddir)/build/win32/vs12/json-glib-install.props + -$(RM) $(top_builddir)/build/win32/vs14/json-glib-install.props + -$(RM) $(top_builddir)/build/win32/vs15/json-glib-install.props $(CPP) -P - <$(top_srcdir)/build/win32/vs10/json-glib-install.propsin >$@ rm json-glib.vs10.headers diff --git a/build/win32/vs10/json-glib-install.props b/build/win32/vs10/json-glib-install.props index 590a422..19a4799 100644 --- a/build/win32/vs10/json-glib-install.props +++ b/build/win32/vs10/json-glib-install.props @@ -5,8 +5,6 @@ $(SolutionDir)$(Configuration)\$(Platform)\bin - $(BinDir)\$(JsonGlibDllPrefix)json-glib(JsonGlibDllSuffix).dll - $(BinDir)\json-glib-format.exe;$(BinDir)\json-glib-validate.exe mkdir $(CopyDir) mkdir $(CopyDir)\bin @@ -30,7 +28,10 @@ copy ..\..\..\json-glib\json-version-macros.h $(CopyDir)\include\json-glib-1.0\j copy ..\..\..\json-glib\json-enum-types.h $(CopyDir)\include\json-glib-1.0\json-glib\json-enum-types.h copy ..\..\..\json-glib\json-version.h $(CopyDir)\include\json-glib-1.0\json-glib\json-version.h copy ..\..\..\json-glib\json-glib.h $(CopyDir)\include\json-glib-1.0\json-glib\json-glib.h - +if exist ..\json-glib.pc copy ..\json-glib.pc $(CopyDir)\lib\pkgconfig + + ..\json-glib.pc + if exist $(PythonPath)\python.exe ((if not exist $(CopyDir)\lib\pkgconfig mkdir $(CopyDir)\lib\pkgconfig) & ($(PythonPath)\python.exe ..\jsonglibpc.py --prefix=$(CopyDir) --version=$(JsonGlibMajorVersion).$(JsonGlibMinorVersion).$(JsonGlibMicroVersion))) <_PropertySheetDisplayName>jsonglibinstallprops @@ -39,14 +40,14 @@ copy ..\..\..\json-glib\json-glib.h $(CopyDir)\include\json-glib-1.0\json-glib\j $(BinDir) - - $(InstalledDlls) - - - $(InstalledBins) - $(JsonGlibDoInstall) + + $(JSONGLibPCFiles) + + + $(GenJSONGLibPC) + diff --git a/build/win32/vs10/json-glib-install.propsin b/build/win32/vs10/json-glib-install.propsin index 3f1be77..1bb5ca1 100644 --- a/build/win32/vs10/json-glib-install.propsin +++ b/build/win32/vs10/json-glib-install.propsin @@ -5,8 +5,6 @@ $(SolutionDir)$(Configuration)\$(Platform)\bin - $(BinDir)\$(JsonGlibDllPrefix)json-glib(JsonGlibDllSuffix).dll - $(BinDir)\json-glib-format.exe;$(BinDir)\json-glib-validate.exe mkdir $(CopyDir) mkdir $(CopyDir)\bin @@ -21,7 +19,11 @@ copy $(BinDir)\json-glib-*.pdb $(CopyDir)\bin mkdir $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib #include "json-glib.vs10.headers" - + +if exist ..\json-glib.pc copy ..\json-glib.pc $(CopyDir)\lib\pkgconfig + + ..\json-glib.pc + if exist $(PythonPath)\python.exe ((if not exist $(CopyDir)\lib\pkgconfig mkdir $(CopyDir)\lib\pkgconfig) & ($(PythonPath)\python.exe ..\jsonglibpc.py --prefix=$(CopyDir) --version=$(JsonGlibMajorVersion).$(JsonGlibMinorVersion).$(JsonGlibMicroVersion))) <_PropertySheetDisplayName>jsonglibinstallprops @@ -30,14 +32,14 @@ mkdir $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib $(BinDir) - - $(InstalledDlls) - - - $(InstalledBins) - $(JsonGlibDoInstall) + + $(JSONGLibPCFiles) + + + $(GenJSONGLibPC) + diff --git a/build/win32/vs10/json-glib-install.vcxproj b/build/win32/vs10/json-glib-install.vcxproj index 25551b6..9de6f0a 100644 --- a/build/win32/vs10/json-glib-install.vcxproj +++ b/build/win32/vs10/json-glib-install.vcxproj @@ -75,19 +75,23 @@ - - Installing Build Results... - $(JsonGlibDoInstall) - $(InstalledDlls);$(InstalledBins);%(Outputs) - Installing Build Results... - $(JsonGlibDoInstall) - $(InstalledDlls);$(InstalledBins);%(Outputs) - Installing Build Results... - $(JsonGlibDoInstall) - $(InstalledDlls);$(InstalledBins);%(Outputs) - Installing Build Results... - $(JsonGlibDoInstall) - $(InstalledDlls);$(InstalledBins);%(Outputs) + + Installing Build Results... + $(JSONGLibPCFiles) + $(JsonGlibDoInstall) + file_holder;%(Outputs) + Installing Build Results... + $(JSONGLibPCFiles) + $(JsonGlibDoInstall) + file_holder;%(Outputs) + + + Generating .pc file(s)... + $(GenJSONGLibPC) + $(JSONGLibPCFiles);%(Outputs) + Generating .pc file(s)... + $(GenJSONGLibPC) + $(JSONGLibPCFiles);%(Outputs) diff --git a/build/win32/vs10/json-glib-install.vcxproj.filters b/build/win32/vs10/json-glib-install.vcxproj.filters new file mode 100644 index 0000000..5f4846e --- /dev/null +++ b/build/win32/vs10/json-glib-install.vcxproj.filters @@ -0,0 +1,13 @@ + + + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + Resource Files + Resource Files + + diff --git a/build/win32/vs10/json-glib-version-paths.props b/build/win32/vs10/json-glib-version-paths.props index 0e0eca5..9483304 100644 --- a/build/win32/vs10/json-glib-version-paths.props +++ b/build/win32/vs10/json-glib-version-paths.props @@ -5,6 +5,9 @@ $(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform) $(GlibEtcInstallRoot) $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ + 1 + 2 + 4 1.0 lib -1.0-0 @@ -12,6 +15,7 @@ -1-vs$(VSVer) $(JsonGlibSeparateVSDllPrefix) $(JsonGlibSeparateVSDllSuffix) + c:\python34 <_PropertySheetDisplayName>jsonglibversionpathsprops @@ -26,6 +30,15 @@ $(CopyDir) + + $(JsonGlibMajorVersion) + + + $(JsonGlibMinorVersion) + + + $(JsonGlibMicroVersion) + $(ApiVersion) @@ -50,5 +63,8 @@ $(DefDir) + + $(PythonPath) + diff --git a/build/win32/vs10/json-glib-version-paths.props.in b/build/win32/vs10/json-glib-version-paths.props.in new file mode 100644 index 0000000..cde4328 --- /dev/null +++ b/build/win32/vs10/json-glib-version-paths.props.in @@ -0,0 +1,70 @@ + + + + 10 + $(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform) + $(GlibEtcInstallRoot) + $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ + @JSON_MAJOR_VERSION@ + @JSON_MINOR_VERSION@ + @JSON_MICRO_VERSION@ + 1.0 + lib + -1.0-0 + + -1-vs$(VSVer) + $(JsonGlibSeparateVSDllPrefix) + $(JsonGlibSeparateVSDllSuffix) + c:\python34 + + + <_PropertySheetDisplayName>jsonglibversionpathsprops + + + + $(VSVer) + + + $(GlibEtcInstallRoot) + + + $(CopyDir) + + + $(JsonGlibMajorVersion) + + + $(JsonGlibMinorVersion) + + + $(JsonGlibMicroVersion) + + + $(ApiVersion) + + + $(JsonGlibLibtoolCompatibleDllPrefix) + + + $(JsonGlibLibtoolCompatibleDllSuffix) + + + $(JsonGlibSeparateVSDllPrefix) + + + $(JsonGlibSeparateVSDllSuffix) + + + $(JsonGlibDllPrefix) + + + $(JsonGlibDllSuffix) + + + $(DefDir) + + + $(PythonPath) + + + diff --git a/build/win32/vs10/json-glib.vcxproj b/build/win32/vs10/json-glib.vcxproj index 3851a2b..07f7331 100644 --- a/build/win32/vs10/json-glib.vcxproj +++ b/build/win32/vs10/json-glib.vcxproj @@ -66,10 +66,8 @@ - true - true - false - true + true + false @@ -92,6 +90,7 @@ true Windows $(TargetDir)$(ProjectName)-$(ApiVersion).lib + $(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).pdb MachineX86 @@ -115,6 +114,7 @@ true Windows $(TargetDir)$(ProjectName)-$(ApiVersion).lib + $(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).pdb MachineX64 @@ -141,6 +141,7 @@ true true $(TargetDir)$(ProjectName)-$(ApiVersion).lib + $(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).pdb MachineX86 @@ -163,6 +164,7 @@ true true $(TargetDir)$(ProjectName)-$(ApiVersion).lib + $(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).pdb MachineX64 @@ -184,22 +186,15 @@ - - Copying config.h from config.h.win32... - $(CopyConfigH) - ..\..\..\config.h;%(Outputs) - Copying config.h from config.h.win32... - $(CopyConfigH) - ..\..\..\config.h;%(Outputs) - Copying config.h from config.h.win32... - $(CopyConfigH) - ..\..\..\config.h;%(Outputs) - Copying config.h from config.h.win32... - $(CopyConfigH) - ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) diff --git a/build/win32/vs10/json-glib.vcxproj.filters b/build/win32/vs10/json-glib.vcxproj.filters index f202a94..85fbf5f 100644 --- a/build/win32/vs10/json-glib.vcxproj.filters +++ b/build/win32/vs10/json-glib.vcxproj.filters @@ -32,7 +32,6 @@ Source Files Source Files Source Files - Source Files Resource Files diff --git a/build/win32/vs10/json-glib.vcxprojin b/build/win32/vs10/json-glib.vcxprojin index 28ef760..92fb8c9 100644 --- a/build/win32/vs10/json-glib.vcxprojin +++ b/build/win32/vs10/json-glib.vcxprojin @@ -66,10 +66,8 @@ - true - true - false - true + true + false @@ -92,6 +90,7 @@ true Windows $(TargetDir)$(ProjectName)-$(ApiVersion).lib + $(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).pdb MachineX86 @@ -115,6 +114,7 @@ true Windows $(TargetDir)$(ProjectName)-$(ApiVersion).lib + $(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).pdb MachineX64 @@ -141,6 +141,7 @@ true true $(TargetDir)$(ProjectName)-$(ApiVersion).lib + $(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).pdb MachineX86 @@ -163,6 +164,7 @@ true true $(TargetDir)$(ProjectName)-$(ApiVersion).lib + $(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).pdb MachineX64 @@ -171,18 +173,12 @@ - Copying config.h from config.h.win32... - $(CopyConfigH) - ..\..\..\config.h;%(Outputs) - Copying config.h from config.h.win32... - $(CopyConfigH) - ..\..\..\config.h;%(Outputs) - Copying config.h from config.h.win32... - $(CopyConfigH) - ..\..\..\config.h;%(Outputs) - Copying config.h from config.h.win32... - $(CopyConfigH) - ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) diff --git a/build/win32/vs11/Makefile.am b/build/win32/vs11/Makefile.am index fb8cb74..cc28057 100644 --- a/build/win32/vs11/Makefile.am +++ b/build/win32/vs11/Makefile.am @@ -23,6 +23,7 @@ EXTRA_DIST = \ gvariant.vcxproj \ gvariant.vcxproj.filters \ json-glib-install.vcxproj \ + json-glib-install.vcxproj.filters \ node.vcxproj \ node.vcxproj.filters \ object.vcxproj \ diff --git a/build/win32/vs11/Makefile.in b/build/win32/vs11/Makefile.in index ed5ade1..c682e13 100644 --- a/build/win32/vs11/Makefile.in +++ b/build/win32/vs11/Makefile.in @@ -25,9 +25,9 @@ # Author: Fan, Chun-wei # November 05, 2012 -# MSVC_VER_LONG: Long Version of Visual Studio (2012, 2013, 14 and so on) -# MSVC_VER: Short Version of Visual Studio (11 for 2012, 12 for 2013, 14 for 2015 and so on) -# MSVC_FORMAT_VER: Use 12 for MSVC 2012 through 2015 +# MSVC_VER_LONG: Long Version of target Visual Studio (2012, 2013, 14, 15 and so on) +# MSVC_VER: Short Version of target Visual Studio (11 for 2012, 12 for 2013, 14 for 2015, 15 for 2017) +# MSVC_TOOLSET: Use if target MSVC toolset is not in the form v$(MSVC_VER)0, meaning v$(MSVC_TOOLSET) VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -360,6 +360,7 @@ EXTRA_DIST = \ gvariant.vcxproj \ gvariant.vcxproj.filters \ json-glib-install.vcxproj \ + json-glib-install.vcxproj.filters \ node.vcxproj \ node.vcxproj.filters \ object.vcxproj \ @@ -385,6 +386,8 @@ MSVC_VER = 11 MSVC_FORMAT_VER = 12 MSVC_VER_LONG = 2012 DISTCLEANFILES = $(EXTRA_DIST) +@MSVC_BASE_NO_TOOLSET_SET_TRUE@MSVC_BASE_TOOLSET = $(MSVC_BASE_VER)0 +@MSVC_NO_TOOLSET_SET_TRUE@MSVC_TOOLSET = $(MSVC_VER)0 all: all-am .SUFFIXES: @@ -591,12 +594,12 @@ uninstall-am: %.vcxproj: if test -e $(top_srcdir)/build/win32/vs10/$@; then \ - sed 's/v100/v$(MSVC_VER)0/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ else \ - sed 's/v100/v$(MSVC_VER)0/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ fi -%.props: +%.props: $(top_builddir)/build/win32/vs10/Makefile if test -e $(top_srcdir)/build/win32/vs10/$@; then \ sed 's/10<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ else \ diff --git a/build/win32/vs11/json-glib-install.props b/build/win32/vs11/json-glib-install.props index 590a422..19a4799 100644 --- a/build/win32/vs11/json-glib-install.props +++ b/build/win32/vs11/json-glib-install.props @@ -5,8 +5,6 @@ $(SolutionDir)$(Configuration)\$(Platform)\bin - $(BinDir)\$(JsonGlibDllPrefix)json-glib(JsonGlibDllSuffix).dll - $(BinDir)\json-glib-format.exe;$(BinDir)\json-glib-validate.exe mkdir $(CopyDir) mkdir $(CopyDir)\bin @@ -30,7 +28,10 @@ copy ..\..\..\json-glib\json-version-macros.h $(CopyDir)\include\json-glib-1.0\j copy ..\..\..\json-glib\json-enum-types.h $(CopyDir)\include\json-glib-1.0\json-glib\json-enum-types.h copy ..\..\..\json-glib\json-version.h $(CopyDir)\include\json-glib-1.0\json-glib\json-version.h copy ..\..\..\json-glib\json-glib.h $(CopyDir)\include\json-glib-1.0\json-glib\json-glib.h - +if exist ..\json-glib.pc copy ..\json-glib.pc $(CopyDir)\lib\pkgconfig + + ..\json-glib.pc + if exist $(PythonPath)\python.exe ((if not exist $(CopyDir)\lib\pkgconfig mkdir $(CopyDir)\lib\pkgconfig) & ($(PythonPath)\python.exe ..\jsonglibpc.py --prefix=$(CopyDir) --version=$(JsonGlibMajorVersion).$(JsonGlibMinorVersion).$(JsonGlibMicroVersion))) <_PropertySheetDisplayName>jsonglibinstallprops @@ -39,14 +40,14 @@ copy ..\..\..\json-glib\json-glib.h $(CopyDir)\include\json-glib-1.0\json-glib\j $(BinDir) - - $(InstalledDlls) - - - $(InstalledBins) - $(JsonGlibDoInstall) + + $(JSONGLibPCFiles) + + + $(GenJSONGLibPC) + diff --git a/build/win32/vs11/json-glib-install.vcxproj b/build/win32/vs11/json-glib-install.vcxproj index e6bd0a1..4fc6922 100644 --- a/build/win32/vs11/json-glib-install.vcxproj +++ b/build/win32/vs11/json-glib-install.vcxproj @@ -75,19 +75,23 @@ - - Installing Build Results... - $(JsonGlibDoInstall) - $(InstalledDlls);$(InstalledBins);%(Outputs) - Installing Build Results... - $(JsonGlibDoInstall) - $(InstalledDlls);$(InstalledBins);%(Outputs) - Installing Build Results... - $(JsonGlibDoInstall) - $(InstalledDlls);$(InstalledBins);%(Outputs) - Installing Build Results... - $(JsonGlibDoInstall) - $(InstalledDlls);$(InstalledBins);%(Outputs) + + Installing Build Results... + $(JSONGLibPCFiles) + $(JsonGlibDoInstall) + file_holder;%(Outputs) + Installing Build Results... + $(JSONGLibPCFiles) + $(JsonGlibDoInstall) + file_holder;%(Outputs) + + + Generating .pc file(s)... + $(GenJSONGLibPC) + $(JSONGLibPCFiles);%(Outputs) + Generating .pc file(s)... + $(GenJSONGLibPC) + $(JSONGLibPCFiles);%(Outputs) diff --git a/build/win32/vs11/json-glib-install.vcxproj.filters b/build/win32/vs11/json-glib-install.vcxproj.filters new file mode 100644 index 0000000..5f4846e --- /dev/null +++ b/build/win32/vs11/json-glib-install.vcxproj.filters @@ -0,0 +1,13 @@ + + + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + Resource Files + Resource Files + + diff --git a/build/win32/vs11/json-glib-version-paths.props b/build/win32/vs11/json-glib-version-paths.props index 3e4f166..44496ac 100644 --- a/build/win32/vs11/json-glib-version-paths.props +++ b/build/win32/vs11/json-glib-version-paths.props @@ -5,6 +5,9 @@ $(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform) $(GlibEtcInstallRoot) $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ + 1 + 2 + 4 1.0 lib -1.0-0 @@ -12,6 +15,7 @@ -1-vs$(VSVer) $(JsonGlibSeparateVSDllPrefix) $(JsonGlibSeparateVSDllSuffix) + c:\python34 <_PropertySheetDisplayName>jsonglibversionpathsprops @@ -26,6 +30,15 @@ $(CopyDir) + + $(JsonGlibMajorVersion) + + + $(JsonGlibMinorVersion) + + + $(JsonGlibMicroVersion) + $(ApiVersion) @@ -50,5 +63,8 @@ $(DefDir) + + $(PythonPath) + diff --git a/build/win32/vs11/json-glib.vcxproj b/build/win32/vs11/json-glib.vcxproj index a2cdb45..a7d363c 100644 --- a/build/win32/vs11/json-glib.vcxproj +++ b/build/win32/vs11/json-glib.vcxproj @@ -66,10 +66,8 @@ - true - true - false - true + true + false @@ -92,6 +90,7 @@ true Windows $(TargetDir)$(ProjectName)-$(ApiVersion).lib + $(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).pdb MachineX86 @@ -115,6 +114,7 @@ true Windows $(TargetDir)$(ProjectName)-$(ApiVersion).lib + $(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).pdb MachineX64 @@ -141,6 +141,7 @@ true true $(TargetDir)$(ProjectName)-$(ApiVersion).lib + $(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).pdb MachineX86 @@ -163,6 +164,7 @@ true true $(TargetDir)$(ProjectName)-$(ApiVersion).lib + $(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).pdb MachineX64 @@ -184,22 +186,15 @@ - - Copying config.h from config.h.win32... - $(CopyConfigH) - ..\..\..\config.h;%(Outputs) - Copying config.h from config.h.win32... - $(CopyConfigH) - ..\..\..\config.h;%(Outputs) - Copying config.h from config.h.win32... - $(CopyConfigH) - ..\..\..\config.h;%(Outputs) - Copying config.h from config.h.win32... - $(CopyConfigH) - ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) diff --git a/build/win32/vs11/json-glib.vcxproj.filters b/build/win32/vs11/json-glib.vcxproj.filters index f202a94..85fbf5f 100644 --- a/build/win32/vs11/json-glib.vcxproj.filters +++ b/build/win32/vs11/json-glib.vcxproj.filters @@ -32,7 +32,6 @@ Source Files Source Files Source Files - Source Files Resource Files diff --git a/build/win32/vs12/Makefile.am b/build/win32/vs12/Makefile.am index 080ac32..80d7496 100644 --- a/build/win32/vs12/Makefile.am +++ b/build/win32/vs12/Makefile.am @@ -23,6 +23,7 @@ EXTRA_DIST = \ gvariant.vcxproj \ gvariant.vcxproj.filters \ json-glib-install.vcxproj \ + json-glib-install.vcxproj.filters \ node.vcxproj \ node.vcxproj.filters \ object.vcxproj \ diff --git a/build/win32/vs12/Makefile.in b/build/win32/vs12/Makefile.in index 68ddc9c..69c831c 100644 --- a/build/win32/vs12/Makefile.in +++ b/build/win32/vs12/Makefile.in @@ -25,9 +25,9 @@ # Author: Fan, Chun-wei # November 05, 2012 -# MSVC_VER_LONG: Long Version of Visual Studio (2012, 2013, 14 and so on) -# MSVC_VER: Short Version of Visual Studio (11 for 2012, 12 for 2013, 14 for 2015 and so on) -# MSVC_FORMAT_VER: Use 12 for MSVC 2012 through 2015 +# MSVC_VER_LONG: Long Version of target Visual Studio (2012, 2013, 14, 15 and so on) +# MSVC_VER: Short Version of target Visual Studio (11 for 2012, 12 for 2013, 14 for 2015, 15 for 2017) +# MSVC_TOOLSET: Use if target MSVC toolset is not in the form v$(MSVC_VER)0, meaning v$(MSVC_TOOLSET) VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -360,6 +360,7 @@ EXTRA_DIST = \ gvariant.vcxproj \ gvariant.vcxproj.filters \ json-glib-install.vcxproj \ + json-glib-install.vcxproj.filters \ node.vcxproj \ node.vcxproj.filters \ object.vcxproj \ @@ -385,6 +386,8 @@ MSVC_VER = 12 MSVC_FORMAT_VER = 12 MSVC_VER_LONG = 2013 DISTCLEANFILES = $(EXTRA_DIST) +@MSVC_BASE_NO_TOOLSET_SET_TRUE@MSVC_BASE_TOOLSET = $(MSVC_BASE_VER)0 +@MSVC_NO_TOOLSET_SET_TRUE@MSVC_TOOLSET = $(MSVC_VER)0 all: all-am .SUFFIXES: @@ -591,12 +594,12 @@ uninstall-am: %.vcxproj: if test -e $(top_srcdir)/build/win32/vs10/$@; then \ - sed 's/v100/v$(MSVC_VER)0/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ else \ - sed 's/v100/v$(MSVC_VER)0/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ fi -%.props: +%.props: $(top_builddir)/build/win32/vs10/Makefile if test -e $(top_srcdir)/build/win32/vs10/$@; then \ sed 's/10<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ else \ diff --git a/build/win32/vs12/json-glib-install.props b/build/win32/vs12/json-glib-install.props index 590a422..19a4799 100644 --- a/build/win32/vs12/json-glib-install.props +++ b/build/win32/vs12/json-glib-install.props @@ -5,8 +5,6 @@ $(SolutionDir)$(Configuration)\$(Platform)\bin - $(BinDir)\$(JsonGlibDllPrefix)json-glib(JsonGlibDllSuffix).dll - $(BinDir)\json-glib-format.exe;$(BinDir)\json-glib-validate.exe mkdir $(CopyDir) mkdir $(CopyDir)\bin @@ -30,7 +28,10 @@ copy ..\..\..\json-glib\json-version-macros.h $(CopyDir)\include\json-glib-1.0\j copy ..\..\..\json-glib\json-enum-types.h $(CopyDir)\include\json-glib-1.0\json-glib\json-enum-types.h copy ..\..\..\json-glib\json-version.h $(CopyDir)\include\json-glib-1.0\json-glib\json-version.h copy ..\..\..\json-glib\json-glib.h $(CopyDir)\include\json-glib-1.0\json-glib\json-glib.h - +if exist ..\json-glib.pc copy ..\json-glib.pc $(CopyDir)\lib\pkgconfig + + ..\json-glib.pc + if exist $(PythonPath)\python.exe ((if not exist $(CopyDir)\lib\pkgconfig mkdir $(CopyDir)\lib\pkgconfig) & ($(PythonPath)\python.exe ..\jsonglibpc.py --prefix=$(CopyDir) --version=$(JsonGlibMajorVersion).$(JsonGlibMinorVersion).$(JsonGlibMicroVersion))) <_PropertySheetDisplayName>jsonglibinstallprops @@ -39,14 +40,14 @@ copy ..\..\..\json-glib\json-glib.h $(CopyDir)\include\json-glib-1.0\json-glib\j $(BinDir) - - $(InstalledDlls) - - - $(InstalledBins) - $(JsonGlibDoInstall) + + $(JSONGLibPCFiles) + + + $(GenJSONGLibPC) + diff --git a/build/win32/vs12/json-glib-install.vcxproj b/build/win32/vs12/json-glib-install.vcxproj index 71b7f94..794e476 100644 --- a/build/win32/vs12/json-glib-install.vcxproj +++ b/build/win32/vs12/json-glib-install.vcxproj @@ -75,19 +75,23 @@ - - Installing Build Results... - $(JsonGlibDoInstall) - $(InstalledDlls);$(InstalledBins);%(Outputs) - Installing Build Results... - $(JsonGlibDoInstall) - $(InstalledDlls);$(InstalledBins);%(Outputs) - Installing Build Results... - $(JsonGlibDoInstall) - $(InstalledDlls);$(InstalledBins);%(Outputs) - Installing Build Results... - $(JsonGlibDoInstall) - $(InstalledDlls);$(InstalledBins);%(Outputs) + + Installing Build Results... + $(JSONGLibPCFiles) + $(JsonGlibDoInstall) + file_holder;%(Outputs) + Installing Build Results... + $(JSONGLibPCFiles) + $(JsonGlibDoInstall) + file_holder;%(Outputs) + + + Generating .pc file(s)... + $(GenJSONGLibPC) + $(JSONGLibPCFiles);%(Outputs) + Generating .pc file(s)... + $(GenJSONGLibPC) + $(JSONGLibPCFiles);%(Outputs) diff --git a/build/win32/vs12/json-glib-install.vcxproj.filters b/build/win32/vs12/json-glib-install.vcxproj.filters new file mode 100644 index 0000000..5f4846e --- /dev/null +++ b/build/win32/vs12/json-glib-install.vcxproj.filters @@ -0,0 +1,13 @@ + + + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + Resource Files + Resource Files + + diff --git a/build/win32/vs12/json-glib-version-paths.props b/build/win32/vs12/json-glib-version-paths.props index 0eb25a0..625475f 100644 --- a/build/win32/vs12/json-glib-version-paths.props +++ b/build/win32/vs12/json-glib-version-paths.props @@ -5,6 +5,9 @@ $(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform) $(GlibEtcInstallRoot) $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ + 1 + 2 + 4 1.0 lib -1.0-0 @@ -12,6 +15,7 @@ -1-vs$(VSVer) $(JsonGlibSeparateVSDllPrefix) $(JsonGlibSeparateVSDllSuffix) + c:\python34 <_PropertySheetDisplayName>jsonglibversionpathsprops @@ -26,6 +30,15 @@ $(CopyDir) + + $(JsonGlibMajorVersion) + + + $(JsonGlibMinorVersion) + + + $(JsonGlibMicroVersion) + $(ApiVersion) @@ -50,5 +63,8 @@ $(DefDir) + + $(PythonPath) + diff --git a/build/win32/vs12/json-glib.vcxproj b/build/win32/vs12/json-glib.vcxproj index c7766c6..7a250d7 100644 --- a/build/win32/vs12/json-glib.vcxproj +++ b/build/win32/vs12/json-glib.vcxproj @@ -66,10 +66,8 @@ - true - true - false - true + true + false @@ -92,6 +90,7 @@ true Windows $(TargetDir)$(ProjectName)-$(ApiVersion).lib + $(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).pdb MachineX86 @@ -115,6 +114,7 @@ true Windows $(TargetDir)$(ProjectName)-$(ApiVersion).lib + $(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).pdb MachineX64 @@ -141,6 +141,7 @@ true true $(TargetDir)$(ProjectName)-$(ApiVersion).lib + $(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).pdb MachineX86 @@ -163,6 +164,7 @@ true true $(TargetDir)$(ProjectName)-$(ApiVersion).lib + $(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).pdb MachineX64 @@ -184,22 +186,15 @@ - - Copying config.h from config.h.win32... - $(CopyConfigH) - ..\..\..\config.h;%(Outputs) - Copying config.h from config.h.win32... - $(CopyConfigH) - ..\..\..\config.h;%(Outputs) - Copying config.h from config.h.win32... - $(CopyConfigH) - ..\..\..\config.h;%(Outputs) - Copying config.h from config.h.win32... - $(CopyConfigH) - ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) diff --git a/build/win32/vs12/json-glib.vcxproj.filters b/build/win32/vs12/json-glib.vcxproj.filters index f202a94..85fbf5f 100644 --- a/build/win32/vs12/json-glib.vcxproj.filters +++ b/build/win32/vs12/json-glib.vcxproj.filters @@ -32,7 +32,6 @@ Source Files Source Files Source Files - Source Files Resource Files diff --git a/build/win32/vs14/Makefile.am b/build/win32/vs14/Makefile.am index fe5c5ec..3570545 100644 --- a/build/win32/vs14/Makefile.am +++ b/build/win32/vs14/Makefile.am @@ -23,6 +23,7 @@ EXTRA_DIST = \ gvariant.vcxproj \ gvariant.vcxproj.filters \ json-glib-install.vcxproj \ + json-glib-install.vcxproj.filters \ node.vcxproj \ node.vcxproj.filters \ object.vcxproj \ diff --git a/build/win32/vs14/Makefile.in b/build/win32/vs14/Makefile.in index a120314..2321be7 100644 --- a/build/win32/vs14/Makefile.in +++ b/build/win32/vs14/Makefile.in @@ -25,9 +25,9 @@ # Author: Fan, Chun-wei # November 05, 2012 -# MSVC_VER_LONG: Long Version of Visual Studio (2012, 2013, 14 and so on) -# MSVC_VER: Short Version of Visual Studio (11 for 2012, 12 for 2013, 14 for 2015 and so on) -# MSVC_FORMAT_VER: Use 12 for MSVC 2012 through 2015 +# MSVC_VER_LONG: Long Version of target Visual Studio (2012, 2013, 14, 15 and so on) +# MSVC_VER: Short Version of target Visual Studio (11 for 2012, 12 for 2013, 14 for 2015, 15 for 2017) +# MSVC_TOOLSET: Use if target MSVC toolset is not in the form v$(MSVC_VER)0, meaning v$(MSVC_TOOLSET) VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -360,6 +360,7 @@ EXTRA_DIST = \ gvariant.vcxproj \ gvariant.vcxproj.filters \ json-glib-install.vcxproj \ + json-glib-install.vcxproj.filters \ node.vcxproj \ node.vcxproj.filters \ object.vcxproj \ @@ -385,6 +386,8 @@ MSVC_VER = 14 MSVC_FORMAT_VER = 12 MSVC_VER_LONG = 14 DISTCLEANFILES = $(EXTRA_DIST) +@MSVC_BASE_NO_TOOLSET_SET_TRUE@MSVC_BASE_TOOLSET = $(MSVC_BASE_VER)0 +@MSVC_NO_TOOLSET_SET_TRUE@MSVC_TOOLSET = $(MSVC_VER)0 all: all-am .SUFFIXES: @@ -591,12 +594,12 @@ uninstall-am: %.vcxproj: if test -e $(top_srcdir)/build/win32/vs10/$@; then \ - sed 's/v100/v$(MSVC_VER)0/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ else \ - sed 's/v100/v$(MSVC_VER)0/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ fi -%.props: +%.props: $(top_builddir)/build/win32/vs10/Makefile if test -e $(top_srcdir)/build/win32/vs10/$@; then \ sed 's/10<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ else \ diff --git a/build/win32/vs14/json-glib-install.props b/build/win32/vs14/json-glib-install.props index 590a422..19a4799 100644 --- a/build/win32/vs14/json-glib-install.props +++ b/build/win32/vs14/json-glib-install.props @@ -5,8 +5,6 @@ $(SolutionDir)$(Configuration)\$(Platform)\bin - $(BinDir)\$(JsonGlibDllPrefix)json-glib(JsonGlibDllSuffix).dll - $(BinDir)\json-glib-format.exe;$(BinDir)\json-glib-validate.exe mkdir $(CopyDir) mkdir $(CopyDir)\bin @@ -30,7 +28,10 @@ copy ..\..\..\json-glib\json-version-macros.h $(CopyDir)\include\json-glib-1.0\j copy ..\..\..\json-glib\json-enum-types.h $(CopyDir)\include\json-glib-1.0\json-glib\json-enum-types.h copy ..\..\..\json-glib\json-version.h $(CopyDir)\include\json-glib-1.0\json-glib\json-version.h copy ..\..\..\json-glib\json-glib.h $(CopyDir)\include\json-glib-1.0\json-glib\json-glib.h - +if exist ..\json-glib.pc copy ..\json-glib.pc $(CopyDir)\lib\pkgconfig + + ..\json-glib.pc + if exist $(PythonPath)\python.exe ((if not exist $(CopyDir)\lib\pkgconfig mkdir $(CopyDir)\lib\pkgconfig) & ($(PythonPath)\python.exe ..\jsonglibpc.py --prefix=$(CopyDir) --version=$(JsonGlibMajorVersion).$(JsonGlibMinorVersion).$(JsonGlibMicroVersion))) <_PropertySheetDisplayName>jsonglibinstallprops @@ -39,14 +40,14 @@ copy ..\..\..\json-glib\json-glib.h $(CopyDir)\include\json-glib-1.0\json-glib\j $(BinDir) - - $(InstalledDlls) - - - $(InstalledBins) - $(JsonGlibDoInstall) + + $(JSONGLibPCFiles) + + + $(GenJSONGLibPC) + diff --git a/build/win32/vs14/json-glib-install.vcxproj b/build/win32/vs14/json-glib-install.vcxproj index 2a89772..5ef9ce4 100644 --- a/build/win32/vs14/json-glib-install.vcxproj +++ b/build/win32/vs14/json-glib-install.vcxproj @@ -75,19 +75,23 @@ - - Installing Build Results... - $(JsonGlibDoInstall) - $(InstalledDlls);$(InstalledBins);%(Outputs) - Installing Build Results... - $(JsonGlibDoInstall) - $(InstalledDlls);$(InstalledBins);%(Outputs) - Installing Build Results... - $(JsonGlibDoInstall) - $(InstalledDlls);$(InstalledBins);%(Outputs) - Installing Build Results... - $(JsonGlibDoInstall) - $(InstalledDlls);$(InstalledBins);%(Outputs) + + Installing Build Results... + $(JSONGLibPCFiles) + $(JsonGlibDoInstall) + file_holder;%(Outputs) + Installing Build Results... + $(JSONGLibPCFiles) + $(JsonGlibDoInstall) + file_holder;%(Outputs) + + + Generating .pc file(s)... + $(GenJSONGLibPC) + $(JSONGLibPCFiles);%(Outputs) + Generating .pc file(s)... + $(GenJSONGLibPC) + $(JSONGLibPCFiles);%(Outputs) diff --git a/build/win32/vs14/json-glib-install.vcxproj.filters b/build/win32/vs14/json-glib-install.vcxproj.filters new file mode 100644 index 0000000..5f4846e --- /dev/null +++ b/build/win32/vs14/json-glib-install.vcxproj.filters @@ -0,0 +1,13 @@ + + + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + Resource Files + Resource Files + + diff --git a/build/win32/vs14/json-glib-version-paths.props b/build/win32/vs14/json-glib-version-paths.props index dc016e1..23e5a3c 100644 --- a/build/win32/vs14/json-glib-version-paths.props +++ b/build/win32/vs14/json-glib-version-paths.props @@ -5,6 +5,9 @@ $(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform) $(GlibEtcInstallRoot) $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ + 1 + 2 + 4 1.0 lib -1.0-0 @@ -12,6 +15,7 @@ -1-vs$(VSVer) $(JsonGlibSeparateVSDllPrefix) $(JsonGlibSeparateVSDllSuffix) + c:\python34 <_PropertySheetDisplayName>jsonglibversionpathsprops @@ -26,6 +30,15 @@ $(CopyDir) + + $(JsonGlibMajorVersion) + + + $(JsonGlibMinorVersion) + + + $(JsonGlibMicroVersion) + $(ApiVersion) @@ -50,5 +63,8 @@ $(DefDir) + + $(PythonPath) + diff --git a/build/win32/vs14/json-glib.vcxproj b/build/win32/vs14/json-glib.vcxproj index 632523f..7b47556 100644 --- a/build/win32/vs14/json-glib.vcxproj +++ b/build/win32/vs14/json-glib.vcxproj @@ -66,10 +66,8 @@ - true - true - false - true + true + false @@ -92,6 +90,7 @@ true Windows $(TargetDir)$(ProjectName)-$(ApiVersion).lib + $(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).pdb MachineX86 @@ -115,6 +114,7 @@ true Windows $(TargetDir)$(ProjectName)-$(ApiVersion).lib + $(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).pdb MachineX64 @@ -141,6 +141,7 @@ true true $(TargetDir)$(ProjectName)-$(ApiVersion).lib + $(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).pdb MachineX86 @@ -163,6 +164,7 @@ true true $(TargetDir)$(ProjectName)-$(ApiVersion).lib + $(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).pdb MachineX64 @@ -184,22 +186,15 @@ - - Copying config.h from config.h.win32... - $(CopyConfigH) - ..\..\..\config.h;%(Outputs) - Copying config.h from config.h.win32... - $(CopyConfigH) - ..\..\..\config.h;%(Outputs) - Copying config.h from config.h.win32... - $(CopyConfigH) - ..\..\..\config.h;%(Outputs) - Copying config.h from config.h.win32... - $(CopyConfigH) - ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) diff --git a/build/win32/vs14/json-glib.vcxproj.filters b/build/win32/vs14/json-glib.vcxproj.filters index f202a94..85fbf5f 100644 --- a/build/win32/vs14/json-glib.vcxproj.filters +++ b/build/win32/vs14/json-glib.vcxproj.filters @@ -32,7 +32,6 @@ Source Files Source Files Source Files - Source Files Resource Files diff --git a/build/win32/vs15/Makefile.am b/build/win32/vs15/Makefile.am new file mode 100644 index 0000000..0d0cc1a --- /dev/null +++ b/build/win32/vs15/Makefile.am @@ -0,0 +1,55 @@ +NULL = + +EXTRA_DIST = \ + json-glib.sln \ + json-glib-version-paths.props \ + json-glib-build-defines.props \ + json-glib-gen-srcs.props \ + json-glib-install.props \ + json-glib.vcxproj \ + json-glib.vcxproj.filters \ + json-glib-format.vcxproj \ + json-glib-format.vcxproj.filters \ + json-glib-validate.vcxproj \ + json-glib-validate.vcxproj.filters \ + array.vcxproj \ + array.vcxproj.filters \ + boxed.vcxproj \ + boxed.vcxproj.filters \ + builder.vcxproj \ + builder.vcxproj.filters \ + generator.vcxproj \ + generator.vcxproj.filters \ + gvariant.vcxproj \ + gvariant.vcxproj.filters \ + json-glib-install.vcxproj \ + json-glib-install.vcxproj.filters \ + node.vcxproj \ + node.vcxproj.filters \ + object.vcxproj \ + object.vcxproj.filters \ + parser.vcxproj \ + parser.vcxproj.filters \ + path.vcxproj \ + path.vcxproj.filters \ + reader.vcxproj \ + reader.vcxproj.filters \ + serialize-complex.vcxproj \ + serialize-complex.vcxproj.filters \ + serialize-full.vcxproj \ + serialize-full.vcxproj.filters \ + serialize-simple.vcxproj \ + serialize-simple.vcxproj.filters \ + README.txt \ + invalid.vcxproj \ + invalid.vcxproj.filters \ + $(NULL) + +MSVC_VER = 15 +MSVC_FORMAT_VER = 12 +MSVC_VER_LONG = 15 +MSVC_TOOLSET = 141 + +DISTCLEANFILES = $(EXTRA_DIST) + +include $(top_srcdir)/build/Makefile-newvs.am diff --git a/build/win32/vs15/Makefile.in b/build/win32/vs15/Makefile.in new file mode 100644 index 0000000..7ae0d54 --- /dev/null +++ b/build/win32/vs15/Makefile.in @@ -0,0 +1,619 @@ +# Makefile.in generated by automake 1.15 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# Centralized autotools file +# Create the Visual Studio 2012/2013/2015 project files +# from the Visual Studio 2010 project files + +# This autotools file, from GLib, can be used in other projects +# that have Visual Studio build support, and is copied into +# $(srcroot)/build/. + +# Author: Fan, Chun-wei +# November 05, 2012 + +# MSVC_VER_LONG: Long Version of target Visual Studio (2012, 2013, 14, 15 and so on) +# MSVC_VER: Short Version of target Visual Studio (11 for 2012, 12 for 2013, 14 for 2015, 15 for 2017) +# MSVC_TOOLSET: Use if target MSVC toolset is not in the form v$(MSVC_VER)0, meaning v$(MSVC_TOOLSET) +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = build/win32/vs15 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = \ + $(top_srcdir)/build/autotools/as-compiler-flag.m4 \ + $(top_srcdir)/build/autotools/as-linguas.m4 \ + $(top_srcdir)/build/autotools/gettext.m4 \ + $(top_srcdir)/build/autotools/glibtests.m4 \ + $(top_srcdir)/build/autotools/gtk-doc.m4 \ + $(top_srcdir)/build/autotools/iconv.m4 \ + $(top_srcdir)/build/autotools/intlmacosx.m4 \ + $(top_srcdir)/build/autotools/introspection.m4 \ + $(top_srcdir)/build/autotools/jh-catalog.m4 \ + $(top_srcdir)/build/autotools/lib-ld.m4 \ + $(top_srcdir)/build/autotools/lib-link.m4 \ + $(top_srcdir)/build/autotools/lib-prefix.m4 \ + $(top_srcdir)/build/autotools/libtool.m4 \ + $(top_srcdir)/build/autotools/ltoptions.m4 \ + $(top_srcdir)/build/autotools/ltsugar.m4 \ + $(top_srcdir)/build/autotools/ltversion.m4 \ + $(top_srcdir)/build/autotools/lt~obsolete.m4 \ + $(top_srcdir)/build/autotools/nls.m4 \ + $(top_srcdir)/build/autotools/po.m4 \ + $(top_srcdir)/build/autotools/progtest.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/Makefile-newvs.am +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_LIBS = @GLIB_LIBS@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GLIB_PREFIX = @GLIB_PREFIX@ +GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ +GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ +GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ +GTKDOC_MKPDF = @GTKDOC_MKPDF@ +GTKDOC_REBASE = @GTKDOC_REBASE@ +HTML_DIR = @HTML_DIR@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ +JSON_CFLAGS = @JSON_CFLAGS@ +JSON_DEBUG_CFLAGS = @JSON_DEBUG_CFLAGS@ +JSON_GCOV_CFLAGS = @JSON_GCOV_CFLAGS@ +JSON_GCOV_LDADD = @JSON_GCOV_LDADD@ +JSON_HIDDEN_VISIBILITY_CFLAGS = @JSON_HIDDEN_VISIBILITY_CFLAGS@ +JSON_LIBS = @JSON_LIBS@ +JSON_LT_LDFLAGS = @JSON_LT_LDFLAGS@ +JSON_MAJOR_VERSION = @JSON_MAJOR_VERSION@ +JSON_MICRO_VERSION = @JSON_MICRO_VERSION@ +JSON_MINOR_VERSION = @JSON_MINOR_VERSION@ +JSON_RELEASE_STATUS = @JSON_RELEASE_STATUS@ +JSON_VERSION = @JSON_VERSION@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +LTP = @LTP@ +LTP_GENHTML = @LTP_GENHTML@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ +MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MSGFMT = @MSGFMT@ +MSGFMT_015 = @MSGFMT_015@ +MSGMERGE = @MSGMERGE@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SHTOOL = @SHTOOL@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ +XMLCATALOG = @XMLCATALOG@ +XML_CATALOG_FILE = @XML_CATALOG_FILE@ +XSLTPROC = @XSLTPROC@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +installed_test_metadir = @installed_test_metadir@ +installed_testdir = @installed_testdir@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +NULL = +EXTRA_DIST = \ + json-glib.sln \ + json-glib-version-paths.props \ + json-glib-build-defines.props \ + json-glib-gen-srcs.props \ + json-glib-install.props \ + json-glib.vcxproj \ + json-glib.vcxproj.filters \ + json-glib-format.vcxproj \ + json-glib-format.vcxproj.filters \ + json-glib-validate.vcxproj \ + json-glib-validate.vcxproj.filters \ + array.vcxproj \ + array.vcxproj.filters \ + boxed.vcxproj \ + boxed.vcxproj.filters \ + builder.vcxproj \ + builder.vcxproj.filters \ + generator.vcxproj \ + generator.vcxproj.filters \ + gvariant.vcxproj \ + gvariant.vcxproj.filters \ + json-glib-install.vcxproj \ + json-glib-install.vcxproj.filters \ + node.vcxproj \ + node.vcxproj.filters \ + object.vcxproj \ + object.vcxproj.filters \ + parser.vcxproj \ + parser.vcxproj.filters \ + path.vcxproj \ + path.vcxproj.filters \ + reader.vcxproj \ + reader.vcxproj.filters \ + serialize-complex.vcxproj \ + serialize-complex.vcxproj.filters \ + serialize-full.vcxproj \ + serialize-full.vcxproj.filters \ + serialize-simple.vcxproj \ + serialize-simple.vcxproj.filters \ + README.txt \ + invalid.vcxproj \ + invalid.vcxproj.filters \ + $(NULL) + +MSVC_VER = 15 +MSVC_FORMAT_VER = 12 +MSVC_VER_LONG = 15 +@MSVC_NO_TOOLSET_SET_TRUE@MSVC_TOOLSET = $(MSVC_VER)0 +MSVC_TOOLSET = 141 +DISTCLEANFILES = $(EXTRA_DIST) +@MSVC_BASE_NO_TOOLSET_SET_TRUE@MSVC_BASE_TOOLSET = $(MSVC_BASE_VER)0 +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/build/Makefile-newvs.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign build/win32/vs15/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign build/win32/vs15/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; +$(top_srcdir)/build/Makefile-newvs.am $(am__empty): + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags TAGS: + +ctags CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am + +.PRECIOUS: Makefile + + +%.sln: + sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp + sed 's/2010/$(MSVC_VER_LONG)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@ + rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp + +%.txt: + sed 's/vs10/vs$(MSVC_VER)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp + sed 's/VS10/VS$(MSVC_VER)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@ + rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp + +%.vcxproj: + if test -e $(top_srcdir)/build/win32/vs10/$@; then \ + sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + else \ + sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + fi + +%.props: $(top_builddir)/build/win32/vs10/Makefile + if test -e $(top_srcdir)/build/win32/vs10/$@; then \ + sed 's/10<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + else \ + sed 's/10<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + fi + +%.vcxproj.filters: + if test -e $(top_srcdir)/build/win32/vs10/$@; then \ + cp $(top_srcdir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + else \ + cp $(top_builddir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + fi + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/build/win32/vs15/README.txt b/build/win32/vs15/README.txt new file mode 100644 index 0000000..445ae60 --- /dev/null +++ b/build/win32/vs15/README.txt @@ -0,0 +1,92 @@ +Please refer to the following GNOME Live! page for more detailed +instructions on building JSON-GLib and its dependencies with Visual C++: + +https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack + +This VS15 solution and the projects it includes are intended to be used +in a JSON-GLib source tree unpacked from a tarball. In a git checkout you +first need to use some Unix-like environment or manual work to expand +the .in files needed, mainly config.h.win32.in into config.h.win32. +You will also need to expand json-glib.vcxprojin and json-glib.vcxproj.filtersin +here into json-glib.vcxproj and json-glib.vcxproj.filters repectively. + +The dependencies for this package are gettext-runtime (libintl), GLib*, +ZLib at the minimum. + +For the Dependencies, you may either: + +a) look for all of the dependencies (except GLib*) under + + http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ (32-bit) -OR- + http://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64-bit) + + Please use the latest versions of these libraries that are available there, + these are packaged by Tor Lillqvist, which are built with MinGW/GCC. + Please see b) below regarding the build of GLib* + +-OR- + +b) Build them yourself with VS15 (but you may most probably wish to get + gettext-runtime from the URL(s) mentioned in a)). Use the latest + stable versions for them (you may need to get the latest unstable version of + GLib if you are using an unstable version of JSON-GLib): + + GLib*: Grab the latest sources from http://www.gtk.org under "Download" + (stable only-please make a search for the latest unstable versions) + ZLib: http://www.zlib.net + + The above 2 packages all have supported mechanisms (Makefiles and/or Project + Files) for building under VS15 (upgrade the Project Files from earlier VS + versions will do for these, when applicable). It is recommended that ZLib + is built using the win32/Makefile.msc makefile with VS15 with the ASM routines + to avoid linking problems (copy zdll.lib to zlib1.lib[Release] or to zlib1d.lib + [Debug] after completion of compilation)-see win32/Makefile.msc in ZLib for + more details. + +* This GLib refers to a build that is built by VS15 + +Set up the source tree as follows under some arbitrary top +folder : + +\json-glib\ +\vs15\ + +*this* file you are now reading is thus located at +\json-glib\\build\win32\vs15\README. + + is either Win32 or x64, as in the VS15 project files. + +You should unpack the -dev and (runtime) +into \vs15\, if you download any of the packages from + +http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ (32-bit) -OR- +http://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64-bit) + +so that for instance libintl.h end up at +\vs15\\include\libintl.h. + +If you build any of the dependencies yourselves, copy the: +-DLLs and EXEs into \vs15\\bin +-headers into \vs15\\include\ +-LIBs into \vs15\\lib + +If you have not built GLib with VS15 and placed the LIBs and headers in a +place where VS15 can find them automatically, you should also uncompress +your GLib sources in \ and build it from there, following the +instructions in \glib<-version>\build\win32\vs15, so that the required +headers, EXEs, DLLs and LIBs will end up in +\vs15\\include\glib-2.0 (headers) +\vs15\\lib (LIBs, also glib-2.0/include/glibconfig.h) +\vs15\\bin (EXEs/DLLs) +respectively. + +After the build of JSON-GLib, the "install" project will copy build results +and headers into their appropriate location under \vs15\. +For instance, built DLLs go into \vs15\\bin, built LIBs into +\vs15\\lib and JSON-GLib headers into +\vs15\\include\json-glib-1.0. This is then from where +project files higher in the stack are supposed to look for them, not +from a specific JSON-GLib source tree. + +--Chun-wei Fan +--(adapted from the GLib VS9 README.txt file originally written by Tor Lillqvist) diff --git a/build/win32/vs15/array.vcxproj b/build/win32/vs15/array.vcxproj new file mode 100644 index 0000000..2223b9a --- /dev/null +++ b/build/win32/vs15/array.vcxproj @@ -0,0 +1,171 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {9B2921C9-577F-418D-8341-6D79771DDCEC} + array + Win32Proj + + + + Application + MultiByte + true + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + true + v141 + + + Application + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + %(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + %(ForcedIncludeFiles) + + + true + Console + MachineX86 + + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + MachineX64 + + + + + + + + + MaxSpeed + true + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + %(ForcedIncludeFiles) + + + %(AdditionalDependencies) + true + Console + true + true + MachineX86 + + + + + %(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + true + true + MachineX64 + + + + + + + + {469db0a8-e33e-4112-a38c-52a168ecdc03} + false + + + + + + diff --git a/build/win32/vs15/array.vcxproj.filters b/build/win32/vs15/array.vcxproj.filters new file mode 100644 index 0000000..f14dfb1 --- /dev/null +++ b/build/win32/vs15/array.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Sources + + + diff --git a/build/win32/vs15/boxed.vcxproj b/build/win32/vs15/boxed.vcxproj new file mode 100644 index 0000000..3fee913 --- /dev/null +++ b/build/win32/vs15/boxed.vcxproj @@ -0,0 +1,171 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {5016D295-CC2F-4149-80C2-71D7A33791B2} + boxed + Win32Proj + + + + Application + MultiByte + true + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + true + v141 + + + Application + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + %(ForcedIncludeFiles) + + + true + Console + MachineX86 + + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + MachineX64 + + + + + + + + + MaxSpeed + true + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + %(ForcedIncludeFiles) + + + %(AdditionalDependencies) + true + Console + true + true + MachineX86 + + + + + %(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + true + true + MachineX64 + + + + + + + + {469db0a8-e33e-4112-a38c-52a168ecdc03} + false + + + + + + diff --git a/build/win32/vs15/boxed.vcxproj.filters b/build/win32/vs15/boxed.vcxproj.filters new file mode 100644 index 0000000..30f52f1 --- /dev/null +++ b/build/win32/vs15/boxed.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Sources + + + diff --git a/build/win32/vs15/builder.vcxproj b/build/win32/vs15/builder.vcxproj new file mode 100644 index 0000000..6d572c5 --- /dev/null +++ b/build/win32/vs15/builder.vcxproj @@ -0,0 +1,171 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {B7D32B02-3481-4A6E-8E0F-B43887F348A8} + builder + Win32Proj + + + + Application + MultiByte + true + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + true + v141 + + + Application + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + %(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + %(ForcedIncludeFiles) + + + true + Console + MachineX86 + + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + MachineX64 + + + + + + + + + MaxSpeed + true + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + %(ForcedIncludeFiles) + + + %(AdditionalDependencies) + true + Console + true + true + MachineX86 + + + + + %(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + true + true + MachineX64 + + + + + + + + {469db0a8-e33e-4112-a38c-52a168ecdc03} + false + + + + + + diff --git a/build/win32/vs15/builder.vcxproj.filters b/build/win32/vs15/builder.vcxproj.filters new file mode 100644 index 0000000..5a863c1 --- /dev/null +++ b/build/win32/vs15/builder.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Sources + + + diff --git a/build/win32/vs15/generator.vcxproj b/build/win32/vs15/generator.vcxproj new file mode 100644 index 0000000..7ec6aaa --- /dev/null +++ b/build/win32/vs15/generator.vcxproj @@ -0,0 +1,171 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {E84F9D53-C9F7-4D7D-B8D0-AFE8BE3E7B7D} + generator + Win32Proj + + + + Application + MultiByte + true + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + true + v141 + + + Application + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + %(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + %(ForcedIncludeFiles) + + + true + Console + MachineX86 + + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + MachineX64 + + + + + + + + + MaxSpeed + true + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + %(ForcedIncludeFiles) + + + %(AdditionalDependencies) + true + Console + true + true + MachineX86 + + + + + %(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + true + true + MachineX64 + + + + + + + + {469db0a8-e33e-4112-a38c-52a168ecdc03} + false + + + + + + diff --git a/build/win32/vs15/generator.vcxproj.filters b/build/win32/vs15/generator.vcxproj.filters new file mode 100644 index 0000000..554c572 --- /dev/null +++ b/build/win32/vs15/generator.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Sources + + + diff --git a/build/win32/vs15/gvariant.vcxproj b/build/win32/vs15/gvariant.vcxproj new file mode 100644 index 0000000..d6eb939 --- /dev/null +++ b/build/win32/vs15/gvariant.vcxproj @@ -0,0 +1,162 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {AA52A332-735D-4177-8CA6-842018E60DED} + gvariant + Win32Proj + + + + Application + MultiByte + true + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + true + v141 + + + Application + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + MachineX64 + + + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + %(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + true + true + MachineX64 + + + + + + + + {469db0a8-e33e-4112-a38c-52a168ecdc03} + false + + + + + + diff --git a/build/win32/vs15/gvariant.vcxproj.filters b/build/win32/vs15/gvariant.vcxproj.filters new file mode 100644 index 0000000..f273c99 --- /dev/null +++ b/build/win32/vs15/gvariant.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Sources + + + diff --git a/build/win32/vs15/invalid.vcxproj b/build/win32/vs15/invalid.vcxproj new file mode 100644 index 0000000..eeba129 --- /dev/null +++ b/build/win32/vs15/invalid.vcxproj @@ -0,0 +1,171 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {04658465-64F9-4F06-B7A7-D40F6EDF26E4} + invalid + Win32Proj + + + + Application + MultiByte + true + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + true + v141 + + + Application + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + %(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + %(ForcedIncludeFiles) + + + true + Console + MachineX86 + + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + MachineX64 + + + + + + + + + MaxSpeed + true + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + %(ForcedIncludeFiles) + + + %(AdditionalDependencies) + true + Console + true + true + MachineX86 + + + + + %(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + true + true + MachineX64 + + + + + + + + {469db0a8-e33e-4112-a38c-52a168ecdc03} + false + + + + + + diff --git a/build/win32/vs15/invalid.vcxproj.filters b/build/win32/vs15/invalid.vcxproj.filters new file mode 100644 index 0000000..322c279 --- /dev/null +++ b/build/win32/vs15/invalid.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Sources + + + diff --git a/build/win32/vs15/json-glib-build-defines.props b/build/win32/vs15/json-glib-build-defines.props new file mode 100644 index 0000000..412f7d1 --- /dev/null +++ b/build/win32/vs15/json-glib-build-defines.props @@ -0,0 +1,32 @@ + + + + + + + JSON_COMPILATION;G_LOG_DOMAIN="Json";JSON_LOCALEDIR="/dummy" + + + <_PropertySheetDisplayName>jsonglibbuilddefinesprops + $(SolutionDir)$(Configuration)\$(PlatformName)\bin\ + $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ + + + + ..\..\..;..\..\..\json-glib;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;%(AdditionalIncludeDirectories) + HAVE_CONFIG_H;%(PreprocessorDefinitions) + msvc_recommended_pragmas.h;%(ForcedIncludeFiles) + true + /d2Zi+ %(AdditionalOptions) + + + gio-2.0.lib;gobject-2.0.lib;glib-2.0.lib;%(AdditionalDependencies) + $(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories) + + + + + $(JsonGlibDefines) + + + diff --git a/build/win32/vs15/json-glib-format.vcxproj b/build/win32/vs15/json-glib-format.vcxproj new file mode 100644 index 0000000..f7921bb --- /dev/null +++ b/build/win32/vs15/json-glib-format.vcxproj @@ -0,0 +1,166 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {FF640D73-9BCD-4B75-B63F-75175A3C9F69} + jsonglibformat + Win32Proj + + + + Application + MultiByte + true + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + true + v141 + + + Application + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + _DEBUG;$(JsonGlibDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + true + intl.lib;%(AdditionalDependencies) + Console + MachineX86 + + + + + Disabled + _DEBUG;$(JsonGlibDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + intl.lib;%(AdditionalDependencies) + Console + MachineX64 + + + + + MaxSpeed + true + $(JsonGlibDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + true + intl.lib;%(AdditionalDependencies) + Console + true + true + MachineX86 + + + + + $(JsonGlibDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + intl.lib;%(AdditionalDependencies) + Console + true + true + MachineX64 + + + + + + + + {469db0a8-e33e-4112-a38c-52a168ecdc03} + false + + + + + + diff --git a/build/win32/vs15/json-glib-format.vcxproj.filters b/build/win32/vs15/json-glib-format.vcxproj.filters new file mode 100644 index 0000000..3911577 --- /dev/null +++ b/build/win32/vs15/json-glib-format.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Sources + + + diff --git a/build/win32/vs15/json-glib-gen-srcs.props b/build/win32/vs15/json-glib-gen-srcs.props new file mode 100644 index 0000000..f5629eb --- /dev/null +++ b/build/win32/vs15/json-glib-gen-srcs.props @@ -0,0 +1,17 @@ + + + + + + + copy ..\config.h.win32 ..\..\..\config.h + + + <_PropertySheetDisplayName>jsonglibgensrcsprops + + + + $(CopyConfigH) + + + diff --git a/build/win32/vs15/json-glib-install.props b/build/win32/vs15/json-glib-install.props new file mode 100644 index 0000000..19a4799 --- /dev/null +++ b/build/win32/vs15/json-glib-install.props @@ -0,0 +1,53 @@ + + + + + + + $(SolutionDir)$(Configuration)\$(Platform)\bin + +mkdir $(CopyDir) +mkdir $(CopyDir)\bin +mkdir $(CopyDir)\lib +copy $(BinDir)\json-glib-$(ApiVersion).lib $(CopyDir)\lib +copy $(BinDir)\$(JsonGlibDllPrefix)json-glib$(JsonGlibDllSuffix).dll $(CopyDir)\bin +copy $(BinDir)\$(JsonGlibDllPrefix)json-glib$(JsonGlibDllSuffix).pdb $(CopyDir)\bin +copy $(BinDir)\json-glib-*.exe $(CopyDir)\bin +copy $(BinDir)\json-glib-*.pdb $(CopyDir)\bin +mkdir $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib +copy ..\..\..\json-glib\json-builder.h $(CopyDir)\include\json-glib-1.0\json-glib\json-builder.h +copy ..\..\..\json-glib\json-generator.h $(CopyDir)\include\json-glib-1.0\json-glib\json-generator.h +copy ..\..\..\json-glib\json-gobject.h $(CopyDir)\include\json-glib-1.0\json-glib\json-gobject.h +copy ..\..\..\json-glib\json-gvariant.h $(CopyDir)\include\json-glib-1.0\json-glib\json-gvariant.h +copy ..\..\..\json-glib\json-parser.h $(CopyDir)\include\json-glib-1.0\json-glib\json-parser.h +copy ..\..\..\json-glib\json-path.h $(CopyDir)\include\json-glib-1.0\json-glib\json-path.h +copy ..\..\..\json-glib\json-reader.h $(CopyDir)\include\json-glib-1.0\json-glib\json-reader.h +copy ..\..\..\json-glib\json-types.h $(CopyDir)\include\json-glib-1.0\json-glib\json-types.h +copy ..\..\..\json-glib\json-utils.h $(CopyDir)\include\json-glib-1.0\json-glib\json-utils.h +copy ..\..\..\json-glib\json-version-macros.h $(CopyDir)\include\json-glib-1.0\json-glib\json-version-macros.h +copy ..\..\..\json-glib\json-enum-types.h $(CopyDir)\include\json-glib-1.0\json-glib\json-enum-types.h +copy ..\..\..\json-glib\json-version.h $(CopyDir)\include\json-glib-1.0\json-glib\json-version.h +copy ..\..\..\json-glib\json-glib.h $(CopyDir)\include\json-glib-1.0\json-glib\json-glib.h +if exist ..\json-glib.pc copy ..\json-glib.pc $(CopyDir)\lib\pkgconfig + + ..\json-glib.pc + if exist $(PythonPath)\python.exe ((if not exist $(CopyDir)\lib\pkgconfig mkdir $(CopyDir)\lib\pkgconfig) & ($(PythonPath)\python.exe ..\jsonglibpc.py --prefix=$(CopyDir) --version=$(JsonGlibMajorVersion).$(JsonGlibMinorVersion).$(JsonGlibMicroVersion))) + + + <_PropertySheetDisplayName>jsonglibinstallprops + + + + $(BinDir) + + + $(JsonGlibDoInstall) + + + $(JSONGLibPCFiles) + + + $(GenJSONGLibPC) + + + diff --git a/build/win32/vs15/json-glib-install.vcxproj b/build/win32/vs15/json-glib-install.vcxproj new file mode 100644 index 0000000..55a034b --- /dev/null +++ b/build/win32/vs15/json-glib-install.vcxproj @@ -0,0 +1,114 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {41ABBEB6-693A-4E63-9DD7-EAAC437BC173} + jsonglibinstall + Win32Proj + + + + Utility + MultiByte + true + v141 + + + Utility + MultiByte + v141 + + + Utility + MultiByte + true + v141 + + + Utility + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Installing Build Results... + $(JSONGLibPCFiles) + $(JsonGlibDoInstall) + file_holder;%(Outputs) + Installing Build Results... + $(JSONGLibPCFiles) + $(JsonGlibDoInstall) + file_holder;%(Outputs) + + + Generating .pc file(s)... + $(GenJSONGLibPC) + $(JSONGLibPCFiles);%(Outputs) + Generating .pc file(s)... + $(GenJSONGLibPC) + $(JSONGLibPCFiles);%(Outputs) + + + + + {469db0a8-e33e-4112-a38c-52a168ecdc03} + false + + + {ff640d73-9bcd-4b75-b63f-75175a3c9f68} + false + + + {ff640d73-9bcd-4b75-b63f-75175a3c9f69} + false + + + + + + diff --git a/build/win32/vs15/json-glib-install.vcxproj.filters b/build/win32/vs15/json-glib-install.vcxproj.filters new file mode 100644 index 0000000..5f4846e --- /dev/null +++ b/build/win32/vs15/json-glib-install.vcxproj.filters @@ -0,0 +1,13 @@ + + + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + Resource Files + Resource Files + + diff --git a/build/win32/vs15/json-glib-validate.vcxproj b/build/win32/vs15/json-glib-validate.vcxproj new file mode 100644 index 0000000..9d1b43b --- /dev/null +++ b/build/win32/vs15/json-glib-validate.vcxproj @@ -0,0 +1,166 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {FF640D73-9BCD-4B75-B63F-75175A3C9F68} + jsonglibvalidate + Win32Proj + + + + Application + MultiByte + true + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + true + v141 + + + Application + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + _DEBUG;$(JsonGlibDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + true + intl.lib;%(AdditionalDependencies) + Console + MachineX86 + + + + + Disabled + _DEBUG;$(JsonGlibDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + intl.lib;%(AdditionalDependencies) + Console + MachineX64 + + + + + MaxSpeed + true + $(JsonGlibDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + true + intl.lib;%(AdditionalDependencies) + Console + true + true + MachineX86 + + + + + $(JsonGlibDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + intl.lib;%(AdditionalDependencies) + Console + true + true + MachineX64 + + + + + + + + {469db0a8-e33e-4112-a38c-52a168ecdc03} + false + + + + + + diff --git a/build/win32/vs15/json-glib-validate.vcxproj.filters b/build/win32/vs15/json-glib-validate.vcxproj.filters new file mode 100644 index 0000000..6f9b5c3 --- /dev/null +++ b/build/win32/vs15/json-glib-validate.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Sources + + + diff --git a/build/win32/vs15/json-glib-version-paths.props b/build/win32/vs15/json-glib-version-paths.props new file mode 100644 index 0000000..1a8a688 --- /dev/null +++ b/build/win32/vs15/json-glib-version-paths.props @@ -0,0 +1,70 @@ + + + + 15 + $(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform) + $(GlibEtcInstallRoot) + $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ + 1 + 2 + 4 + 1.0 + lib + -1.0-0 + + -1-vs$(VSVer) + $(JsonGlibSeparateVSDllPrefix) + $(JsonGlibSeparateVSDllSuffix) + c:\python34 + + + <_PropertySheetDisplayName>jsonglibversionpathsprops + + + + $(VSVer) + + + $(GlibEtcInstallRoot) + + + $(CopyDir) + + + $(JsonGlibMajorVersion) + + + $(JsonGlibMinorVersion) + + + $(JsonGlibMicroVersion) + + + $(ApiVersion) + + + $(JsonGlibLibtoolCompatibleDllPrefix) + + + $(JsonGlibLibtoolCompatibleDllSuffix) + + + $(JsonGlibSeparateVSDllPrefix) + + + $(JsonGlibSeparateVSDllSuffix) + + + $(JsonGlibDllPrefix) + + + $(JsonGlibDllSuffix) + + + $(DefDir) + + + $(PythonPath) + + + diff --git a/build/win32/vs15/json-glib.sln b/build/win32/vs15/json-glib.sln new file mode 100644 index 0000000..60bdef6 --- /dev/null +++ b/build/win32/vs15/json-glib.sln @@ -0,0 +1,196 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "json-glib", "json-glib.vcxproj", "{469DB0A8-E33E-4112-A38C-52A168ECDC03}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "json-glib-validate", "json-glib-validate.vcxproj", "{FF640D73-9BCD-4B75-B63F-75175A3C9F68}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "json-glib-format", "json-glib-format.vcxproj", "{FF640D73-9BCD-4B75-B63F-75175A3C9F69}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "json-glib-install", "json-glib-install.vcxproj", "{41ABBEB6-693A-4E63-9DD7-EAAC437BC173}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "array", "array.vcxproj", "{9B2921C9-577F-418D-8341-6D79771DDCEC}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "builder", "builder.vcxproj", "{B7D32B02-3481-4A6E-8E0F-B43887F348A8}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generator", "generator.vcxproj", "{E84F9D53-C9F7-4D7D-B8D0-AFE8BE3E7B7D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvariant", "gvariant.vcxproj", "{AA52A332-735D-4177-8CA6-842018E60DED}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "node", "node.vcxproj", "{04658465-64F9-4F06-B7A7-D40F6EDF26E3}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "object", "object.vcxproj", "{83A444A0-D80E-40E0-90CF-5876E1AA97DB}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "path", "path.vcxproj", "{FF640D73-9BCD-4B75-B63F-75175A3C9F67}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "parser", "parser.vcxproj", "{BDF81D39-F7E1-4B34-80E5-4B979E10629F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reader", "reader.vcxproj", "{99FC597F-539A-49BB-9B9A-6C1EF802A17B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "serialize-complex", "serialize-complex.vcxproj", "{C3FCC23B-54CC-4447-B9A7-CE095EA60B16}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "serialize-full", "serialize-full.vcxproj", "{980282CA-EAEA-4F33-8982-39DAF018978A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "serialize-simple", "serialize-simple.vcxproj", "{27AFA4CD-917A-4155-9F61-025094A97933}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boxed", "boxed.vcxproj", "{5016D295-CC2F-4149-80C2-71D7A33791B2}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "invalid", "invalid.vcxproj", "{04658465-64F9-4F06-B7A7-D40F6EDF26E4}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {469DB0A8-E33E-4112-A38C-52A168ECDC03}.Debug|Win32.ActiveCfg = Debug|Win32 + {469DB0A8-E33E-4112-A38C-52A168ECDC03}.Debug|Win32.Build.0 = Debug|Win32 + {469DB0A8-E33E-4112-A38C-52A168ECDC03}.Debug|x64.ActiveCfg = Debug|x64 + {469DB0A8-E33E-4112-A38C-52A168ECDC03}.Debug|x64.Build.0 = Debug|x64 + {469DB0A8-E33E-4112-A38C-52A168ECDC03}.Release|Win32.ActiveCfg = Release|Win32 + {469DB0A8-E33E-4112-A38C-52A168ECDC03}.Release|Win32.Build.0 = Release|Win32 + {469DB0A8-E33E-4112-A38C-52A168ECDC03}.Release|x64.ActiveCfg = Release|x64 + {469DB0A8-E33E-4112-A38C-52A168ECDC03}.Release|x64.Build.0 = Release|x64 + {FF640D73-9BCD-4B75-B63F-75175A3C9F68}.Debug|Win32.ActiveCfg = Debug|Win32 + {FF640D73-9BCD-4B75-B63F-75175A3C9F68}.Debug|Win32.Build.0 = Debug|Win32 + {FF640D73-9BCD-4B75-B63F-75175A3C9F68}.Debug|x64.ActiveCfg = Debug|x64 + {FF640D73-9BCD-4B75-B63F-75175A3C9F68}.Debug|x64.Build.0 = Debug|x64 + {FF640D73-9BCD-4B75-B63F-75175A3C9F68}.Release|Win32.ActiveCfg = Release|Win32 + {FF640D73-9BCD-4B75-B63F-75175A3C9F68}.Release|Win32.Build.0 = Release|Win32 + {FF640D73-9BCD-4B75-B63F-75175A3C9F68}.Release|x64.ActiveCfg = Release|x64 + {FF640D73-9BCD-4B75-B63F-75175A3C9F68}.Release|x64.Build.0 = Release|x64 + {FF640D73-9BCD-4B75-B63F-75175A3C9F69}.Debug|Win32.ActiveCfg = Debug|Win32 + {FF640D73-9BCD-4B75-B63F-75175A3C9F69}.Debug|Win32.Build.0 = Debug|Win32 + {FF640D73-9BCD-4B75-B63F-75175A3C9F69}.Debug|x64.ActiveCfg = Debug|x64 + {FF640D73-9BCD-4B75-B63F-75175A3C9F69}.Debug|x64.Build.0 = Debug|x64 + {FF640D73-9BCD-4B75-B63F-75175A3C9F69}.Release|Win32.ActiveCfg = Release|Win32 + {FF640D73-9BCD-4B75-B63F-75175A3C9F69}.Release|Win32.Build.0 = Release|Win32 + {FF640D73-9BCD-4B75-B63F-75175A3C9F69}.Release|x64.ActiveCfg = Release|x64 + {FF640D73-9BCD-4B75-B63F-75175A3C9F69}.Release|x64.Build.0 = Release|x64 + {9B2921C9-577F-418D-8341-6D79771DDCEC}.Debug|Win32.ActiveCfg = Debug|Win32 + {9B2921C9-577F-418D-8341-6D79771DDCEC}.Debug|Win32.Build.0 = Debug|Win32 + {9B2921C9-577F-418D-8341-6D79771DDCEC}.Debug|x64.ActiveCfg = Debug|x64 + {9B2921C9-577F-418D-8341-6D79771DDCEC}.Debug|x64.Build.0 = Debug|x64 + {9B2921C9-577F-418D-8341-6D79771DDCEC}.Release|Win32.ActiveCfg = Release|Win32 + {9B2921C9-577F-418D-8341-6D79771DDCEC}.Release|Win32.Build.0 = Release|Win32 + {9B2921C9-577F-418D-8341-6D79771DDCEC}.Release|x64.ActiveCfg = Release|x64 + {9B2921C9-577F-418D-8341-6D79771DDCEC}.Release|x64.Build.0 = Release|x64 + {B7D32B02-3481-4A6E-8E0F-B43887F348A8}.Debug|Win32.ActiveCfg = Debug|Win32 + {B7D32B02-3481-4A6E-8E0F-B43887F348A8}.Debug|Win32.Build.0 = Debug|Win32 + {B7D32B02-3481-4A6E-8E0F-B43887F348A8}.Debug|x64.ActiveCfg = Debug|x64 + {B7D32B02-3481-4A6E-8E0F-B43887F348A8}.Debug|x64.Build.0 = Debug|x64 + {B7D32B02-3481-4A6E-8E0F-B43887F348A8}.Release|Win32.ActiveCfg = Release|Win32 + {B7D32B02-3481-4A6E-8E0F-B43887F348A8}.Release|Win32.Build.0 = Release|Win32 + {B7D32B02-3481-4A6E-8E0F-B43887F348A8}.Release|x64.ActiveCfg = Release|x64 + {B7D32B02-3481-4A6E-8E0F-B43887F348A8}.Release|x64.Build.0 = Release|x64 + {E84F9D53-C9F7-4D7D-B8D0-AFE8BE3E7B7D}.Debug|Win32.ActiveCfg = Debug|Win32 + {E84F9D53-C9F7-4D7D-B8D0-AFE8BE3E7B7D}.Debug|Win32.Build.0 = Debug|Win32 + {E84F9D53-C9F7-4D7D-B8D0-AFE8BE3E7B7D}.Debug|x64.ActiveCfg = Debug|x64 + {E84F9D53-C9F7-4D7D-B8D0-AFE8BE3E7B7D}.Debug|x64.Build.0 = Debug|x64 + {E84F9D53-C9F7-4D7D-B8D0-AFE8BE3E7B7D}.Release|Win32.ActiveCfg = Release|Win32 + {E84F9D53-C9F7-4D7D-B8D0-AFE8BE3E7B7D}.Release|Win32.Build.0 = Release|Win32 + {E84F9D53-C9F7-4D7D-B8D0-AFE8BE3E7B7D}.Release|x64.ActiveCfg = Release|x64 + {E84F9D53-C9F7-4D7D-B8D0-AFE8BE3E7B7D}.Release|x64.Build.0 = Release|x64 + {04658465-64F9-4F06-B7A7-D40F6EDF26E3}.Debug|Win32.ActiveCfg = Debug|Win32 + {04658465-64F9-4F06-B7A7-D40F6EDF26E3}.Debug|Win32.Build.0 = Debug|Win32 + {04658465-64F9-4F06-B7A7-D40F6EDF26E3}.Debug|x64.ActiveCfg = Debug|x64 + {04658465-64F9-4F06-B7A7-D40F6EDF26E3}.Debug|x64.Build.0 = Debug|x64 + {04658465-64F9-4F06-B7A7-D40F6EDF26E3}.Release|Win32.ActiveCfg = Release|Win32 + {04658465-64F9-4F06-B7A7-D40F6EDF26E3}.Release|Win32.Build.0 = Release|Win32 + {04658465-64F9-4F06-B7A7-D40F6EDF26E3}.Release|x64.ActiveCfg = Release|x64 + {04658465-64F9-4F06-B7A7-D40F6EDF26E3}.Release|x64.Build.0 = Release|x64 + {83A444A0-D80E-40E0-90CF-5876E1AA97DB}.Debug|Win32.ActiveCfg = Debug|Win32 + {83A444A0-D80E-40E0-90CF-5876E1AA97DB}.Debug|Win32.Build.0 = Debug|Win32 + {83A444A0-D80E-40E0-90CF-5876E1AA97DB}.Debug|x64.ActiveCfg = Debug|x64 + {83A444A0-D80E-40E0-90CF-5876E1AA97DB}.Debug|x64.Build.0 = Debug|x64 + {83A444A0-D80E-40E0-90CF-5876E1AA97DB}.Release|Win32.ActiveCfg = Release|Win32 + {83A444A0-D80E-40E0-90CF-5876E1AA97DB}.Release|Win32.Build.0 = Release|Win32 + {83A444A0-D80E-40E0-90CF-5876E1AA97DB}.Release|x64.ActiveCfg = Release|x64 + {83A444A0-D80E-40E0-90CF-5876E1AA97DB}.Release|x64.Build.0 = Release|x64 + {BDF81D39-F7E1-4B34-80E5-4B979E10629F}.Debug|Win32.ActiveCfg = Debug|Win32 + {BDF81D39-F7E1-4B34-80E5-4B979E10629F}.Debug|Win32.Build.0 = Debug|Win32 + {BDF81D39-F7E1-4B34-80E5-4B979E10629F}.Debug|x64.ActiveCfg = Debug|x64 + {BDF81D39-F7E1-4B34-80E5-4B979E10629F}.Debug|x64.Build.0 = Debug|x64 + {BDF81D39-F7E1-4B34-80E5-4B979E10629F}.Release|Win32.ActiveCfg = Release|Win32 + {BDF81D39-F7E1-4B34-80E5-4B979E10629F}.Release|Win32.Build.0 = Release|Win32 + {BDF81D39-F7E1-4B34-80E5-4B979E10629F}.Release|x64.ActiveCfg = Release|x64 + {BDF81D39-F7E1-4B34-80E5-4B979E10629F}.Release|x64.Build.0 = Release|x64 + {99FC597F-539A-49BB-9B9A-6C1EF802A17B}.Debug|Win32.ActiveCfg = Debug|Win32 + {99FC597F-539A-49BB-9B9A-6C1EF802A17B}.Debug|Win32.Build.0 = Debug|Win32 + {99FC597F-539A-49BB-9B9A-6C1EF802A17B}.Debug|x64.ActiveCfg = Debug|x64 + {99FC597F-539A-49BB-9B9A-6C1EF802A17B}.Debug|x64.Build.0 = Debug|x64 + {99FC597F-539A-49BB-9B9A-6C1EF802A17B}.Release|Win32.ActiveCfg = Release|Win32 + {99FC597F-539A-49BB-9B9A-6C1EF802A17B}.Release|Win32.Build.0 = Release|Win32 + {99FC597F-539A-49BB-9B9A-6C1EF802A17B}.Release|x64.ActiveCfg = Release|x64 + {99FC597F-539A-49BB-9B9A-6C1EF802A17B}.Release|x64.Build.0 = Release|x64 + {C3FCC23B-54CC-4447-B9A7-CE095EA60B16}.Debug|Win32.ActiveCfg = Debug|Win32 + {C3FCC23B-54CC-4447-B9A7-CE095EA60B16}.Debug|Win32.Build.0 = Debug|Win32 + {C3FCC23B-54CC-4447-B9A7-CE095EA60B16}.Debug|x64.ActiveCfg = Debug|x64 + {C3FCC23B-54CC-4447-B9A7-CE095EA60B16}.Debug|x64.Build.0 = Debug|x64 + {C3FCC23B-54CC-4447-B9A7-CE095EA60B16}.Release|Win32.ActiveCfg = Release|Win32 + {C3FCC23B-54CC-4447-B9A7-CE095EA60B16}.Release|Win32.Build.0 = Release|Win32 + {C3FCC23B-54CC-4447-B9A7-CE095EA60B16}.Release|x64.ActiveCfg = Release|x64 + {C3FCC23B-54CC-4447-B9A7-CE095EA60B16}.Release|x64.Build.0 = Release|x64 + {980282CA-EAEA-4F33-8982-39DAF018978A}.Debug|Win32.ActiveCfg = Debug|Win32 + {980282CA-EAEA-4F33-8982-39DAF018978A}.Debug|Win32.Build.0 = Debug|Win32 + {980282CA-EAEA-4F33-8982-39DAF018978A}.Debug|x64.ActiveCfg = Debug|x64 + {980282CA-EAEA-4F33-8982-39DAF018978A}.Debug|x64.Build.0 = Debug|x64 + {980282CA-EAEA-4F33-8982-39DAF018978A}.Release|Win32.ActiveCfg = Release|Win32 + {980282CA-EAEA-4F33-8982-39DAF018978A}.Release|Win32.Build.0 = Release|Win32 + {980282CA-EAEA-4F33-8982-39DAF018978A}.Release|x64.ActiveCfg = Release|x64 + {980282CA-EAEA-4F33-8982-39DAF018978A}.Release|x64.Build.0 = Release|x64 + {27AFA4CD-917A-4155-9F61-025094A97933}.Debug|Win32.ActiveCfg = Debug|Win32 + {27AFA4CD-917A-4155-9F61-025094A97933}.Debug|Win32.Build.0 = Debug|Win32 + {27AFA4CD-917A-4155-9F61-025094A97933}.Debug|x64.ActiveCfg = Debug|x64 + {27AFA4CD-917A-4155-9F61-025094A97933}.Debug|x64.Build.0 = Debug|x64 + {27AFA4CD-917A-4155-9F61-025094A97933}.Release|Win32.ActiveCfg = Release|Win32 + {27AFA4CD-917A-4155-9F61-025094A97933}.Release|Win32.Build.0 = Release|Win32 + {27AFA4CD-917A-4155-9F61-025094A97933}.Release|x64.ActiveCfg = Release|x64 + {27AFA4CD-917A-4155-9F61-025094A97933}.Release|x64.Build.0 = Release|x64 + {5016D295-CC2F-4149-80C2-71D7A33791B2}.Debug|Win32.ActiveCfg = Debug|Win32 + {5016D295-CC2F-4149-80C2-71D7A33791B2}.Debug|Win32.Build.0 = Debug|Win32 + {5016D295-CC2F-4149-80C2-71D7A33791B2}.Debug|x64.ActiveCfg = Debug|x64 + {5016D295-CC2F-4149-80C2-71D7A33791B2}.Debug|x64.Build.0 = Debug|x64 + {5016D295-CC2F-4149-80C2-71D7A33791B2}.Release|Win32.ActiveCfg = Release|Win32 + {5016D295-CC2F-4149-80C2-71D7A33791B2}.Release|Win32.Build.0 = Release|Win32 + {5016D295-CC2F-4149-80C2-71D7A33791B2}.Release|x64.ActiveCfg = Release|x64 + {5016D295-CC2F-4149-80C2-71D7A33791B2}.Release|x64.Build.0 = Release|x64 + {AA52A332-735D-4177-8CA6-842018E60DED}.Debug|Win32.ActiveCfg = Debug|Win32 + {AA52A332-735D-4177-8CA6-842018E60DED}.Debug|Win32.Build.0 = Debug|Win32 + {AA52A332-735D-4177-8CA6-842018E60DED}.Debug|x64.ActiveCfg = Debug|x64 + {AA52A332-735D-4177-8CA6-842018E60DED}.Debug|x64.Build.0 = Debug|x64 + {AA52A332-735D-4177-8CA6-842018E60DED}.Release|Win32.ActiveCfg = Release|Win32 + {AA52A332-735D-4177-8CA6-842018E60DED}.Release|Win32.Build.0 = Release|Win32 + {AA52A332-735D-4177-8CA6-842018E60DED}.Release|x64.ActiveCfg = Release|x64 + {AA52A332-735D-4177-8CA6-842018E60DED}.Release|x64.Build.0 = Release|x64 + {FF640D73-9BCD-4B75-B63F-75175A3C9F67}.Debug|Win32.ActiveCfg = Debug|Win32 + {FF640D73-9BCD-4B75-B63F-75175A3C9F67}.Debug|Win32.Build.0 = Debug|Win32 + {FF640D73-9BCD-4B75-B63F-75175A3C9F67}.Debug|x64.ActiveCfg = Debug|x64 + {FF640D73-9BCD-4B75-B63F-75175A3C9F67}.Debug|x64.Build.0 = Debug|x64 + {FF640D73-9BCD-4B75-B63F-75175A3C9F67}.Release|Win32.ActiveCfg = Release|Win32 + {FF640D73-9BCD-4B75-B63F-75175A3C9F67}.Release|Win32.Build.0 = Release|Win32 + {FF640D73-9BCD-4B75-B63F-75175A3C9F67}.Release|x64.ActiveCfg = Release|x64 + {FF640D73-9BCD-4B75-B63F-75175A3C9F67}.Release|x64.Build.0 = Release|x64 + {41ABBEB6-693A-4E63-9DD7-EAAC437BC173}.Debug|Win32.ActiveCfg = Debug|Win32 + {41ABBEB6-693A-4E63-9DD7-EAAC437BC173}.Debug|Win32.Build.0 = Debug|Win32 + {41ABBEB6-693A-4E63-9DD7-EAAC437BC173}.Debug|x64.ActiveCfg = Debug|x64 + {41ABBEB6-693A-4E63-9DD7-EAAC437BC173}.Debug|x64.Build.0 = Debug|x64 + {41ABBEB6-693A-4E63-9DD7-EAAC437BC173}.Release|Win32.ActiveCfg = Release|Win32 + {41ABBEB6-693A-4E63-9DD7-EAAC437BC173}.Release|Win32.Build.0 = Release|Win32 + {41ABBEB6-693A-4E63-9DD7-EAAC437BC173}.Release|x64.ActiveCfg = Release|x64 + {41ABBEB6-693A-4E63-9DD7-EAAC437BC173}.Release|x64.Build.0 = Release|x64 + {04658465-64F9-4F06-B7A7-D40F6EDF26E4}.Debug|Win32.ActiveCfg = Debug|Win32 + {04658465-64F9-4F06-B7A7-D40F6EDF26E4}.Debug|Win32.Build.0 = Debug|Win32 + {04658465-64F9-4F06-B7A7-D40F6EDF26E4}.Debug|x64.ActiveCfg = Debug|x64 + {04658465-64F9-4F06-B7A7-D40F6EDF26E4}.Debug|x64.Build.0 = Debug|x64 + {04658465-64F9-4F06-B7A7-D40F6EDF26E4}.Release|Win32.ActiveCfg = Release|Win32 + {04658465-64F9-4F06-B7A7-D40F6EDF26E4}.Release|Win32.Build.0 = Release|Win32 + {04658465-64F9-4F06-B7A7-D40F6EDF26E4}.Release|x64.ActiveCfg = Release|x64 + {04658465-64F9-4F06-B7A7-D40F6EDF26E4}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/build/win32/vs15/json-glib.vcxproj b/build/win32/vs15/json-glib.vcxproj new file mode 100644 index 0000000..f9938a4 --- /dev/null +++ b/build/win32/vs15/json-glib.vcxproj @@ -0,0 +1,203 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {469DB0A8-E33E-4112-A38C-52A168ECDC03} + jsonglib + Win32Proj + + + + DynamicLibrary + MultiByte + true + v141 + + + DynamicLibrary + MultiByte + v141 + + + DynamicLibrary + MultiByte + v141 + + + DynamicLibrary + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + true + false + + + + + + Disabled + %(AdditionalIncludeDirectories) + _DEBUG;$(JsonGlibDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + %(ForcedIncludeFiles) + + + $(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).dll + true + Windows + $(TargetDir)$(ProjectName)-$(ApiVersion).lib + $(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).pdb + MachineX86 + + + + + + + Disabled + _DEBUG;$(JsonGlibDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + %(AdditionalDependencies) + $(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).dll + true + Windows + $(TargetDir)$(ProjectName)-$(ApiVersion).lib + $(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).pdb + MachineX64 + + + + + + + MaxSpeed + true + %(AdditionalIncludeDirectories) + $(JsonGlibDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + %(ForcedIncludeFiles) + + + $(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).dll + true + Windows + true + true + $(TargetDir)$(ProjectName)-$(ApiVersion).lib + $(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).pdb + MachineX86 + + + + + + + $(JsonGlibDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + %(AdditionalDependencies) + $(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).dll + true + Windows + true + true + $(TargetDir)$(ProjectName)-$(ApiVersion).lib + $(OutDir)$(JsonGlibDllPrefix)$(ProjectName)$(JsonGlibDllSuffix).pdb + MachineX64 + + + + + + + + + + + + + + + + + + + + + + + + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + + + + + + diff --git a/build/win32/vs15/json-glib.vcxproj.filters b/build/win32/vs15/json-glib.vcxproj.filters new file mode 100644 index 0000000..85fbf5f --- /dev/null +++ b/build/win32/vs15/json-glib.vcxproj.filters @@ -0,0 +1,39 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + + + Resource Files + + diff --git a/build/win32/vs15/node.vcxproj b/build/win32/vs15/node.vcxproj new file mode 100644 index 0000000..05ebe32 --- /dev/null +++ b/build/win32/vs15/node.vcxproj @@ -0,0 +1,171 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {04658465-64F9-4F06-B7A7-D40F6EDF26E3} + node + Win32Proj + + + + Application + MultiByte + true + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + true + v141 + + + Application + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + %(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + %(ForcedIncludeFiles) + + + true + Console + MachineX86 + + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + MachineX64 + + + + + + + + + MaxSpeed + true + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + %(ForcedIncludeFiles) + + + %(AdditionalDependencies) + true + Console + true + true + MachineX86 + + + + + %(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + true + true + MachineX64 + + + + + + + + {469db0a8-e33e-4112-a38c-52a168ecdc03} + false + + + + + + diff --git a/build/win32/vs15/node.vcxproj.filters b/build/win32/vs15/node.vcxproj.filters new file mode 100644 index 0000000..32c66c2 --- /dev/null +++ b/build/win32/vs15/node.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Sources + + + diff --git a/build/win32/vs15/object.vcxproj b/build/win32/vs15/object.vcxproj new file mode 100644 index 0000000..c550ec4 --- /dev/null +++ b/build/win32/vs15/object.vcxproj @@ -0,0 +1,171 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {83A444A0-D80E-40E0-90CF-5876E1AA97DB} + object + Win32Proj + + + + Application + MultiByte + true + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + true + v141 + + + Application + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + %(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + %(ForcedIncludeFiles) + + + true + Console + MachineX86 + + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + MachineX64 + + + + + + + + + MaxSpeed + true + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + %(ForcedIncludeFiles) + + + %(AdditionalDependencies) + true + Console + true + true + MachineX86 + + + + + %(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + true + true + MachineX64 + + + + + + + + {469db0a8-e33e-4112-a38c-52a168ecdc03} + false + + + + + + diff --git a/build/win32/vs15/object.vcxproj.filters b/build/win32/vs15/object.vcxproj.filters new file mode 100644 index 0000000..d6e9a5b --- /dev/null +++ b/build/win32/vs15/object.vcxproj.filters @@ -0,0 +1,13 @@ + + + + + {48deb3fb-fef6-49a6-82dc-c39cb01b4098} + + + + + Sources + + + diff --git a/build/win32/vs15/parser.vcxproj b/build/win32/vs15/parser.vcxproj new file mode 100644 index 0000000..768b4a1 --- /dev/null +++ b/build/win32/vs15/parser.vcxproj @@ -0,0 +1,171 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {BDF81D39-F7E1-4B34-80E5-4B979E10629F} + parser + Win32Proj + + + + Application + MultiByte + true + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + true + v141 + + + Application + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + %(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + %(ForcedIncludeFiles) + + + true + Console + MachineX86 + + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + MachineX64 + + + + + + + + + MaxSpeed + true + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + %(ForcedIncludeFiles) + + + %(AdditionalDependencies) + true + Console + true + true + MachineX86 + + + + + %(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + true + true + MachineX64 + + + + + + + + {469db0a8-e33e-4112-a38c-52a168ecdc03} + false + + + + + + diff --git a/build/win32/vs15/parser.vcxproj.filters b/build/win32/vs15/parser.vcxproj.filters new file mode 100644 index 0000000..c164d40 --- /dev/null +++ b/build/win32/vs15/parser.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Sources + + + diff --git a/build/win32/vs15/path.vcxproj b/build/win32/vs15/path.vcxproj new file mode 100644 index 0000000..9a04de6 --- /dev/null +++ b/build/win32/vs15/path.vcxproj @@ -0,0 +1,162 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {FF640D73-9BCD-4B75-B63F-75175A3C9F67} + path + Win32Proj + + + + Application + MultiByte + true + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + true + v141 + + + Application + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + MachineX64 + + + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + %(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + true + true + MachineX64 + + + + + + + + {469db0a8-e33e-4112-a38c-52a168ecdc03} + false + + + + + + diff --git a/build/win32/vs15/path.vcxproj.filters b/build/win32/vs15/path.vcxproj.filters new file mode 100644 index 0000000..80ca3d1 --- /dev/null +++ b/build/win32/vs15/path.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Sources + + + diff --git a/build/win32/vs15/reader.vcxproj b/build/win32/vs15/reader.vcxproj new file mode 100644 index 0000000..f665774 --- /dev/null +++ b/build/win32/vs15/reader.vcxproj @@ -0,0 +1,172 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {99FC597F-539A-49BB-9B9A-6C1EF802A17B} + reader + Win32Proj + + + + Application + MultiByte + true + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + true + v141 + + + Application + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + %(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + %(ForcedIncludeFiles) + + + %(AdditionalDependencies) + true + Console + MachineX86 + + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + MachineX64 + + + + + + + + + MaxSpeed + true + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + %(ForcedIncludeFiles) + + + %(AdditionalDependencies) + true + Console + true + true + MachineX86 + + + + + %(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + true + true + MachineX64 + + + + + + + + {469db0a8-e33e-4112-a38c-52a168ecdc03} + false + + + + + + diff --git a/build/win32/vs15/reader.vcxproj.filters b/build/win32/vs15/reader.vcxproj.filters new file mode 100644 index 0000000..1049043 --- /dev/null +++ b/build/win32/vs15/reader.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Sources + + + diff --git a/build/win32/vs15/serialize-complex.vcxproj b/build/win32/vs15/serialize-complex.vcxproj new file mode 100644 index 0000000..39658a8 --- /dev/null +++ b/build/win32/vs15/serialize-complex.vcxproj @@ -0,0 +1,170 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {C3FCC23B-54CC-4447-B9A7-CE095EA60B16} + serializecomplex + Win32Proj + + + + Application + MultiByte + true + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + true + v141 + + + Application + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + %(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + %(ForcedIncludeFiles) + + + true + Console + MachineX86 + + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + MachineX64 + + + + + + + + + MaxSpeed + true + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + %(AdditionalDependencies) + true + Console + true + true + MachineX86 + + + + + %(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + true + true + MachineX64 + + + + + + + + {469db0a8-e33e-4112-a38c-52a168ecdc03} + false + + + + + + diff --git a/build/win32/vs15/serialize-complex.vcxproj.filters b/build/win32/vs15/serialize-complex.vcxproj.filters new file mode 100644 index 0000000..5a2d8b5 --- /dev/null +++ b/build/win32/vs15/serialize-complex.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Sources + + + diff --git a/build/win32/vs15/serialize-full.vcxproj b/build/win32/vs15/serialize-full.vcxproj new file mode 100644 index 0000000..f6c7f98 --- /dev/null +++ b/build/win32/vs15/serialize-full.vcxproj @@ -0,0 +1,171 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {980282CA-EAEA-4F33-8982-39DAF018978A} + serializefull + Win32Proj + + + + Application + MultiByte + true + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + true + v141 + + + Application + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + %(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + %(ForcedIncludeFiles) + + + true + Console + MachineX86 + + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + MachineX64 + + + + + + + + + MaxSpeed + true + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + %(ForcedIncludeFiles) + + + %(AdditionalDependencies) + true + Console + true + true + MachineX86 + + + + + %(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + true + true + MachineX64 + + + + + + + + {469db0a8-e33e-4112-a38c-52a168ecdc03} + false + + + + + + diff --git a/build/win32/vs15/serialize-full.vcxproj.filters b/build/win32/vs15/serialize-full.vcxproj.filters new file mode 100644 index 0000000..b7c69b9 --- /dev/null +++ b/build/win32/vs15/serialize-full.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Sources + + + diff --git a/build/win32/vs15/serialize-simple.vcxproj b/build/win32/vs15/serialize-simple.vcxproj new file mode 100644 index 0000000..3686afc --- /dev/null +++ b/build/win32/vs15/serialize-simple.vcxproj @@ -0,0 +1,170 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {27AFA4CD-917A-4155-9F61-025094A97933} + serializesimple + Win32Proj + + + + Application + MultiByte + true + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + true + v141 + + + Application + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + %(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + %(ForcedIncludeFiles) + + + true + Console + MachineX86 + + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + MachineX64 + + + + + + + + + MaxSpeed + true + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + %(ForcedIncludeFiles) + + + true + Console + true + true + MachineX86 + + + + + %(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + true + true + MachineX64 + + + + + + + + {469db0a8-e33e-4112-a38c-52a168ecdc03} + false + + + + + + diff --git a/build/win32/vs15/serialize-simple.vcxproj.filters b/build/win32/vs15/serialize-simple.vcxproj.filters new file mode 100644 index 0000000..3fc20bd --- /dev/null +++ b/build/win32/vs15/serialize-simple.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Sources + + + diff --git a/build/win32/vs9/Makefile.in b/build/win32/vs9/Makefile.in index ab1dd27..f2468f0 100644 --- a/build/win32/vs9/Makefile.in +++ b/build/win32/vs9/Makefile.in @@ -116,7 +116,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = json-glib-version-paths.vsprops CONFIG_CLEAN_VPATH_FILES = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -138,7 +138,8 @@ am__can_run_installinfo = \ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -am__DIST_COMMON = $(srcdir)/Makefile.in +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(srcdir)/json-glib-version-paths.vsprops.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -386,6 +387,8 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +json-glib-version-paths.vsprops: $(top_builddir)/config.status $(srcdir)/json-glib-version-paths.vsprops.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -rm -f *.lo diff --git a/build/win32/vs9/json-glib-install.vcproj b/build/win32/vs9/json-glib-install.vcproj index a530235..e766144 100644 --- a/build/win32/vs9/json-glib-install.vcproj +++ b/build/win32/vs9/json-glib-install.vcproj @@ -71,6 +71,46 @@ + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/json-glib-install.vsprops b/build/win32/vs9/json-glib-install.vsprops index ff76dcd..9171067 100644 --- a/build/win32/vs9/json-glib-install.vsprops +++ b/build/win32/vs9/json-glib-install.vsprops @@ -30,6 +30,11 @@ copy ..\..\..\json-glib\json-version-macros.h $(CopyDir)\include\json-glib-1.0\j copy ..\..\..\json-glib\json-enum-types.h $(CopyDir)\include\json-glib-1.0\json-glib\json-enum-types.h copy ..\..\..\json-glib\json-version.h $(CopyDir)\include\json-glib-1.0\json-glib\json-version.h copy ..\..\..\json-glib\json-glib.h $(CopyDir)\include\json-glib-1.0\json-glib\json-glib.h +if exist ..\json-glib.pc copy ..\json-glib.pc $(CopyDir)\lib\pkgconfig " /> + diff --git a/build/win32/vs9/json-glib-install.vspropsin b/build/win32/vs9/json-glib-install.vspropsin index b7ca293..b09ba25 100644 --- a/build/win32/vs9/json-glib-install.vspropsin +++ b/build/win32/vs9/json-glib-install.vspropsin @@ -21,6 +21,12 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\json-glib-*.pdb $(Co mkdir $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib #include "json-glib.headers" + +if exist ..\json-glib.pc copy ..\json-glib.pc $(CopyDir)\lib\pkgconfig " /> + diff --git a/build/win32/vs9/json-glib-version-paths.vsprops b/build/win32/vs9/json-glib-version-paths.vsprops index cade5f9..180d6e2 100644 --- a/build/win32/vs9/json-glib-version-paths.vsprops +++ b/build/win32/vs9/json-glib-version-paths.vsprops @@ -21,6 +21,18 @@ Value="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)" /> + + + @@ -50,4 +62,8 @@ Name="JsonGlibDllSuffix" Value="$(JsonGlibSeparateVSDllSuffix)" /> + diff --git a/build/win32/vs9/json-glib-version-paths.vsprops.in b/build/win32/vs9/json-glib-version-paths.vsprops.in new file mode 100644 index 0000000..e65e282 --- /dev/null +++ b/build/win32/vs9/json-glib-version-paths.vsprops.in @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/json-glib.vcproj b/build/win32/vs9/json-glib.vcproj index 01dfba4..0f738e5 100644 --- a/build/win32/vs9/json-glib.vcproj +++ b/build/win32/vs9/json-glib.vcproj @@ -161,7 +161,6 @@ - . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='json-glib' PACKAGE_TARNAME='json-glib' -PACKAGE_VERSION='1.2.2' -PACKAGE_STRING='json-glib 1.2.2' +PACKAGE_VERSION='1.2.4' +PACKAGE_STRING='json-glib 1.2.4' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=json-glib' PACKAGE_URL='http://live.gnome.org/JsonGlib' @@ -638,6 +638,10 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +MSVC_NO_TOOLSET_SET_FALSE +MSVC_NO_TOOLSET_SET_TRUE +MSVC_BASE_NO_TOOLSET_SET_FALSE +MSVC_BASE_NO_TOOLSET_SET_TRUE ALL_LINGUAS GETTEXT_PACKAGE POSUB @@ -1431,7 +1435,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures json-glib 1.2.2 to adapt to many kinds of systems. +\`configure' configures json-glib 1.2.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1501,7 +1505,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of json-glib 1.2.2:";; + short | recursive ) echo "Configuration of json-glib 1.2.4:";; esac cat <<\_ACEOF @@ -1650,7 +1654,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -json-glib configure 1.2.2 +json-glib configure 1.2.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1928,7 +1932,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by json-glib $as_me 1.2.2, which was +It was created by json-glib $as_me 1.2.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2798,7 +2802,7 @@ fi # Define the identity of the package. PACKAGE='json-glib' - VERSION='1.2.2' + VERSION='1.2.4' # Some tools Automake needs. @@ -12511,8 +12515,8 @@ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" JSON_MAJOR_VERSION=1 JSON_MINOR_VERSION=2 -JSON_MICRO_VERSION=2 -JSON_VERSION=1.2.2 +JSON_MICRO_VERSION=4 +JSON_VERSION=1.2.4 JSON_RELEASE_STATUS=release @@ -12521,7 +12525,7 @@ JSON_RELEASE_STATUS=release JSON_LT_CURRENT=200 -JSON_LT_REVISION=2 +JSON_LT_REVISION=4 JSON_LT_AGE=200 JSON_LT_VERSION="$JSON_LT_CURRENT:$JSON_LT_REVISION:$JSON_LT_AGE" JSON_LT_LDFLAGS="-version-info $JSON_LT_VERSION" @@ -15858,11 +15862,28 @@ $as_echo_n "checking for linguas... " >&6; } $as_echo "$ALL_LINGUAS" >&6; } + if test x$MSVC_BASE_TOOLSET = x; then + MSVC_BASE_NO_TOOLSET_SET_TRUE= + MSVC_BASE_NO_TOOLSET_SET_FALSE='#' +else + MSVC_BASE_NO_TOOLSET_SET_TRUE='#' + MSVC_BASE_NO_TOOLSET_SET_FALSE= +fi + + if test x$MSVC_TOOLSET = x; then + MSVC_NO_TOOLSET_SET_TRUE= + MSVC_NO_TOOLSET_SET_FALSE='#' +else + MSVC_NO_TOOLSET_SET_TRUE='#' + MSVC_NO_TOOLSET_SET_FALSE= +fi + -ac_config_files="$ac_config_files Makefile build/Makefile build/autotools/Makefile build/win32/Makefile build/win32/config.h.win32 build/win32/vs9/Makefile build/win32/vs10/Makefile build/win32/vs11/Makefile build/win32/vs12/Makefile build/win32/vs14/Makefile json-glib/Makefile json-glib/json-glib.pc json-glib/json-version.h json-glib/tests/Makefile doc/Makefile doc/reference/Makefile doc/reference/version.xml po/Makefile.in" + +ac_config_files="$ac_config_files Makefile build/Makefile build/autotools/Makefile build/win32/Makefile build/win32/config.h.win32 build/win32/vs9/Makefile build/win32/vs9/json-glib-version-paths.vsprops build/win32/vs10/Makefile build/win32/vs10/json-glib-version-paths.props build/win32/vs11/Makefile build/win32/vs12/Makefile build/win32/vs14/Makefile build/win32/vs15/Makefile json-glib/Makefile json-glib/json-glib.pc json-glib/json-version.h json-glib/tests/Makefile doc/Makefile doc/reference/Makefile doc/reference/version.xml po/Makefile.in" cat >confcache <<\_ACEOF @@ -16050,6 +16071,14 @@ if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}" as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${MSVC_BASE_NO_TOOLSET_SET_TRUE}" && test -z "${MSVC_BASE_NO_TOOLSET_SET_FALSE}"; then + as_fn_error $? "conditional \"MSVC_BASE_NO_TOOLSET_SET\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${MSVC_NO_TOOLSET_SET_TRUE}" && test -z "${MSVC_NO_TOOLSET_SET_FALSE}"; then + as_fn_error $? "conditional \"MSVC_NO_TOOLSET_SET\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -16447,7 +16476,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by json-glib $as_me 1.2.2, which was +This file was extended by json-glib $as_me 1.2.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16514,7 +16543,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -json-glib config.status 1.2.2 +json-glib config.status 1.2.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -16943,10 +16972,13 @@ do "build/win32/Makefile") CONFIG_FILES="$CONFIG_FILES build/win32/Makefile" ;; "build/win32/config.h.win32") CONFIG_FILES="$CONFIG_FILES build/win32/config.h.win32" ;; "build/win32/vs9/Makefile") CONFIG_FILES="$CONFIG_FILES build/win32/vs9/Makefile" ;; + "build/win32/vs9/json-glib-version-paths.vsprops") CONFIG_FILES="$CONFIG_FILES build/win32/vs9/json-glib-version-paths.vsprops" ;; "build/win32/vs10/Makefile") CONFIG_FILES="$CONFIG_FILES build/win32/vs10/Makefile" ;; + "build/win32/vs10/json-glib-version-paths.props") CONFIG_FILES="$CONFIG_FILES build/win32/vs10/json-glib-version-paths.props" ;; "build/win32/vs11/Makefile") CONFIG_FILES="$CONFIG_FILES build/win32/vs11/Makefile" ;; "build/win32/vs12/Makefile") CONFIG_FILES="$CONFIG_FILES build/win32/vs12/Makefile" ;; "build/win32/vs14/Makefile") CONFIG_FILES="$CONFIG_FILES build/win32/vs14/Makefile" ;; + "build/win32/vs15/Makefile") CONFIG_FILES="$CONFIG_FILES build/win32/vs15/Makefile" ;; "json-glib/Makefile") CONFIG_FILES="$CONFIG_FILES json-glib/Makefile" ;; "json-glib/json-glib.pc") CONFIG_FILES="$CONFIG_FILES json-glib/json-glib.pc" ;; "json-glib/json-version.h") CONFIG_FILES="$CONFIG_FILES json-glib/json-version.h" ;; diff --git a/configure.ac b/configure.ac index b26ca16..8c17f68 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # bump micro_version to the next odd number after each release m4_define([json_major_version], [1]) m4_define([json_minor_version], [2]) -m4_define([json_micro_version], [2]) +m4_define([json_micro_version], [4]) m4_define([json_version], [json_major_version.json_minor_version.json_micro_version]) @@ -13,7 +13,7 @@ m4_define([json_release_status], # bump up by 1 for every micro release with no API changes, otherwise # set to 0. after release, bump up by 1 -m4_define([json_interface_age], [2]) +m4_define([json_interface_age], [4]) m4_define([json_binary_age], [m4_eval(100 * json_minor_version + json_micro_version)]) m4_define([lt_current], [m4_eval(100 * json_minor_version + json_micro_version - json_interface_age)]) @@ -361,6 +361,10 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], [The prefix for our gettext translation domains.]) AS_ALL_LINGUAS +dnl === MSVC toolset ========================================================== +AM_CONDITIONAL(MSVC_BASE_NO_TOOLSET_SET, [test x$MSVC_BASE_TOOLSET = x]) +AM_CONDITIONAL(MSVC_NO_TOOLSET_SET, [test x$MSVC_TOOLSET = x]) + dnl === Output ================================================================ AC_SUBST(JSON_CFLAGS) @@ -374,10 +378,13 @@ AC_CONFIG_FILES([ build/win32/Makefile build/win32/config.h.win32 build/win32/vs9/Makefile + build/win32/vs9/json-glib-version-paths.vsprops build/win32/vs10/Makefile + build/win32/vs10/json-glib-version-paths.props build/win32/vs11/Makefile build/win32/vs12/Makefile build/win32/vs14/Makefile + build/win32/vs15/Makefile json-glib/Makefile json-glib/json-glib.pc diff --git a/doc/reference/Makefile.in b/doc/reference/Makefile.in index e8fa41f..d009f87 100644 --- a/doc/reference/Makefile.in +++ b/doc/reference/Makefile.in @@ -1091,38 +1091,38 @@ $(REPORT_FILES): sgml-build.stamp setup-build.stamp: -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \ - if test "x$$files" != "x" ; then \ - for file in $$files ; do \ - destdir=`dirname $(abs_builddir)/$$file`; \ - test -d "$$destdir" || mkdir -p "$$destdir"; \ - test -f $(abs_srcdir)/$$file && \ - cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ - done; \ - fi; \ + files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \ + if test "x$$files" != "x" ; then \ + for file in $$files ; do \ + destdir=`dirname $(abs_builddir)/$$file`; \ + test -d "$$destdir" || mkdir -p "$$destdir"; \ + test -f $(abs_srcdir)/$$file && \ + cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ + done; \ + fi; \ fi $(AM_V_at)touch setup-build.stamp scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(GTK_DOC_V_SCAN)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ - _source_dir="$${_source_dir} --source-dir=$$i" ; \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ - scanobj_options=""; \ - gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$$?" = "0"; then \ - if test "x$(V)" = "x1"; then \ - scanobj_options="--verbose"; \ - fi; \ + scanobj_options=""; \ + gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$$?" = "0"; then \ + if test "x$(V)" = "x1"; then \ + scanobj_options="--verbose"; \ fi; \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ - gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ + fi; \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ + gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ else \ - for i in $(SCANOBJ_FILES) ; do \ - test -f $$i || touch $$i ; \ - done \ + for i in $(SCANOBJ_FILES) ; do \ + test -f $$i || touch $$i ; \ + done \ fi $(AM_V_at)touch scan-build.stamp @@ -1132,7 +1132,7 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE) sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent $(GTK_DOC_V_XML)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ - _source_dir="$${_source_dir} --source-dir=$$i" ; \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) $(AM_V_at)touch sgml-build.stamp @@ -1167,12 +1167,8 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_con cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) -@test "x$(HTML_IMAGES)" = "x" || \ for file in $(HTML_IMAGES) ; do \ - if test -f $(abs_srcdir)/$$file ; then \ - cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ - fi; \ - if test -f $(abs_builddir)/$$file ; then \ - cp $(abs_builddir)/$$file $(abs_builddir)/html; \ - fi; \ + test -f $(abs_srcdir)/$$file && cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ + test -f $(abs_builddir)/$$file && cp $(abs_builddir)/$$file $(abs_builddir)/html; \ done; $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) $(AM_V_at)touch html-build.stamp diff --git a/doc/reference/html/JsonBuilder.html b/doc/reference/html/JsonBuilder.html index 0075ee9..9fa9a90 100644 --- a/doc/reference/html/JsonBuilder.html +++ b/doc/reference/html/JsonBuilder.html @@ -3,12 +3,12 @@ JsonBuilder: JSON-GLib Reference Manual - + - + @@ -35,7 +35,7 @@

Functions

-
+
@@ -166,7 +166,7 @@

Properties

-
+
@@ -181,7 +181,7 @@

Types and Values

-
+
@@ -250,7 +250,7 @@ json_builder_get_root (

Parameters

-
+
@@ -279,7 +279,7 @@ json_builder_reset (

Parameters

-
+
@@ -305,7 +305,7 @@ the subarray,

Parameters

-
+
@@ -335,7 +335,7 @@ recent call to Cannot be called after json_builder_set_member_name().

Parameters

-
+
@@ -366,7 +366,7 @@ the subobject,

Parameters

-
+
@@ -396,7 +396,7 @@ open an object or an array.

Can be called only if the call is associated to an object.

Parameters

-
+
@@ -433,7 +433,7 @@ recent call to Cannot be called after json_builder_set_member_name().

Parameters

-
+
@@ -466,7 +466,7 @@ recent opened array.

The builder will take ownership of the JsonNode.

Parameters

-
+
@@ -506,7 +506,7 @@ recent opened array.

See also: json_builder_add_value()

Parameters

-
+
@@ -546,7 +546,7 @@ recent opened array.

See also: json_builder_add_value()

Parameters

-
+
@@ -586,7 +586,7 @@ recent opened array.

See also: json_builder_add_value()

Parameters

-
+
@@ -626,7 +626,7 @@ recent opened array.

See also: json_builder_add_value()

Parameters

-
+
@@ -663,7 +663,7 @@ recent opened array.

See also: json_builder_add_value()

Parameters

-
+
@@ -721,6 +721,6 @@ of traversing it to make it immutable later.

-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/JsonGenerator.html b/doc/reference/html/JsonGenerator.html index 83887d7..ec7de2a 100644 --- a/doc/reference/html/JsonGenerator.html +++ b/doc/reference/html/JsonGenerator.html @@ -3,12 +3,12 @@ JsonGenerator: JSON-GLib Reference Manual - + - + @@ -35,7 +35,7 @@

Functions

-
+
@@ -142,7 +142,7 @@

Properties

-
+
@@ -175,7 +175,7 @@

Types and Values

-
+
@@ -231,7 +231,7 @@ the

Parameters

-
+
@@ -261,7 +261,7 @@ json_generator_get_root (json_generator_set_root().

Parameters

-
+
@@ -293,7 +293,7 @@ indentation character specified in the “indent” property.

Parameters

-
+
@@ -323,7 +323,7 @@ json_generator_get_pretty (json_generator_set_pretty().

Parameters

-
+
@@ -352,7 +352,7 @@ json_generator_set_indent (

Parameters

-
+
@@ -383,7 +383,7 @@ json_generator_get_indent (json_generator_set_indent().

Parameters

-
+
@@ -411,7 +411,7 @@ json_generator_set_indent_char (Sets the character to be used when indenting

Parameters

-
+
@@ -441,7 +441,7 @@ json_generator_get_indent_char (Retrieves the value set using json_generator_set_indent_char().

Parameters

-
+
@@ -472,7 +472,7 @@ json_generator_to_file (

Parameters

-
+
@@ -513,7 +513,7 @@ json_generator_to_data (

Parameters

-
+
@@ -552,7 +552,7 @@ json_generator_to_stream (

Parameters

-
+
@@ -647,6 +647,6 @@ stream.

-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/JsonParser.html b/doc/reference/html/JsonParser.html index a3c840d..a233071 100644 --- a/doc/reference/html/JsonParser.html +++ b/doc/reference/html/JsonParser.html @@ -3,12 +3,12 @@ JsonParser: JSON-GLib Reference Manual - + - + @@ -36,7 +36,7 @@

Functions

-
+
@@ -135,7 +135,7 @@

Properties

-
+
@@ -150,7 +150,7 @@

Signals

-
+
@@ -207,7 +207,7 @@

Types and Values

-
+
@@ -280,7 +280,7 @@ json_parser_load_from_file (json_parser_load_from_data().

Parameters

-
+
@@ -325,7 +325,7 @@ multiple times with the same

Parameters

-
+
@@ -380,7 +380,7 @@ on the passed error .

Parameters

-
+
@@ -436,7 +436,7 @@ then call

Parameters

-
+
@@ -485,7 +485,7 @@ json_parser_load_from_stream_finish (json_parser_load_from_stream_async().

Parameters

-
+
@@ -526,7 +526,7 @@ json_parser_get_root (

Parameters

-
+
@@ -558,7 +558,7 @@ function from outside the signal handlers emitted by

Parameters

-
+
@@ -588,7 +588,7 @@ function from outside the signal handlers emitted by

Parameters

-
+
@@ -632,7 +632,7 @@ existence of the assignment in the data stream and the variable name used.

Parameters

-
+
@@ -672,7 +672,7 @@ never be modified or freed.

This enumeration can be extended at later date

Members

-
+
@@ -775,7 +775,7 @@ private and should only be accessed via the provided API.

JsonParser class.

Members

-
+
@@ -859,7 +859,7 @@ has successfully parsed a single element of a

Parameters

-
+
@@ -902,7 +902,7 @@ user_function (JsonArray

Parameters

-
+
@@ -939,7 +939,7 @@ user_function (JsonArray

Parameters

-
+
@@ -972,7 +972,7 @@ user_function (

Parameters

-
+
@@ -1010,7 +1010,7 @@ user_function (JsonObject.

Parameters

-
+
@@ -1050,7 +1050,7 @@ has successfully parsed a single member of a

Parameters

-
+
@@ -1092,7 +1092,7 @@ user_function (JsonObject.

Parameters

-
+
@@ -1124,7 +1124,7 @@ user_function (

Parameters

-
+
@@ -1156,7 +1156,7 @@ user_function (

Parameters

-
+
@@ -1181,6 +1181,6 @@ a JSON data stream.

-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/JsonPath.html b/doc/reference/html/JsonPath.html index 8582fb0..5a253ea 100644 --- a/doc/reference/html/JsonPath.html +++ b/doc/reference/html/JsonPath.html @@ -3,12 +3,12 @@ JsonPath: JSON-GLib Reference Manual - + - + @@ -34,7 +34,7 @@

Functions

-
+
@@ -77,7 +77,7 @@

Types and Values

-
+
@@ -327,7 +327,7 @@ json_path_compile (json_path_match().

Parameters

-
+
@@ -374,7 +374,7 @@ into the JsonNode.

Parameters

-
+
@@ -419,7 +419,7 @@ matches it against the JSON tree pointed by root

Parameters

-
+
@@ -485,7 +485,7 @@ cannot be directly accessed.

Error code enumeration for the JSON_PATH_ERROR domain.

Members

-
+
@@ -505,6 +505,6 @@ cannot be directly accessed.

-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/JsonReader.html b/doc/reference/html/JsonReader.html index 2a94964..20bada7 100644 --- a/doc/reference/html/JsonReader.html +++ b/doc/reference/html/JsonReader.html @@ -3,12 +3,12 @@ JsonReader: JSON-GLib Reference Manual - + - + @@ -35,7 +35,7 @@

Functions

-
+
@@ -203,7 +203,7 @@

Properties

-
+
@@ -219,7 +219,7 @@

Types and Values

-
+
@@ -326,7 +326,7 @@ the JSON tree starting from node

Parameters

-
+
@@ -360,7 +360,7 @@ a copy of root

If another JsonNode is currently set as root, it will be replaced.

Parameters

-
+
@@ -471,7 +471,7 @@ code paths:

Parameters

-
+
@@ -508,7 +508,7 @@ inside an array

, if any was set

Parameters

-
+
@@ -532,7 +532,7 @@ json_reader_is_array (

Parameters

-
+
@@ -562,7 +562,7 @@ json_reader_count_elements (

Parameters

-
+
@@ -670,7 +670,7 @@ defined in the object, the

Parameters

-
+
@@ -707,7 +707,7 @@ inside an object

, if any was set

Parameters

-
+
@@ -731,7 +731,7 @@ json_reader_is_object (

Parameters

-
+
@@ -761,7 +761,7 @@ json_reader_count_members (

Parameters

-
+
@@ -791,7 +791,7 @@ json_reader_list_members (

Parameters

-
+
@@ -821,7 +821,7 @@ json_reader_get_member_name (

Parameters

-
+
@@ -850,7 +850,7 @@ json_reader_is_value (

Parameters

-
+
@@ -879,7 +879,7 @@ json_reader_get_value (

Parameters

-
+
@@ -910,7 +910,7 @@ json_reader_get_int_value (

Parameters

-
+
@@ -938,7 +938,7 @@ json_reader_get_double_value (

Parameters

-
+
@@ -966,7 +966,7 @@ json_reader_get_string_value (

Parameters

-
+
@@ -994,7 +994,7 @@ json_reader_get_boolean_value (

Parameters

-
+
@@ -1022,7 +1022,7 @@ json_reader_get_null_value (

Parameters

-
+
@@ -1051,7 +1051,7 @@ json_reader_get_error (

Parameters

-
+
@@ -1096,7 +1096,7 @@ be accessed using the provided API

Error codes enumeration for JsonReader errors

Members

-
+
@@ -1180,6 +1180,6 @@ be accessed using the provided API

-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/annotation-glossary.html b/doc/reference/html/annotation-glossary.html index 334a670..bc96151 100644 --- a/doc/reference/html/annotation-glossary.html +++ b/doc/reference/html/annotation-glossary.html @@ -3,12 +3,12 @@ Annotation Glossary: JSON-GLib Reference Manual - + - + @@ -75,6 +75,6 @@

Override the parsed C type with given type.

-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/ch01.html b/doc/reference/html/ch01.html index f0fb7aa..6ce0229 100644 --- a/doc/reference/html/ch01.html +++ b/doc/reference/html/ch01.html @@ -3,12 +3,12 @@ Data Types: JSON-GLib Reference Manual - + - + @@ -35,6 +35,6 @@
-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/ch02.html b/doc/reference/html/ch02.html index 875ab60..1196301 100644 --- a/doc/reference/html/ch02.html +++ b/doc/reference/html/ch02.html @@ -3,12 +3,12 @@ Parser: JSON-GLib Reference Manual - + - + @@ -35,6 +35,6 @@
-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/ch03.html b/doc/reference/html/ch03.html index 82ebee4..7fe9c71 100644 --- a/doc/reference/html/ch03.html +++ b/doc/reference/html/ch03.html @@ -3,12 +3,12 @@ Generator: JSON-GLib Reference Manual - + - + @@ -32,6 +32,6 @@
-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/ch04.html b/doc/reference/html/ch04.html index 3b633f8..af44f8a 100644 --- a/doc/reference/html/ch04.html +++ b/doc/reference/html/ch04.html @@ -3,12 +3,12 @@ General Purpose API: JSON-GLib Reference Manual - + - + @@ -27,6 +27,6 @@
-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/ch06.html b/doc/reference/html/ch06.html index 9a00578..8b3ad8d 100644 --- a/doc/reference/html/ch06.html +++ b/doc/reference/html/ch06.html @@ -3,12 +3,12 @@ Object Hierarchy: JSON-GLib Reference Manual - + - + @@ -29,15 +29,15 @@ ├── JsonParser ├── JsonPath ╰── JsonReader - GInterface + GInterface ╰── JsonSerializable - GBoxed + GBoxed ├── JsonArray ├── JsonNode ╰── JsonObject
-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/index.html b/doc/reference/html/index.html index 7901f39..f99fbfd 100644 --- a/doc/reference/html/index.html +++ b/doc/reference/html/index.html @@ -3,10 +3,10 @@ JSON-GLib Reference Manual: JSON-GLib Reference Manual - + - + @@ -14,8 +14,7 @@
-

for JSON-GLib 1.2.2 -

+

for JSON-GLib 1.2.4

Copyright © 2007, 2008 OpenedHand LTD

Copyright © 2009, 2010, 2011 Intel Corporation

@@ -135,6 +134,6 @@
-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1
\ No newline at end of file diff --git a/doc/reference/html/ix01.html b/doc/reference/html/ix01.html index a0a0c57..eb3deb1 100644 --- a/doc/reference/html/ix01.html +++ b/doc/reference/html/ix01.html @@ -3,12 +3,12 @@ Index: JSON-GLib Reference Manual - + - + @@ -1069,6 +1069,6 @@
-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1
\ No newline at end of file diff --git a/doc/reference/html/ix02.html b/doc/reference/html/ix02.html index 1f1338e..4c929ca 100644 --- a/doc/reference/html/ix02.html +++ b/doc/reference/html/ix02.html @@ -3,12 +3,12 @@ Index of deprecated symbols: JSON-GLib Reference Manual - + - + @@ -43,6 +43,6 @@
-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1
\ No newline at end of file diff --git a/doc/reference/html/ix03.html b/doc/reference/html/ix03.html index 25b7999..65b6482 100644 --- a/doc/reference/html/ix03.html +++ b/doc/reference/html/ix03.html @@ -3,12 +3,12 @@ Index of new symbols in 0.4: JSON-GLib Reference Manual - + - + @@ -50,6 +50,6 @@
-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/ix04.html b/doc/reference/html/ix04.html index 408a439..d9bbcf4 100644 --- a/doc/reference/html/ix04.html +++ b/doc/reference/html/ix04.html @@ -3,12 +3,12 @@ Index of new symbols in 0.6: JSON-GLib Reference Manual - + - + @@ -43,6 +43,6 @@
-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/ix05.html b/doc/reference/html/ix05.html index 1f74118..6c05c69 100644 --- a/doc/reference/html/ix05.html +++ b/doc/reference/html/ix05.html @@ -3,12 +3,12 @@ Index of new symbols in 0.8: JSON-GLib Reference Manual - + - + @@ -175,6 +175,6 @@
-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/ix06.html b/doc/reference/html/ix06.html index dda4a4c..cc7bcf3 100644 --- a/doc/reference/html/ix06.html +++ b/doc/reference/html/ix06.html @@ -3,12 +3,12 @@ Index of new symbols in 0.10: JSON-GLib Reference Manual - + - + @@ -110,6 +110,6 @@
-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/ix07.html b/doc/reference/html/ix07.html index 6e9f740..35753c2 100644 --- a/doc/reference/html/ix07.html +++ b/doc/reference/html/ix07.html @@ -3,12 +3,12 @@ Index of new symbols in 0.12: JSON-GLib Reference Manual - + - + @@ -150,6 +150,6 @@
-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/ix08.html b/doc/reference/html/ix08.html index 7f78dac..01be230 100644 --- a/doc/reference/html/ix08.html +++ b/doc/reference/html/ix08.html @@ -3,12 +3,12 @@ Index of new symbols in 0.14: JSON-GLib Reference Manual - + - + @@ -134,6 +134,6 @@
-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/ix09.html b/doc/reference/html/ix09.html index fd3ca0b..f8df76c 100644 --- a/doc/reference/html/ix09.html +++ b/doc/reference/html/ix09.html @@ -3,12 +3,12 @@ Index of new symbols in 0.16: JSON-GLib Reference Manual - + - + @@ -61,6 +61,6 @@
-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/ix10.html b/doc/reference/html/ix10.html index a237e23..0deb7de 100644 --- a/doc/reference/html/ix10.html +++ b/doc/reference/html/ix10.html @@ -3,12 +3,12 @@ Index of new symbols in 1.0: JSON-GLib Reference Manual - + - + @@ -33,6 +33,6 @@
-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/ix11.html b/doc/reference/html/ix11.html index 2b334ef..1d43c69 100644 --- a/doc/reference/html/ix11.html +++ b/doc/reference/html/ix11.html @@ -3,12 +3,12 @@ Index of new symbols in 1.2: JSON-GLib Reference Manual - + - + @@ -150,6 +150,6 @@
-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/json-advanced.html b/doc/reference/html/json-advanced.html index 695a403..a150e6b 100644 --- a/doc/reference/html/json-advanced.html +++ b/doc/reference/html/json-advanced.html @@ -3,12 +3,12 @@ Part IV. JSON-GLib Advanced API: JSON-GLib Reference Manual - + - + @@ -44,6 +44,6 @@
-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/json-base.html b/doc/reference/html/json-base.html index eddad51..520409c 100644 --- a/doc/reference/html/json-base.html +++ b/doc/reference/html/json-base.html @@ -3,12 +3,12 @@ Part II. JSON-GLib Reference: JSON-GLib Reference Manual - + - + @@ -55,6 +55,6 @@
-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/json-format-tool.html b/doc/reference/html/json-format-tool.html index b4c62b7..df3f9e3 100644 --- a/doc/reference/html/json-format-tool.html +++ b/doc/reference/html/json-format-tool.html @@ -3,12 +3,12 @@ json-glib-format: JSON-GLib Reference Manual - + - + @@ -78,6 +78,6 @@ This argument is only considered if --prettify is us
-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/json-glib-Boxed-Types-Serialization.html b/doc/reference/html/json-glib-Boxed-Types-Serialization.html index c5dbd4e..f1b27aa 100644 --- a/doc/reference/html/json-glib-Boxed-Types-Serialization.html +++ b/doc/reference/html/json-glib-Boxed-Types-Serialization.html @@ -3,12 +3,12 @@ Boxed Types Serialization: JSON-GLib Reference Manual - + - + @@ -33,7 +33,7 @@

Functions

-
+
@@ -108,11 +108,11 @@

Description

-

GLib's GBoxed type is a generic wrapper for arbitrary C structures.

-

JSON-GLib allows serialization and deserialization of a GBoxed type +

GLib's GBoxed type is a generic wrapper for arbitrary C structures.

+

JSON-GLib allows serialization and deserialization of a GBoxed type by registering functions mapping a JsonNodeType to a specific GType.

-

When registering a GBoxed type you should also register the +

When registering a GBoxed type you should also register the corresponding transformation functions, e.g.:

@@ -169,8 +169,8 @@ it will be passed a pointer to the C structure and it must return a JsonNode. The deserialization function will be invoked by json_boxed_deserialize(): it will be passed a JsonNode for the declared type and it must return a newly allocated C structure.

-

It is possible to check whether a GBoxed type can be deserialized -from a specific JsonNodeType, and whether a GBoxed can be serialized +

It is possible to check whether a GBoxed type can be deserialized +from a specific JsonNodeType, and whether a GBoxed can be serialized and to which specific JsonNodeType.

@@ -179,10 +179,10 @@ and to which specific

JsonBoxedSerializeFunc ()

JsonNode *
 (*JsonBoxedSerializeFunc) (gconstpointer boxed);
-

Serializes the passed GBoxed and stores it inside a JsonNode

+

Serializes the passed GBoxed and stores it inside a JsonNode

Parameters

-
+
@@ -190,7 +190,7 @@ and to which specific

boxed

- +

a GBoxed

a GBoxed

  
@@ -206,10 +206,10 @@ and to which specific

JsonBoxedDeserializeFunc ()

gpointer
 (*JsonBoxedDeserializeFunc) (JsonNode *node);
-

Deserializes the contents of the passed JsonNode into a GBoxed

+

Deserializes the contents of the passed JsonNode into a GBoxed

Parameters

-
+
@@ -235,14 +235,14 @@ and to which specific GType gboxed_type, JsonNodeType node_type, JsonBoxedSerializeFunc serialize_func); -

Registers a serialization function for a GBoxed of type gboxed_type +

Registers a serialization function for a GBoxed of type gboxed_type to a JsonNode of type node_type

[skip]

Parameters

-
+
@@ -279,14 +279,14 @@ a Js json_boxed_register_deserialize_func (GType gboxed_type, JsonNodeType node_type, JsonBoxedDeserializeFunc deserialize_func); -

Registers a deserialization function for a GBoxed of type gboxed_type +

Registers a deserialization function for a GBoxed of type gboxed_type from a JsonNode of type node_type

[skip]

Parameters

-
+
@@ -322,7 +322,7 @@ a Js 
gboolean
 json_boxed_can_serialize (GType gboxed_type,
                           JsonNodeType *node_type);
-

Checks whether it is possible to serialize a GBoxed of +

Checks whether it is possible to serialize a GBoxed of type gboxed_type into a JsonNode. The type of the JsonNode is placed inside node_type @@ -330,7 +330,7 @@ type gboxed_type returns TRUE and it's undefined otherwise.

Parameters

-
+
@@ -364,13 +364,13 @@ and FALSE otherwise.

gboolean
 json_boxed_can_deserialize (GType gboxed_type,
                             JsonNodeType node_type);
-

Checks whether it is possible to deserialize a GBoxed of +

Checks whether it is possible to deserialize a GBoxed of type gboxed_type from a JsonNode of type node_type

Parameters

-
+
@@ -403,12 +403,12 @@ type gboxed_type json_boxed_serialize (GType gboxed_type, gconstpointer boxed);

Serializes boxed -, a pointer to a GBoxed of type gboxed_type +, a pointer to a GBoxed of type gboxed_type , into a JsonNode

Parameters

-
+
@@ -422,7 +422,7 @@ into a

boxed

- @@ -444,11 +444,11 @@ boxed type, or NULL if serialization either failed json_boxed_deserialize (GType gboxed_type, JsonNode *node);

Deserializes node - into a GBoxed of gboxed_type + into a GBoxed of gboxed_type

Parameters

-

a pointer to a GBoxed of type gboxed_type +

a pointer to a GBoxed of type gboxed_type

 
+
@@ -470,7 +470,7 @@ json_boxed_deserialize (GType

Returns

-

the newly allocated GBoxed. Use +

the newly allocated GBoxed. Use g_boxed_free() to release the resources allocated by this function.

[transfer full]

@@ -483,6 +483,6 @@ function.

-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/json-glib-GObject-Serialization.html b/doc/reference/html/json-glib-GObject-Serialization.html index 0e7e8ae..9a2e68a 100644 --- a/doc/reference/html/json-glib-GObject-Serialization.html +++ b/doc/reference/html/json-glib-GObject-Serialization.html @@ -3,12 +3,12 @@ GObject Serialization: JSON-GLib Reference Manual - + - + @@ -33,7 +33,7 @@

Functions

-
+
@@ -112,7 +112,7 @@ instance. Each member of the returned JSON object will map to a property of the GObject

Parameters

-
+
@@ -145,7 +145,7 @@ json_gobject_deserialize (GTypeJsonObject

Parameters

-
+
@@ -191,7 +191,7 @@ implementation will be use to translate the compatible types into JSON native types.

Parameters

-
+
@@ -234,7 +234,7 @@ will be used to translate the compatible JSON native types.

Note: the JSON data stream must be an object declaration.

Parameters

-
+
@@ -292,7 +292,7 @@ will be used to translate the compatible JSON native types.

Note: the JSON data stream must be an object declaration.

Parameters

-
+
@@ -346,7 +346,7 @@ its properties; otherwise, the default implementation will be use to translate the compatible types into JSON native types.

Parameters

-
+
@@ -377,6 +377,6 @@ translate the compatible types into JSON native types.

-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/json-glib-JSON-Array.html b/doc/reference/html/json-glib-JSON-Array.html index f90004c..8c4e23e 100644 --- a/doc/reference/html/json-glib-JSON-Array.html +++ b/doc/reference/html/json-glib-JSON-Array.html @@ -3,12 +3,12 @@ JSON Array: JSON-GLib Reference Manual - + - + @@ -34,7 +34,7 @@

Functions

-
+
@@ -284,7 +284,7 @@

Types and Values

-
+
@@ -297,7 +297,7 @@

Object Hierarchy

-
    GBoxed
+
    GBoxed
     ╰── JsonArray
@@ -337,7 +337,7 @@ json_array_sized_new (guint[constructor]

Parameters

-
+
@@ -364,7 +364,7 @@ json_array_ref (JsonArray.

Parameters

-
+
@@ -394,7 +394,7 @@ reference count reaches zero, the array is destroyed and all its allocated resources are freed.

Parameters

-
+
@@ -419,7 +419,7 @@ recursively seal all elements in the array too.

is already immutable, this is a no-op.

Parameters

-
+
@@ -444,7 +444,7 @@ json_array_is_immutable (json_array_seal() on it.

Parameters

-
+
@@ -476,7 +476,7 @@ the array is immutable, this is a fast operation; otherwise, it scales proportionally with the length of the array.

Parameters

-
+
@@ -509,7 +509,7 @@ number of elements, and the values of elements in corresponding positions are equal.

Parameters

-
+
@@ -549,7 +549,7 @@ json_array_add_element (JsonNode.

Parameters

-
+
@@ -581,7 +581,7 @@ json_array_get_element (JsonArray.

Parameters

-
+
@@ -618,7 +618,7 @@ element at index_ inside a JsonArray

Parameters

-
+
@@ -654,7 +654,7 @@ json_array_get_elements (JsonArray as a list of JsonNode instances.

Parameters

-
+
@@ -684,7 +684,7 @@ json_array_get_length (JsonArray

Parameters

-
+
@@ -714,7 +714,7 @@ json_array_remove_element (

Parameters

-
+
@@ -750,7 +750,7 @@ this function. It is safe to change the value of ele .

Parameters

-
+
@@ -802,7 +802,7 @@ remove elements from the array .

Parameters

-
+
@@ -842,7 +842,7 @@ of the newly added See also: json_array_add_element(), json_node_take_array()

Parameters

-
+
@@ -877,7 +877,7 @@ inside array

See also: json_array_get_element(), json_node_get_array()

Parameters

-
+
@@ -916,7 +916,7 @@ json_array_add_boolean_element (See also: json_array_add_element(), json_node_set_boolean()

Parameters

-
+
@@ -951,7 +951,7 @@ inside array

See also: json_array_get_element(), json_node_get_boolean()

Parameters

-
+
@@ -989,7 +989,7 @@ json_array_add_double_element (See also: json_array_add_element(), json_node_set_double()

Parameters

-
+
@@ -1024,7 +1024,7 @@ json_array_get_double_element (See also: json_array_get_element(), json_node_get_double()

Parameters

-
+
@@ -1062,7 +1062,7 @@ json_array_add_int_element (json_array_add_element(), json_node_set_int()

Parameters

-
+
@@ -1097,7 +1097,7 @@ inside array

See also: json_array_get_element(), json_node_get_int()

Parameters

-
+
@@ -1133,7 +1133,7 @@ json_array_add_null_element (json_array_add_element(), JSON_NODE_NULL

Parameters

-
+
@@ -1159,7 +1159,7 @@ json_array_get_null_element (json_array_get_element(), JSON_NODE_TYPE(), JSON_NODE_NULL

Parameters

-
+
@@ -1198,7 +1198,7 @@ of the newly added

See also: json_array_add_element(), json_node_take_object()

Parameters

-
+
@@ -1233,7 +1233,7 @@ inside array

See also: json_array_get_element(), json_node_get_object()

Parameters

-
+
@@ -1272,7 +1272,7 @@ json_array_add_string_element (See also: json_array_add_element(), json_node_set_string()

Parameters

-
+
@@ -1307,7 +1307,7 @@ inside array

See also: json_array_get_element(), json_node_get_string()

Parameters

-
+
@@ -1346,6 +1346,6 @@ and should only be accessed by the provided API

-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/json-glib-JSON-GVariant-Integration.html b/doc/reference/html/json-glib-JSON-GVariant-Integration.html index 4097757..542ec10 100644 --- a/doc/reference/html/json-glib-JSON-GVariant-Integration.html +++ b/doc/reference/html/json-glib-JSON-GVariant-Integration.html @@ -3,12 +3,12 @@ JSON GVariant Integration: JSON-GLib Reference Manual - + - + @@ -33,7 +33,7 @@

Functions

-
+
@@ -127,7 +127,7 @@ json_gvariant_serialize (GVariant to a JSON tree.

Parameters

-
+
@@ -161,7 +161,7 @@ is actually a helper function. It uses JsonGenerator to stringify it.

Parameters

-
+
@@ -216,7 +216,7 @@ in the JSON nodes.

by the caller code.

Parameters

-
+
@@ -266,7 +266,7 @@ The string is first converted to a

Parameters

-
+
@@ -312,6 +312,6 @@ with signature
-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/json-glib-JSON-Node.html b/doc/reference/html/json-glib-JSON-Node.html index 52d4fb6..b0c71da 100644 --- a/doc/reference/html/json-glib-JSON-Node.html +++ b/doc/reference/html/json-glib-JSON-Node.html @@ -3,12 +3,12 @@ JSON Node: JSON-GLib Reference Manual - + - + @@ -34,7 +34,7 @@

Functions

-
+
@@ -447,7 +447,7 @@

Types and Values

-
+
@@ -466,7 +466,7 @@

Object Hierarchy

-
    GBoxed
+
    GBoxed
     ╰── JsonNode
@@ -511,7 +511,7 @@ and

Parameters

-
+
@@ -535,7 +535,7 @@ and

Parameters

-
+
@@ -566,7 +566,7 @@ and JSON_NODE_VALUE

Parameters

-
+
@@ -590,7 +590,7 @@ and JSON_NODE_OBJECT

Parameters

-
+
@@ -614,7 +614,7 @@ and JSON_NODE_ARRAY

Parameters

-
+
@@ -638,7 +638,7 @@ and JSON_NODE_NULL

Parameters

-
+
@@ -682,7 +682,7 @@ json_node_init (

Parameters

-
+
@@ -723,7 +723,7 @@ json_node_init_int (

Parameters

-
+
@@ -763,7 +763,7 @@ json_node_init_double (

Parameters

-
+
@@ -803,7 +803,7 @@ json_node_init_boolean (

Parameters

-
+
@@ -843,7 +843,7 @@ json_node_init_string (

Parameters

-
+
@@ -881,7 +881,7 @@ json_node_init_null (

Parameters

-
+
@@ -916,7 +916,7 @@ json_node_init_object (

Parameters

-
+
@@ -959,7 +959,7 @@ json_node_init_array (

Parameters

-
+
@@ -1011,7 +1011,7 @@ and it's the equivalent of:

[constructor]

Parameters

-
+
@@ -1044,7 +1044,7 @@ immutable.

there should be no need to copy an immutable node.

Parameters

-
+
@@ -1072,7 +1072,7 @@ json_node_free (

Parameters

-
+
@@ -1095,7 +1095,7 @@ json_node_ref (

Parameters

-
+
@@ -1126,7 +1126,7 @@ json_node_unref (

Parameters

-
+
@@ -1151,7 +1151,7 @@ json_node_is_immutable (json_node_seal() on it.

Parameters

-
+
@@ -1185,7 +1185,7 @@ sealed, etc.

is already immutable, this is a no-op.

Parameters

-
+
@@ -1213,7 +1213,7 @@ with the size of the node’s value (for example, with the number of members in the JsonObject if this node contains an object).

Parameters

-
+
@@ -1247,7 +1247,7 @@ compared numerically, ignoring type, so a double value 4.0 is equal to the integer value 4.

Parameters

-
+
@@ -1287,7 +1287,7 @@ json_node_set_array (

Parameters

-
+
@@ -1320,7 +1320,7 @@ json_node_take_array (

Parameters

-
+
@@ -1346,10 +1346,11 @@ json_node_take_array (

json_node_get_array ()

JsonArray *
 json_node_get_array (JsonNode *node);
-

Retrieves the JsonArray stored inside a JsonNode

+

Retrieves the JsonArray stored inside a JsonNode. If the node does not +hold an array value, NULL is returned.

Parameters

-
+
@@ -1365,7 +1366,7 @@ json_node_get_array (

Returns

the JsonArray.

-

[transfer none]

+

[transfer none][nullable]

@@ -1374,10 +1375,11 @@ json_node_get_array (JsonArray * json_node_dup_array (JsonNode *node);

Retrieves the JsonArray stored inside a JsonNode and returns it -with its reference count increased by one.

+with its reference count increased by one. If the node does not hold an +array value, NULL is returned.

Parameters

-
+
@@ -1394,7 +1396,7 @@ with its reference count increased by one.

Returns

the JsonArray with its reference count increased.

-

[transfer full]

+

[transfer full][nullable]

@@ -1412,7 +1414,7 @@ json_node_set_object (

Parameters

-
+
@@ -1446,7 +1448,7 @@ json_node_take_object (

Parameters

-
+
@@ -1472,10 +1474,11 @@ json_node_take_object (

json_node_get_object ()

JsonObject *
 json_node_get_object (JsonNode *node);
-

Retrieves the JsonObject stored inside a JsonNode

+

Retrieves the JsonObject stored inside a JsonNode. If the node does not +hold an object value, NULL is returned.

Parameters

-
+
@@ -1491,7 +1494,7 @@ json_node_get_object (

Returns

the JsonObject.

-

[transfer none]

+

[transfer none][nullable]

@@ -1501,10 +1504,11 @@ json_node_get_object (JsonNode *node);

Retrieves the JsonObject inside node . The reference count of -the returned object is increased.

+the returned object is increased. If the node does not hold an object value, +NULL is returned.

Parameters

-
+
@@ -1520,7 +1524,7 @@ the returned object is increased.

Returns

the JsonObject.

-

[transfer full]

+

[transfer full][nullable]

@@ -1535,7 +1539,7 @@ json_node_set_value (

Parameters

-
+
@@ -1564,10 +1568,12 @@ json_node_get_value (GValue *value);

Retrieves a value from a JsonNode and copies into value . When done -using it, call g_value_unset() on the GValue.

+using it, call g_value_unset() on the GValue. If the node does not hold a +scalar value, value + is not modified.

Parameters

-
+
@@ -1601,7 +1607,7 @@ content.

It is an error to call this on an immutable node.

Parameters

-
+
@@ -1627,10 +1633,13 @@ content.

json_node_get_boolean ()

gboolean
 json_node_get_boolean (JsonNode *node);
-

Gets the boolean value stored inside a JsonNode

+

Gets the boolean value stored inside a JsonNode. If the node holds an +integer or double value which is zero, FALSE is returned; otherwise TRUE +is returned. If the node holds a JSON_NODE_NULL value or a value of another +non-boolean type, FALSE is returned.

Parameters

-
+
@@ -1661,7 +1670,7 @@ content.

It is an error to call this on an immutable node.

Parameters

-
+
@@ -1687,10 +1696,14 @@ content.

json_node_get_double ()

gdouble
 json_node_get_double (JsonNode *node);
-

Gets the double value stored inside a JsonNode

+

Gets the double value stored inside a JsonNode. If the node holds an integer +value, it is returned as a double. If the node holds a FALSE boolean value, +0.0 is returned; otherwise a non-zero double is returned. If the node holds +a JSON_NODE_NULL value or a value of another non-double type, 0.0 is +returned.

Parameters

-
+
@@ -1721,7 +1734,7 @@ content.

It is an error to call this on an immutable node.

Parameters

-
+
@@ -1747,10 +1760,14 @@ content.

json_node_get_int ()

gint64
 json_node_get_int (JsonNode *node);
-

Gets the integer value stored inside a JsonNode

+

Gets the integer value stored inside a JsonNode. If the node holds a double +value, its integer component is returned. If the node holds a FALSE boolean +value, 0 is returned; otherwise a non-zero integer is returned. If the +node holds a JSON_NODE_NULL value or a value of another non-integer type, +0 is returned.

Parameters

-
+
@@ -1781,7 +1798,7 @@ content.

It is an error to call this on an immutable node.

Parameters

-
+
@@ -1807,10 +1824,11 @@ content.

json_node_get_string ()

const gchar *
 json_node_get_string (JsonNode *node);
-

Gets the string value stored inside a JsonNode

+

Gets the string value stored inside a JsonNode. If the node does not hold a +string value, NULL is returned.

Parameters

-
+
@@ -1825,7 +1843,8 @@ json_node_get_string (

Returns

-

a string value.

+

a string value.

+

[nullable]

@@ -1833,10 +1852,11 @@ json_node_get_string (

json_node_dup_string ()

gchar *
 json_node_dup_string (JsonNode *node);
-

Gets a copy of the string value stored inside a JsonNode

+

Gets a copy of the string value stored inside a JsonNode. If the node does +not hold a string value, NULL is returned.

Parameters

-
+
@@ -1851,9 +1871,10 @@ json_node_dup_string (

Returns

-

a newly allocated string containing a copy -of the JsonNode contents. Use g_free() to free the allocated resources.

-

[transfer full]

+

a newly allocated string +containing a copy of the JsonNode contents. Use g_free() to free the +allocated resources.

+

[transfer full][nullable]

@@ -1870,7 +1891,7 @@ json_node_set_parent (

Parameters

-
+
@@ -1902,7 +1923,7 @@ json_node_get_parent (

Parameters

-
+
@@ -1918,9 +1939,8 @@ json_node_get_parent (

Returns

the parent node, or NULL if node -is -the root node.

-

[transfer none]

+is the root node.

+

[transfer none][nullable]

@@ -1932,7 +1952,7 @@ json_node_type_name (

Parameters

-
+
@@ -1959,7 +1979,7 @@ json_node_get_value_type (GType of the payload of the node.

Parameters

-
+
@@ -1987,7 +2007,7 @@ json_node_get_node_type (

Parameters

-
+
@@ -2017,7 +2037,7 @@ json_node_is_null (JSON_NODE_NULL represents a 'null' value in the JSON tree.

Parameters

-
+
@@ -2048,7 +2068,7 @@ decomposition or normalisation. This is not explicitly mentioned in the JSON standard (ECMA-404), but is assumed.

Parameters

-
+
@@ -2079,7 +2099,7 @@ json_string_equal (gconstpointer< are equal UTF-8 JSON strings.

Parameters

-
+
@@ -2119,7 +2139,7 @@ json_string_compare (gconstpointe over them in strcmp() style.

Parameters

-
+
@@ -2160,7 +2180,7 @@ greater than zero if a

Indicates the content of a JsonNode.

Members

-
+
@@ -2210,6 +2230,6 @@ functions and never directly.

-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/json-glib-JSON-Object.html b/doc/reference/html/json-glib-JSON-Object.html index 2d08fce..e1e1c02 100644 --- a/doc/reference/html/json-glib-JSON-Object.html +++ b/doc/reference/html/json-glib-JSON-Object.html @@ -3,12 +3,12 @@ JSON Object: JSON-GLib Reference Manual - + - + @@ -34,7 +34,7 @@

Functions

-
+
@@ -316,7 +316,7 @@

Types and Values

-
+
@@ -335,7 +335,7 @@

Object Hierarchy

-
    GBoxed
+
    GBoxed
     ╰── JsonObject
@@ -375,7 +375,7 @@ json_object_ref (JsonObject.

Parameters

-
+
@@ -405,7 +405,7 @@ reference count reaches zero, the object is destroyed and all its allocated resources are freed.

Parameters

-
+
@@ -430,7 +430,7 @@ recursively seal all members of the object too.

is already immutable, this is a no-op.

Parameters

-
+
@@ -455,7 +455,7 @@ json_object_is_immutable (json_object_seal() on it.

Parameters

-
+
@@ -487,7 +487,7 @@ the object is immutable, this is a fast operation; otherwise, it scales proportionally with the number of members in the object.

Parameters

-
+
@@ -519,7 +519,7 @@ json_object_equal (gconstpointer< set of members, and the values of corresponding members are equal.

Parameters

-
+
@@ -568,7 +568,7 @@ The object will take ownership of the

Parameters

-
+
@@ -613,7 +613,7 @@ member is added to object .

Parameters

-
+
@@ -651,7 +651,7 @@ json_object_has_member (

Parameters

-
+
@@ -687,7 +687,7 @@ json_object_get_member (JsonObject.

Parameters

-
+
@@ -725,7 +725,7 @@ json_object_dup_member (JsonObject

Parameters

-
+
@@ -762,7 +762,7 @@ json_object_get_members (json_object_get_member().

Parameters

-
+
@@ -793,7 +793,7 @@ json_object_get_values (JsonObject.

Parameters

-
+
@@ -823,7 +823,7 @@ json_object_get_size (JsonObject.

Parameters

-
+
@@ -852,7 +852,7 @@ json_object_remove_member (

Parameters

-
+
@@ -888,7 +888,7 @@ this function. It is safe to change the value of mem .

Parameters

-
+
@@ -940,7 +940,7 @@ remove members from the object .

Parameters

-
+
@@ -1006,7 +1006,7 @@ json_object_iter_init (

Parameters

-
+
@@ -1046,7 +1046,7 @@ set to invalid values. After that point, the iterJsonObject is modified during iteration.

Parameters

-
+
@@ -1099,7 +1099,7 @@ json_object_set_array_member (json_object_set_member()

Parameters

-
+
@@ -1139,7 +1139,7 @@ stored in member_name

See also: json_object_get_member()

Parameters

-
+
@@ -1181,7 +1181,7 @@ json_object_set_boolean_member (See also: json_object_set_member()

Parameters

-
+
@@ -1221,7 +1221,7 @@ stored in member_name

See also: json_object_get_member()

Parameters

-
+
@@ -1262,7 +1262,7 @@ of member_name

See also: json_object_set_member()

Parameters

-
+
@@ -1302,7 +1302,7 @@ stored in member_name

See also: json_object_get_member()

Parameters

-
+
@@ -1343,7 +1343,7 @@ json_object_set_int_member (json_object_set_member()

Parameters

-
+
@@ -1383,7 +1383,7 @@ stored in member_name

See also: json_object_get_member()

Parameters

-
+
@@ -1423,7 +1423,7 @@ json_object_set_null_member (json_object_set_member()

Parameters

-
+
@@ -1458,7 +1458,7 @@ stored in member_name

See also: json_object_get_member()

Parameters

-
+
@@ -1501,7 +1501,7 @@ json_object_set_object_member (See also: json_object_set_member()

Parameters

-
+
@@ -1543,7 +1543,7 @@ which does not exist.

See also: json_object_get_member()

Parameters

-
+
@@ -1586,7 +1586,7 @@ json_object_set_string_member (See also: json_object_set_member()

Parameters

-
+
@@ -1626,7 +1626,7 @@ stored in member_name

See also: json_object_get_member()

Parameters

-
+
@@ -1678,6 +1678,6 @@ never be accessed directly.

-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/json-glib-Serializable-Interface.html b/doc/reference/html/json-glib-Serializable-Interface.html index 3f883d1..e174af5 100644 --- a/doc/reference/html/json-glib-Serializable-Interface.html +++ b/doc/reference/html/json-glib-Serializable-Interface.html @@ -3,12 +3,12 @@ Serializable Interface: JSON-GLib Reference Manual - + - + @@ -34,7 +34,7 @@

Functions

-
+
@@ -109,7 +109,7 @@

Types and Values

-
+
@@ -122,7 +122,7 @@

Object Hierarchy

-
    GInterface
+
    GInterface
     ╰── JsonSerializable
@@ -146,7 +146,7 @@ json_serializable_serialize_property (JsonNode object.

Parameters

-
+
@@ -197,7 +197,7 @@ property contained inside property_node .

Parameters

-
+
@@ -248,7 +248,7 @@ the serializable instance. *

Parameters

-
+
@@ -288,7 +288,7 @@ on the serializable instance.

Parameters

-
+
@@ -326,7 +326,7 @@ the serializable instance.

Parameters

-
+
@@ -367,7 +367,7 @@ on the serializable instance.

Parameters

-
+
@@ -435,7 +435,7 @@ through g_type_default_interface_peek():

Parameters

-
+
@@ -515,7 +515,7 @@ of the deserialize_property() virtual function in

Parameters

-
+
@@ -591,7 +591,7 @@ so it can also be used to override the default property serialization sequence.

Members

-
+
@@ -639,6 +639,6 @@ definitions

-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/json-glib-Utility-API.html b/doc/reference/html/json-glib-Utility-API.html index 077627b..3b67d3a 100644 --- a/doc/reference/html/json-glib-Utility-API.html +++ b/doc/reference/html/json-glib-Utility-API.html @@ -3,12 +3,12 @@ Utility API: JSON-GLib Reference Manual - + - + @@ -33,7 +33,7 @@

Functions

-
+
@@ -77,7 +77,7 @@ the JSON tree.

appropriately.

Parameters

-
+
@@ -115,7 +115,7 @@ the passed node .

Parameters

-
+
@@ -148,6 +148,6 @@ the passed node
-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/json-glib-Versioning-information.html b/doc/reference/html/json-glib-Versioning-information.html index 23e3640..b015473 100644 --- a/doc/reference/html/json-glib-Versioning-information.html +++ b/doc/reference/html/json-glib-Versioning-information.html @@ -3,12 +3,12 @@ Versioning information: JSON-GLib Reference Manual - + - + @@ -33,7 +33,7 @@

Functions

-
+
@@ -48,7 +48,7 @@

Types and Values

-
+
@@ -103,7 +103,7 @@ at compile-time

of Json is greater than the required one.

Parameters

-
+
@@ -148,21 +148,21 @@ of Json is greater than the required one.

JSON_MICRO_VERSION

-
#define JSON_MICRO_VERSION              (2)
+
#define JSON_MICRO_VERSION              (4)
 

 
Json micro version component (e.g. 3 if JSON_VERSION is 1.2.3)

JSON_VERSION

-
#define JSON_VERSION                    (1.2.2)
+
#define JSON_VERSION                    (1.2.4)
 

 
Json version.

JSON_VERSION_S

-
#define JSON_VERSION_S                  "1.2.2"
+
#define JSON_VERSION_S                  "1.2.4"
 

 
JSON-GLib version, encoded as a string, useful for printing and
 concatenation.

@@ -207,6 +207,6 @@ trying to use that function.
-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/json-glib.html b/doc/reference/html/json-glib.html index d3dc5d1..0db9847 100644 --- a/doc/reference/html/json-glib.html +++ b/doc/reference/html/json-glib.html @@ -3,12 +3,12 @@ Part I. JSON-GLib Overview: JSON-GLib Reference Manual - + - + @@ -32,6 +32,6 @@
-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/json-streams.html b/doc/reference/html/json-streams.html index 61f52b8..ac7bcb4 100644 --- a/doc/reference/html/json-streams.html +++ b/doc/reference/html/json-streams.html @@ -3,12 +3,12 @@ Part III. Reading and writing: JSON-GLib Reference Manual - + - + @@ -61,6 +61,6 @@
-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/json-tools.html b/doc/reference/html/json-tools.html index bb04c20..41c4b42 100644 --- a/doc/reference/html/json-tools.html +++ b/doc/reference/html/json-tools.html @@ -3,12 +3,12 @@ Part V. JSON-GLib Additional Reference: JSON-GLib Reference Manual - + - + @@ -39,6 +39,6 @@
-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/json-validate-tool.html b/doc/reference/html/json-validate-tool.html index 1003b51..aee58a5 100644 --- a/doc/reference/html/json-validate-tool.html +++ b/doc/reference/html/json-validate-tool.html @@ -3,12 +3,12 @@ json-glib-validate: JSON-GLib Reference Manual - + - + @@ -66,6 +66,6 @@ Prints help and exits.
-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/license.html b/doc/reference/html/license.html index 757ee44..4bff4c3 100644 --- a/doc/reference/html/license.html +++ b/doc/reference/html/license.html @@ -3,11 +3,11 @@ Appendix A. License: JSON-GLib Reference Manual - + - + @@ -52,6 +52,6 @@

-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/html/tools.html b/doc/reference/html/tools.html index 22bde0a..b8c328a 100644 --- a/doc/reference/html/tools.html +++ b/doc/reference/html/tools.html @@ -3,12 +3,12 @@ JSON-GLib Tools: JSON-GLib Reference Manual - + - + @@ -32,6 +32,6 @@
-
Generated by GTK-Doc V1.25
+
Generated by GTK-Doc V1.25.1 \ No newline at end of file diff --git a/doc/reference/json-glib-docs.xml b/doc/reference/json-glib-docs.xml index ed5ce65..71782cd 100644 --- a/doc/reference/json-glib-docs.xml +++ b/doc/reference/json-glib-docs.xml @@ -1,13 +1,16 @@ - + + + %gtkdocentities; ]> JSON-GLib Reference Manual - for JSON-GLib &version; + for JSON-GLib &package_version; 2007, 2008 diff --git a/doc/reference/json-glib-format.1 b/doc/reference/json-glib-format.1 index 2d0f133..4bdfd16 100644 --- a/doc/reference/json-glib-format.1 +++ b/doc/reference/json-glib-format.1 @@ -1,8 +1,8 @@ '\" t .\" Title: json-glib-format .\" Author: Emmanuele Bassi -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 07/29/2016 +.\" Generator: DocBook XSL Stylesheets v1.79.1 +.\" Date: 03/13/2017 .\" Manual: User Commands .\" Source: JSON-GLib .\" Language: English diff --git a/doc/reference/json-glib-validate.1 b/doc/reference/json-glib-validate.1 index 04fd29d..6a66457 100644 --- a/doc/reference/json-glib-validate.1 +++ b/doc/reference/json-glib-validate.1 @@ -1,8 +1,8 @@ '\" t .\" Title: json-glib-validate .\" Author: Emmanuele Bassi -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 07/29/2016 +.\" Generator: DocBook XSL Stylesheets v1.79.1 +.\" Date: 03/13/2017 .\" Manual: User Commands .\" Source: JSON-GLib .\" Language: English diff --git a/doc/reference/meson.build b/doc/reference/meson.build new file mode 100644 index 0000000..0aaa709 --- /dev/null +++ b/doc/reference/meson.build @@ -0,0 +1,66 @@ +subdir('xml') + +private_headers = [ + 'json-debug.h', + 'json-enum-types.h', + 'json-glib.h', + 'json-gobject-private.h', + 'json-marshal.h', + 'json-private.h', + 'json-scanner.h', + 'json-types-private.h', +] + +glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix') +glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html') +docpath = join_paths(json_datadir, 'gtk-doc', 'html') + +gnome.gtkdoc('json-glib', + main_xml: 'json-glib-docs.xml', + src_dir: [ join_paths(meson.source_root(), 'json-glib'), join_paths(meson.build_root(), 'json-glib'), ], + dependencies: json_glib_dep, + gobject_typesfile: 'json-glib.types', + scan_args: [ + '--rebuild-types', + '--ignore-decorators=_JSON_EXTERN', + '--ignore-headers=' + ' '.join(private_headers), + ], + fixxref_args: [ + '--html-dir=@0@'.format(docpath), + '--extra-dir=@0@'.format(join_paths(glib_docpath, 'glib')), + '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gobject')), + '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gio')), + ], + install: true) + +xsltproc = find_program('xsltproc', required: false) +if get_option('enable-man') and xsltproc.found() + xlstproc_flags = [ + '--nonet', + '--stringparam', 'man.output.quietly', '1', + '--stringparam', 'funcsynopsis.style', 'ansi', + '--stringparam', 'man.th.extra1.suppress', '1', + '--stringparam', 'man.authors.section.enabled', '1', + '--stringparam', 'man.copyright.section.enabled', '1', + ] + + man_files = [ + 'json-glib-format', + 'json-glib-validate', + ] + + foreach m: man_files + custom_target(m + ' man page', + input: '@0@.xml'.format(m), + output: '@0@.1'.format(m), + command: [ + xsltproc, + xlstproc_flags, + '-o', '@OUTPUT@', + 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl', + '@INPUT@', + ], + install: true, + install_dir: join_paths(json_mandir, 'man1')) + endforeach +endif diff --git a/doc/reference/version.xml b/doc/reference/version.xml index 23aa839..e8ea05d 100644 --- a/doc/reference/version.xml +++ b/doc/reference/version.xml @@ -1 +1 @@ -1.2.2 +1.2.4 diff --git a/doc/reference/xml/gtkdocentities.ent.in b/doc/reference/xml/gtkdocentities.ent.in new file mode 100644 index 0000000..f12c9ff --- /dev/null +++ b/doc/reference/xml/gtkdocentities.ent.in @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/doc/reference/xml/meson.build b/doc/reference/xml/meson.build new file mode 100644 index 0000000..668435a --- /dev/null +++ b/doc/reference/xml/meson.build @@ -0,0 +1,11 @@ +ent_conf = configuration_data() +ent_conf.set('PACKAGE', 'JSON-GLib') +ent_conf.set('PACKAGE_BUGREPORT', 'https://bugzilla.gnome.org/enter_bug.cgi?product=json-glib') +ent_conf.set('PACKAGE_NAME', 'JSON-GLib') +ent_conf.set('PACKAGE_STRING', 'json-glib') +ent_conf.set('PACKAGE_TARNAME', 'json-glib-' + meson.project_version()) +ent_conf.set('PACKAGE_URL', 'http://wiki.gnome.org/Project/JsonGlib') +ent_conf.set('PACKAGE_VERSION', meson.project_version()) +ent_conf.set('PACKAGE_API_VERSION', apiversion) +configure_file(input: 'gtkdocentities.ent.in', output: 'gtkdocentities.ent', configuration: ent_conf) + diff --git a/gtk-doc.make b/gtk-doc.make index e4a12a5..5709b54 100644 --- a/gtk-doc.make +++ b/gtk-doc.make @@ -87,19 +87,18 @@ GTK_DOC_V_SETUP_0=@echo " DOC Preparing build"; setup-build.stamp: -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \ - if test "x$$files" != "x" ; then \ - for file in $$files ; do \ - destdir=`dirname $(abs_builddir)/$$file`; \ - test -d "$$destdir" || mkdir -p "$$destdir"; \ - test -f $(abs_srcdir)/$$file && \ - cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ - done; \ - fi; \ + files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \ + if test "x$$files" != "x" ; then \ + for file in $$files ; do \ + destdir=`dirname $(abs_builddir)/$$file`; \ + test -d "$$destdir" || mkdir -p "$$destdir"; \ + test -f $(abs_srcdir)/$$file && \ + cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ + done; \ + fi; \ fi $(AM_V_at)touch setup-build.stamp - #### scan #### GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_$(V)) @@ -113,23 +112,23 @@ GTK_DOC_V_INTROSPECT_0=@echo " DOC Introspecting gobjects"; scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(GTK_DOC_V_SCAN)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ - _source_dir="$${_source_dir} --source-dir=$$i" ; \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ - scanobj_options=""; \ - gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$$?" = "0"; then \ - if test "x$(V)" = "x1"; then \ - scanobj_options="--verbose"; \ - fi; \ + scanobj_options=""; \ + gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$$?" = "0"; then \ + if test "x$(V)" = "x1"; then \ + scanobj_options="--verbose"; \ fi; \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ - gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ + fi; \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ + gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ else \ - for i in $(SCANOBJ_FILES) ; do \ - test -f $$i || touch $$i ; \ - done \ + for i in $(SCANOBJ_FILES) ; do \ + test -f $$i || touch $$i ; \ + done \ fi $(AM_V_at)touch scan-build.stamp @@ -145,7 +144,7 @@ GTK_DOC_V_XML_0=@echo " DOC Building XML"; sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent $(GTK_DOC_V_XML)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ - _source_dir="$${_source_dir} --source-dir=$$i" ; \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) $(AM_V_at)touch sgml-build.stamp @@ -190,12 +189,8 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_con cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) -@test "x$(HTML_IMAGES)" = "x" || \ for file in $(HTML_IMAGES) ; do \ - if test -f $(abs_srcdir)/$$file ; then \ - cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ - fi; \ - if test -f $(abs_builddir)/$$file ; then \ - cp $(abs_builddir)/$$file $(abs_builddir)/html; \ - fi; \ + test -f $(abs_srcdir)/$$file && cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ + test -f $(abs_builddir)/$$file && cp $(abs_builddir)/$$file $(abs_builddir)/html; \ done; $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) $(AM_V_at)touch html-build.stamp diff --git a/json-glib/Json-1.0.gir b/json-glib/Json-1.0.gir index f66ac42..4071183 100644 --- a/json-glib/Json-1.0.gir +++ b/json-glib/Json-1.0.gir @@ -1245,7 +1245,7 @@ stream. Json major version component (e.g. 1 if %JSON_VERSION is 1.2.3) - + Json micro version component (e.g. 3 if %JSON_VERSION is 1.2.3) @@ -1310,8 +1310,9 @@ there should be no need to copy an immutable node. Retrieves the #JsonArray stored inside a #JsonNode and returns it -with its reference count increased by one. - +with its reference count increased by one. If the node does not hold an +array value, %NULL is returned. + the #JsonArray with its reference count increased. @@ -1325,8 +1326,9 @@ with its reference count increased by one. Retrieves the #JsonObject inside @node. The reference count of -the returned object is increased. - +the returned object is increased. If the node does not hold an object value, +%NULL is returned. + the #JsonObject @@ -1338,10 +1340,12 @@ the returned object is increased. - Gets a copy of the string value stored inside a #JsonNode - - a newly allocated string containing a copy - of the #JsonNode contents. Use g_free() to free the allocated resources + Gets a copy of the string value stored inside a #JsonNode. If the node does +not hold a string value, %NULL is returned. + + a newly allocated string + containing a copy of the #JsonNode contents. Use g_free() to free the + allocated resources @@ -1384,8 +1388,9 @@ integer value 4. - Retrieves the #JsonArray stored inside a #JsonNode - + Retrieves the #JsonArray stored inside a #JsonNode. If the node does not +hold an array value, %NULL is returned. + the #JsonArray @@ -1397,7 +1402,10 @@ integer value 4. - Gets the boolean value stored inside a #JsonNode + Gets the boolean value stored inside a #JsonNode. If the node holds an +integer or double value which is zero, %FALSE is returned; otherwise %TRUE +is returned. If the node holds a %JSON_NODE_NULL value or a value of another +non-boolean type, %FALSE is returned. a boolean value. @@ -1410,7 +1418,11 @@ integer value 4. - Gets the double value stored inside a #JsonNode + Gets the double value stored inside a #JsonNode. If the node holds an integer +value, it is returned as a double. If the node holds a %FALSE boolean value, +`0.0` is returned; otherwise a non-zero double is returned. If the node holds +a %JSON_NODE_NULL value or a value of another non-double type, `0.0` is +returned. a double value. @@ -1423,7 +1435,11 @@ integer value 4. - Gets the integer value stored inside a #JsonNode + Gets the integer value stored inside a #JsonNode. If the node holds a double +value, its integer component is returned. If the node holds a %FALSE boolean +value, `0` is returned; otherwise a non-zero integer is returned. If the +node holds a %JSON_NODE_NULL value or a value of another non-integer type, +`0` is returned. an integer value. @@ -1451,8 +1467,9 @@ integer value 4. - Retrieves the #JsonObject stored inside a #JsonNode - + Retrieves the #JsonObject stored inside a #JsonNode. If the node does not +hold an object value, %NULL is returned. + the #JsonObject @@ -1465,9 +1482,9 @@ integer value 4. Retrieves the parent #JsonNode of @node. - - the parent node, or %NULL if @node is - the root node + + the parent node, or %NULL if @node + is the root node @@ -1478,8 +1495,9 @@ integer value 4. - Gets the string value stored inside a #JsonNode - + Gets the string value stored inside a #JsonNode. If the node does not hold a +string value, %NULL is returned. + a string value. @@ -1492,7 +1510,8 @@ integer value 4. Retrieves a value from a #JsonNode and copies into @value. When done -using it, call g_value_unset() on the #GValue. +using it, call g_value_unset() on the #GValue. If the node does not hold a +scalar value, @value is not modified. @@ -4787,7 +4806,7 @@ sequence. - + JSON-GLib version, encoded as a string, useful for printing and concatenation. diff --git a/json-glib/Makefile.am b/json-glib/Makefile.am index 2079bb8..f44c388 100644 --- a/json-glib/Makefile.am +++ b/json-glib/Makefile.am @@ -61,11 +61,6 @@ glib_enum_c = json-enum-types.c glib_enum_headers = $(source_h) include $(top_srcdir)/build/autotools/Makefile.am.enums -# glib-genmarshal rules -glib_marshal_list = json-marshal.list -glib_marshal_prefix = json_marshal -include $(top_srcdir)/build/autotools/Makefile.am.marshal - lib_LTLIBRARIES += libjson-glib-1.0.la libjson_glib_1_0_la_CPPFLAGS = \ diff --git a/json-glib/Makefile.in b/json-glib/Makefile.in index 6b6e25d..3c84041 100644 --- a/json-glib/Makefile.in +++ b/json-glib/Makefile.in @@ -33,22 +33,6 @@ # # Author: Emmanuele Bassi -# Rules for generating marshal files using glib-genmarshal -# -# Define: -# glib_marshal_list = marshal list file -# glib_marshal_prefix = prefix for marshal functions -# -# before including Makefile.am.marshal. You will also need to have -# the following targets already defined: -# -# CLEANFILES -# DISTCLEANFILES -# BUILT_SOURCES -# EXTRA_DIST -# -# Author: Emmanuele Bassi - # Author: Fan, Chun-wei # Common Autotools file used to generate Visual Studio 2008+ # Projects from their templates @@ -273,12 +257,9 @@ am__objects_2 = libjson_glib_1_0_la-json-array.lo \ libjson_glib_1_0_la-json-value.lo $(am__objects_1) am__objects_3 = $(am__objects_1) am__objects_4 = libjson_glib_1_0_la-json-enum-types.lo -am__objects_5 = libjson_glib_1_0_la-json-marshal.lo -am__objects_6 = $(am__objects_5) -am__objects_7 = $(am__objects_1) $(am__objects_4) $(am__objects_3) \ - $(am__objects_6) +am__objects_5 = $(am__objects_1) $(am__objects_4) am_libjson_glib_1_0_la_OBJECTS = $(am__objects_2) $(am__objects_3) \ - $(am__objects_3) $(am__objects_7) + $(am__objects_3) $(am__objects_5) libjson_glib_1_0_la_OBJECTS = $(am_libjson_glib_1_0_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -394,7 +375,6 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/json-glib.pc.in \ $(top_srcdir)/build/Makefile.msvc-introspection \ $(top_srcdir)/build/Makefile.msvcproj \ $(top_srcdir)/build/autotools/Makefile.am.enums \ - $(top_srcdir)/build/autotools/Makefile.am.marshal \ $(top_srcdir)/build/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ @@ -605,13 +585,11 @@ top_srcdir = @top_srcdir@ NULL = AM_CPPFLAGS = AM_CFLAGS = -BUILT_SOURCES = $(glib_enum_h) $(glib_enum_c) $(marshal_h) \ - $(marshal_c) -CLEANFILES = stamp-enum-types stamp-marshal $(pcfiles) $(am__append_1) -EXTRA_DIST = $(enum_tmpl_h) $(enum_tmpl_c) $(marshal_list) \ - json-version.h.in json-glib.h json-version.h json-glib.pc.in -DISTCLEANFILES = json-version.h $(glib_enum_h) $(glib_enum_c) \ - $(marshal_h) $(marshal_c) +BUILT_SOURCES = $(glib_enum_h) $(glib_enum_c) +CLEANFILES = stamp-enum-types $(pcfiles) $(am__append_1) +EXTRA_DIST = $(enum_tmpl_h) $(enum_tmpl_c) json-version.h.in \ + json-glib.h json-version.h json-glib.pc.in +DISTCLEANFILES = json-version.h $(glib_enum_h) $(glib_enum_c) lib_LTLIBRARIES = libjson-glib-1.0.la # build the tests last @@ -665,13 +643,6 @@ glib_enum_headers = $(source_h) enum_tmpl_h = $(addprefix $(srcdir)/, $(glib_enum_h:.h=.h.in)) enum_tmpl_c = $(addprefix $(srcdir)/, $(glib_enum_c:.c=.c.in)) enum_headers = $(addprefix $(srcdir)/, $(glib_enum_headers)) - -# glib-genmarshal rules -glib_marshal_list = json-marshal.list -glib_marshal_prefix = json_marshal -marshal_h = $(glib_marshal_list:.list=.h) -marshal_c = $(glib_marshal_list:.list=.c) -marshal_list = $(addprefix $(srcdir)/, $(glib_marshal_list)) libjson_glib_1_0_la_CPPFLAGS = \ -DPREFIX=\""$(prefix)"\" \ -DLIBDIR=\""$(libdir)"\" \ @@ -792,7 +763,7 @@ all: $(BUILT_SOURCES) .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/build/autotools/Makefile.am.enums $(top_srcdir)/build/autotools/Makefile.am.marshal $(top_srcdir)/build/Makefile.msvcproj $(top_srcdir)/build/Makefile.msvc-introspection $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/build/autotools/Makefile.am.enums $(top_srcdir)/build/Makefile.msvcproj $(top_srcdir)/build/Makefile.msvc-introspection $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -812,7 +783,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/build/autotools/Makefile.am.enums $(top_srcdir)/build/autotools/Makefile.am.marshal $(top_srcdir)/build/Makefile.msvcproj $(top_srcdir)/build/Makefile.msvc-introspection $(am__empty): +$(top_srcdir)/build/autotools/Makefile.am.enums $(top_srcdir)/build/Makefile.msvcproj $(top_srcdir)/build/Makefile.msvc-introspection $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -938,7 +909,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjson_glib_1_0_la-json-generator.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjson_glib_1_0_la-json-gobject.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjson_glib_1_0_la-json-gvariant.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjson_glib_1_0_la-json-marshal.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjson_glib_1_0_la-json-node.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjson_glib_1_0_la-json-object.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjson_glib_1_0_la-json-parser.Plo@am__quote@ @@ -1092,13 +1062,6 @@ libjson_glib_1_0_la-json-enum-types.lo: json-enum-types.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libjson_glib_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libjson_glib_1_0_la_CFLAGS) $(CFLAGS) -c -o libjson_glib_1_0_la-json-enum-types.lo `test -f 'json-enum-types.c' || echo '$(srcdir)/'`json-enum-types.c -libjson_glib_1_0_la-json-marshal.lo: json-marshal.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libjson_glib_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libjson_glib_1_0_la_CFLAGS) $(CFLAGS) -MT libjson_glib_1_0_la-json-marshal.lo -MD -MP -MF $(DEPDIR)/libjson_glib_1_0_la-json-marshal.Tpo -c -o libjson_glib_1_0_la-json-marshal.lo `test -f 'json-marshal.c' || echo '$(srcdir)/'`json-marshal.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libjson_glib_1_0_la-json-marshal.Tpo $(DEPDIR)/libjson_glib_1_0_la-json-marshal.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='json-marshal.c' object='libjson_glib_1_0_la-json-marshal.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libjson_glib_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libjson_glib_1_0_la_CFLAGS) $(CFLAGS) -c -o libjson_glib_1_0_la-json-marshal.lo `test -f 'json-marshal.c' || echo '$(srcdir)/'`json-marshal.c - json_glib_format-json-glib-format.o: json-glib-format.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(json_glib_format_CPPFLAGS) $(CPPFLAGS) $(json_glib_format_CFLAGS) $(CFLAGS) -MT json_glib_format-json-glib-format.o -MD -MP -MF $(DEPDIR)/json_glib_format-json-glib-format.Tpo -c -o json_glib_format-json-glib-format.o `test -f 'json-glib-format.c' || echo '$(srcdir)/'`json-glib-format.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/json_glib_format-json-glib-format.Tpo $(DEPDIR)/json_glib_format-json-glib-format.Po @@ -1546,34 +1509,6 @@ $(glib_enum_c): $(enum_headers) $(enum_tmpl_h) $(enum_tmpl_c) && cp -f xgen-ec $(glib_enum_c) \ && rm -f xgen-ec -# Basic sanity checks -$(if $(GLIB_GENMARSHAL),,$(error Need to define GLIB_GENMARSHAL)) - -$(if $(or $(glib_marshal_list), \ - $(glib_marshal_prefix)),, \ - $(error Need to define glib_marshal_list and glib_marshal_prefix)) - -stamp-marshal: $(marshal_list) - $(AM_V_GEN)$(GLIB_GENMARSHAL) \ - --prefix=$(glib_marshal_prefix) \ - --header \ - $(marshal_list) > xgen-mh \ - && (cmp -s xgen-mh $(marshal_h) || cp -f xgen-mh $(marshal_h)) \ - && rm -f xgen-mh \ - && echo timestamp > $(@F) - -$(marshal_h): stamp-marshal - @true - -$(marshal_c): $(marshal_h) - $(AM_V_GEN)(echo "#include \"$(marshal_h)\"" ; \ - $(GLIB_GENMARSHAL) \ - --prefix=$(glib_marshal_prefix) \ - --body \ - $(marshal_list)) > xgen-mc \ - && cp xgen-mc $(marshal_c) \ - && rm -f xgen-mc - json-glib-1.0.pc: json-glib.pc $(AM_V_GEN)cp -f $< $@ @@ -1595,10 +1530,18 @@ $(1).sourcefiles: $(top_builddir)/build/win32/vs9/$(1).vcproj $(1).vs10.sourcefiles: $(top_builddir)/build/win32/vs9/$(1).vcproj $(1).vs10.sourcefiles.filters: $(top_builddir)/build/win32/vs9/$(1).vcproj -$(top_builddir)/build/win32/vs9/$(1).vcproj: +$(top_builddir)/build/win32/vs9/$(1).vcproj: Makefile -$(RM) $(top_builddir)/build/win32/vs9/$(1).vcproj -$(RM) $(top_builddir)/build/win32/vs10/$(1).vcxproj -$(RM) $(top_builddir)/build/win32/vs10/$(1).vcxproj.filters + -$(RM) $(top_builddir)/build/win32/vs11/$(1).vcxproj + -$(RM) $(top_builddir)/build/win32/vs11/$(1).vcxproj.filters + -$(RM) $(top_builddir)/build/win32/vs12/$(1).vcxproj + -$(RM) $(top_builddir)/build/win32/vs12/$(1).vcxproj.filters + -$(RM) $(top_builddir)/build/win32/vs14/$(1).vcxproj + -$(RM) $(top_builddir)/build/win32/vs14/$(1).vcxproj.filters + -$(RM) $(top_builddir)/build/win32/vs15/$(1).vcxproj + -$(RM) $(top_builddir)/build/win32/vs15/$(1).vcxproj.filters for F in $(_proj_files); do \ case $$$$F in \ @@ -1621,7 +1564,7 @@ $(top_builddir)/build/win32/vs9/$(1).vcproj: $(top_builddir)/build/win32/vs10/$(1).vs10.headers: $(top_builddir)/build/win32/vs9/$(1).headers -$(top_builddir)/build/win32/vs9/$(1).headers: +$(top_builddir)/build/win32/vs9/$(1).headers: Makefile -$(RM) $(top_builddir)/build/win32/vs9/$(1).headers -$(RM) $(top_builddir)/build/win32/vs10/$(1).vs10.headers diff --git a/json-glib/json-enum-types.c b/json-glib/json-enum-types.c index 5aab19b..e5a6573 100644 --- a/json-glib/json-enum-types.c +++ b/json-glib/json-enum-types.c @@ -1,11 +1,15 @@ /* Generated data (by glib-mkenums) */ +#ifndef JSON_COMPILATION +#define JSON_COMPILATION +#endif + #include "config.h" #include "json-enum-types.h" -/* enumerations from "./json-parser.h" */ -#include "./json-parser.h" +/* enumerations from "../../json-glib/json-parser.h" */ +#include "../../json-glib/json-parser.h" GType json_parser_error_get_type (void) @@ -35,8 +39,8 @@ json_parser_error_get_type (void) return g_enum_type_id__volatile; } -/* enumerations from "./json-path.h" */ -#include "./json-path.h" +/* enumerations from "../../json-glib/json-path.h" */ +#include "../../json-glib/json-path.h" GType json_path_error_get_type (void) @@ -59,8 +63,8 @@ json_path_error_get_type (void) return g_enum_type_id__volatile; } -/* enumerations from "./json-reader.h" */ -#include "./json-reader.h" +/* enumerations from "../../json-glib/json-reader.h" */ +#include "../../json-glib/json-reader.h" GType json_reader_error_get_type (void) @@ -89,8 +93,8 @@ json_reader_error_get_type (void) return g_enum_type_id__volatile; } -/* enumerations from "./json-types.h" */ -#include "./json-types.h" +/* enumerations from "../../json-glib/json-types.h" */ +#include "../../json-glib/json-types.h" GType json_node_type_get_type (void) diff --git a/json-glib/json-enum-types.c.in b/json-glib/json-enum-types.c.in index a2a13b4..da07c46 100644 --- a/json-glib/json-enum-types.c.in +++ b/json-glib/json-enum-types.c.in @@ -1,4 +1,8 @@ /*** BEGIN file-header ***/ +#ifndef JSON_COMPILATION +#define JSON_COMPILATION +#endif + #include "config.h" #include "json-enum-types.h" /*** END file-header ***/ diff --git a/json-glib/json-enum-types.h b/json-glib/json-enum-types.h index 035165d..18b5559 100644 --- a/json-glib/json-enum-types.h +++ b/json-glib/json-enum-types.h @@ -13,22 +13,22 @@ G_BEGIN_DECLS -/* enumerations from "./json-parser.h" */ +/* enumerations from "../../json-glib/json-parser.h" */ JSON_AVAILABLE_IN_1_0 GType json_parser_error_get_type (void) G_GNUC_CONST; #define JSON_TYPE_PARSER_ERROR (json_parser_error_get_type()) -/* enumerations from "./json-path.h" */ +/* enumerations from "../../json-glib/json-path.h" */ JSON_AVAILABLE_IN_1_0 GType json_path_error_get_type (void) G_GNUC_CONST; #define JSON_TYPE_PATH_ERROR (json_path_error_get_type()) -/* enumerations from "./json-reader.h" */ +/* enumerations from "../../json-glib/json-reader.h" */ JSON_AVAILABLE_IN_1_0 GType json_reader_error_get_type (void) G_GNUC_CONST; #define JSON_TYPE_READER_ERROR (json_reader_error_get_type()) -/* enumerations from "./json-types.h" */ +/* enumerations from "../../json-glib/json-types.h" */ JSON_AVAILABLE_IN_1_0 GType json_node_type_get_type (void) G_GNUC_CONST; #define JSON_TYPE_NODE_TYPE (json_node_type_get_type()) diff --git a/json-glib/json-generator.c b/json-glib/json-generator.c index c47e7fe..879f3be 100644 --- a/json-glib/json-generator.c +++ b/json-glib/json-generator.c @@ -1,5 +1,5 @@ /* json-generator.c - JSON streams generator - * + * * This file is part of JSON-GLib * Copyright (C) 2007 OpenedHand Ltd. * Copyright (C) 2009 Intel Corp. @@ -36,7 +36,6 @@ #include "json-types-private.h" -#include "json-marshal.h" #include "json-generator.h" struct _JsonGeneratorPrivate @@ -343,6 +342,11 @@ dump_value (JsonGenerator *generator, g_string_append (buffer, g_ascii_dtostr (buf, sizeof (buf), json_value_get_double (value))); + /* ensure doubles don't become ints */ + if (g_strstr_len (buf, G_ASCII_DTOSTR_BUF_SIZE, ".") == NULL) + { + g_string_append (buffer, ".0"); + } } break; diff --git a/json-glib/json-gobject.c b/json-glib/json-gobject.c index 34a43c8..9bbb29b 100644 --- a/json-glib/json-gobject.c +++ b/json-glib/json-gobject.c @@ -937,9 +937,9 @@ json_gobject_from_data (GType gtype, root = json_parser_get_root (parser); if (root == NULL || JSON_NODE_TYPE (root) != JSON_NODE_OBJECT) { - /* translators: the %s is the name of the data structure */ g_set_error (error, JSON_PARSER_ERROR, JSON_PARSER_ERROR_PARSE, + /* translators: the %s is the name of the data structure */ _("Expecting a JSON object, but the root node is of type `%s'"), json_node_type_name (root)); g_object_unref (parser); diff --git a/json-glib/json-gobject.h b/json-glib/json-gobject.h index 17aa2db..47ac125 100644 --- a/json-glib/json-gobject.h +++ b/json-glib/json-gobject.h @@ -194,6 +194,10 @@ JSON_DEPRECATED_IN_1_0_FOR(json_gobject_to_data) gchar * json_serialize_gobject (GObject *gobject, gsize *length) G_GNUC_MALLOC; +#ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC +G_DEFINE_AUTOPTR_CLEANUP_FUNC (JsonSerializable, g_object_unref) +#endif + G_END_DECLS #endif /* __JSON_GOBJECT_H__ */ diff --git a/json-glib/json-gvariant.c b/json-glib/json-gvariant.c index 6d55fb8..afa6405 100644 --- a/json-glib/json-gvariant.c +++ b/json-glib/json-gvariant.c @@ -516,10 +516,10 @@ json_node_assert_type (JsonNode *json_node, (type == JSON_NODE_VALUE && (json_node_get_value_type (json_node) != sub_type))) { - /* translators: the '%s' is the type name */ g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_DATA, + /* translators: the '%s' is the type name */ _("Unexpected type '%s' in JSON node"), g_type_name (json_node_get_value_type (json_node))); return FALSE; @@ -761,7 +761,7 @@ json_to_gvariant_array (JsonNode *json_node, JsonArray *array; GList *children = NULL; gboolean roll_back = FALSE; - const gchar *orig_signature; + const gchar *orig_signature = NULL; gchar *child_signature; array = json_node_get_array (json_node); diff --git a/json-glib/json-marshal.c b/json-glib/json-marshal.c deleted file mode 100644 index 7555384..0000000 --- a/json-glib/json-marshal.c +++ /dev/null @@ -1,132 +0,0 @@ -#include "json-marshal.h" - -#include - - -#ifdef G_ENABLE_DEBUG -#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -#define g_marshal_value_peek_char(v) g_value_get_schar (v) -#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) -#define g_marshal_value_peek_int(v) g_value_get_int (v) -#define g_marshal_value_peek_uint(v) g_value_get_uint (v) -#define g_marshal_value_peek_long(v) g_value_get_long (v) -#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v) -#define g_marshal_value_peek_int64(v) g_value_get_int64 (v) -#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v) -#define g_marshal_value_peek_enum(v) g_value_get_enum (v) -#define g_marshal_value_peek_flags(v) g_value_get_flags (v) -#define g_marshal_value_peek_float(v) g_value_get_float (v) -#define g_marshal_value_peek_double(v) g_value_get_double (v) -#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v) -#define g_marshal_value_peek_param(v) g_value_get_param (v) -#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) -#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) -#define g_marshal_value_peek_object(v) g_value_get_object (v) -#define g_marshal_value_peek_variant(v) g_value_get_variant (v) -#else /* !G_ENABLE_DEBUG */ -/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. - * Do not access GValues directly in your code. Instead, use the - * g_value_get_*() functions - */ -#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int -#define g_marshal_value_peek_char(v) (v)->data[0].v_int -#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint -#define g_marshal_value_peek_int(v) (v)->data[0].v_int -#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint -#define g_marshal_value_peek_long(v) (v)->data[0].v_long -#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64 -#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64 -#define g_marshal_value_peek_enum(v) (v)->data[0].v_long -#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_float(v) (v)->data[0].v_float -#define g_marshal_value_peek_double(v) (v)->data[0].v_double -#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer -#endif /* !G_ENABLE_DEBUG */ - - -/* VOID:VOID (./json-marshal.list:1) */ - -/* VOID:BOXED (./json-marshal.list:2) */ - -/* VOID:BOXED,STRING (./json-marshal.list:3) */ -void -json_marshal_VOID__BOXED_STRING (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__BOXED_STRING) (gpointer data1, - gpointer arg_1, - gpointer arg_2, - gpointer data2); - GMarshalFunc_VOID__BOXED_STRING callback; - GCClosure *cc = (GCClosure*) closure; - gpointer data1, data2; - - g_return_if_fail (n_param_values == 3); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__BOXED_STRING) (marshal_data ? marshal_data : cc->callback); - - callback (data1, - g_marshal_value_peek_boxed (param_values + 1), - g_marshal_value_peek_string (param_values + 2), - data2); -} - -/* VOID:BOXED,INT (./json-marshal.list:4) */ -void -json_marshal_VOID__BOXED_INT (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__BOXED_INT) (gpointer data1, - gpointer arg_1, - gint arg_2, - gpointer data2); - GMarshalFunc_VOID__BOXED_INT callback; - GCClosure *cc = (GCClosure*) closure; - gpointer data1, data2; - - g_return_if_fail (n_param_values == 3); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__BOXED_INT) (marshal_data ? marshal_data : cc->callback); - - callback (data1, - g_marshal_value_peek_boxed (param_values + 1), - g_marshal_value_peek_int (param_values + 2), - data2); -} - -/* VOID:POINTER (./json-marshal.list:5) */ - diff --git a/json-glib/json-marshal.h b/json-glib/json-marshal.h deleted file mode 100644 index 6d9c224..0000000 --- a/json-glib/json-marshal.h +++ /dev/null @@ -1,37 +0,0 @@ - -#ifndef __json_marshal_MARSHAL_H__ -#define __json_marshal_MARSHAL_H__ - -#include - -G_BEGIN_DECLS - -/* VOID:VOID (./json-marshal.list:1) */ -#define json_marshal_VOID__VOID g_cclosure_marshal_VOID__VOID - -/* VOID:BOXED (./json-marshal.list:2) */ -#define json_marshal_VOID__BOXED g_cclosure_marshal_VOID__BOXED - -/* VOID:BOXED,STRING (./json-marshal.list:3) */ -extern void json_marshal_VOID__BOXED_STRING (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -/* VOID:BOXED,INT (./json-marshal.list:4) */ -extern void json_marshal_VOID__BOXED_INT (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -/* VOID:POINTER (./json-marshal.list:5) */ -#define json_marshal_VOID__POINTER g_cclosure_marshal_VOID__POINTER - -G_END_DECLS - -#endif /* __json_marshal_MARSHAL_H__ */ - diff --git a/json-glib/json-marshal.list b/json-glib/json-marshal.list deleted file mode 100644 index 6eaa904..0000000 --- a/json-glib/json-marshal.list +++ /dev/null @@ -1,5 +0,0 @@ -VOID:VOID -VOID:BOXED -VOID:BOXED,STRING -VOID:BOXED,INT -VOID:POINTER diff --git a/json-glib/json-node.c b/json-glib/json-node.c index 1b7f0c0..5e158c5 100644 --- a/json-glib/json-node.c +++ b/json-glib/json-node.c @@ -552,9 +552,10 @@ json_node_take_object (JsonNode *node, * json_node_get_object: * @node: a #JsonNode * - * Retrieves the #JsonObject stored inside a #JsonNode + * Retrieves the #JsonObject stored inside a #JsonNode. If the node does not + * hold an object value, %NULL is returned. * - * Return value: (transfer none): the #JsonObject + * Return value: (transfer none) (nullable): the #JsonObject */ JsonObject * json_node_get_object (JsonNode *node) @@ -570,9 +571,10 @@ json_node_get_object (JsonNode *node) * @node: a #JsonNode * * Retrieves the #JsonObject inside @node. The reference count of - * the returned object is increased. + * the returned object is increased. If the node does not hold an object value, + * %NULL is returned. * - * Return value: (transfer full): the #JsonObject + * Return value: (transfer full) (nullable): the #JsonObject */ JsonObject * json_node_dup_object (JsonNode *node) @@ -643,9 +645,10 @@ json_node_take_array (JsonNode *node, * json_node_get_array: * @node: a #JsonNode * - * Retrieves the #JsonArray stored inside a #JsonNode + * Retrieves the #JsonArray stored inside a #JsonNode. If the node does not + * hold an array value, %NULL is returned. * - * Return value: (transfer none): the #JsonArray + * Return value: (transfer none) (nullable): the #JsonArray */ JsonArray * json_node_get_array (JsonNode *node) @@ -661,9 +664,10 @@ json_node_get_array (JsonNode *node) * @node: a #JsonNode * * Retrieves the #JsonArray stored inside a #JsonNode and returns it - * with its reference count increased by one. + * with its reference count increased by one. If the node does not hold an + * array value, %NULL is returned. * - * Return value: (transfer full): the #JsonArray with its reference + * Return value: (transfer full) (nullable): the #JsonArray with its reference * count increased. */ JsonArray * @@ -684,7 +688,8 @@ json_node_dup_array (JsonNode *node) * @value: (out caller-allocates): return location for an uninitialized value * * Retrieves a value from a #JsonNode and copies into @value. When done - * using it, call g_value_unset() on the #GValue. + * using it, call g_value_unset() on the #GValue. If the node does not hold a + * scalar value, @value is not modified. */ void json_node_get_value (JsonNode *node, @@ -948,8 +953,8 @@ json_node_set_parent (JsonNode *node, * * Retrieves the parent #JsonNode of @node. * - * Return value: (transfer none): the parent node, or %NULL if @node is - * the root node + * Return value: (transfer none) (nullable): the parent node, or %NULL if @node + * is the root node */ JsonNode * json_node_get_parent (JsonNode *node) @@ -989,9 +994,10 @@ json_node_set_string (JsonNode *node, * json_node_get_string: * @node: a #JsonNode of type %JSON_NODE_VALUE * - * Gets the string value stored inside a #JsonNode + * Gets the string value stored inside a #JsonNode. If the node does not hold a + * string value, %NULL is returned. * - * Return value: a string value. + * Return value: (nullable): a string value. */ const gchar * json_node_get_string (JsonNode *node) @@ -1011,10 +1017,12 @@ json_node_get_string (JsonNode *node) * json_node_dup_string: * @node: a #JsonNode of type %JSON_NODE_VALUE * - * Gets a copy of the string value stored inside a #JsonNode + * Gets a copy of the string value stored inside a #JsonNode. If the node does + * not hold a string value, %NULL is returned. * - * Return value: (transfer full): a newly allocated string containing a copy - * of the #JsonNode contents. Use g_free() to free the allocated resources + * Return value: (transfer full) (nullable): a newly allocated string + * containing a copy of the #JsonNode contents. Use g_free() to free the + * allocated resources */ gchar * json_node_dup_string (JsonNode *node) @@ -1054,7 +1062,11 @@ json_node_set_int (JsonNode *node, * json_node_get_int: * @node: a #JsonNode of type %JSON_NODE_VALUE * - * Gets the integer value stored inside a #JsonNode + * Gets the integer value stored inside a #JsonNode. If the node holds a double + * value, its integer component is returned. If the node holds a %FALSE boolean + * value, `0` is returned; otherwise a non-zero integer is returned. If the + * node holds a %JSON_NODE_NULL value or a value of another non-integer type, + * `0` is returned. * * Return value: an integer value. */ @@ -1108,7 +1120,11 @@ json_node_set_double (JsonNode *node, * json_node_get_double: * @node: a #JsonNode of type %JSON_NODE_VALUE * - * Gets the double value stored inside a #JsonNode + * Gets the double value stored inside a #JsonNode. If the node holds an integer + * value, it is returned as a double. If the node holds a %FALSE boolean value, + * `0.0` is returned; otherwise a non-zero double is returned. If the node holds + * a %JSON_NODE_NULL value or a value of another non-double type, `0.0` is + * returned. * * Return value: a double value. */ @@ -1162,7 +1178,10 @@ json_node_set_boolean (JsonNode *node, * json_node_get_boolean: * @node: a #JsonNode of type %JSON_NODE_VALUE * - * Gets the boolean value stored inside a #JsonNode + * Gets the boolean value stored inside a #JsonNode. If the node holds an + * integer or double value which is zero, %FALSE is returned; otherwise %TRUE + * is returned. If the node holds a %JSON_NODE_NULL value or a value of another + * non-boolean type, %FALSE is returned. * * Return value: a boolean value. */ diff --git a/json-glib/json-parser.c b/json-glib/json-parser.c index 10ce3d8..dda3eeb 100644 --- a/json-glib/json-parser.c +++ b/json-glib/json-parser.c @@ -41,7 +41,6 @@ #include "json-types-private.h" #include "json-debug.h" -#include "json-marshal.h" #include "json-parser.h" #include "json-scanner.h" @@ -238,7 +237,7 @@ json_parser_class_init (JsonParserClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (JsonParserClass, parse_start), NULL, NULL, - json_marshal_VOID__VOID, + NULL, G_TYPE_NONE, 0); /** * JsonParser::parse-end: @@ -252,13 +251,12 @@ json_parser_class_init (JsonParserClass *klass) G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (JsonParserClass, parse_end), - NULL, NULL, - json_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); /** * JsonParser::object-start: * @parser: the #JsonParser that received the signal - * + * * The ::object-start signal is emitted each time the #JsonParser * starts parsing a #JsonObject. */ @@ -267,8 +265,7 @@ json_parser_class_init (JsonParserClass *klass) G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (JsonParserClass, object_start), - NULL, NULL, - json_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); /** * JsonParser::object-member: @@ -285,8 +282,7 @@ json_parser_class_init (JsonParserClass *klass) G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (JsonParserClass, object_member), - NULL, NULL, - json_marshal_VOID__BOXED_STRING, + NULL, NULL, NULL, G_TYPE_NONE, 2, JSON_TYPE_OBJECT, G_TYPE_STRING); @@ -303,8 +299,7 @@ json_parser_class_init (JsonParserClass *klass) G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (JsonParserClass, object_end), - NULL, NULL, - json_marshal_VOID__BOXED, + NULL, NULL, NULL, G_TYPE_NONE, 1, JSON_TYPE_OBJECT); /** @@ -319,8 +314,7 @@ json_parser_class_init (JsonParserClass *klass) G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (JsonParserClass, array_start), - NULL, NULL, - json_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); /** * JsonParser::array-element: @@ -337,8 +331,7 @@ json_parser_class_init (JsonParserClass *klass) G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (JsonParserClass, array_element), - NULL, NULL, - json_marshal_VOID__BOXED_INT, + NULL, NULL, NULL, G_TYPE_NONE, 2, JSON_TYPE_ARRAY, G_TYPE_INT); @@ -355,8 +348,7 @@ json_parser_class_init (JsonParserClass *klass) G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (JsonParserClass, array_end), - NULL, NULL, - json_marshal_VOID__BOXED, + NULL, NULL, NULL, G_TYPE_NONE, 1, JSON_TYPE_ARRAY); /** @@ -372,8 +364,7 @@ json_parser_class_init (JsonParserClass *klass) G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (JsonParserClass, error), - NULL, NULL, - json_marshal_VOID__POINTER, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_POINTER); } @@ -610,7 +601,8 @@ json_parse_array (JsonParser *parser, array_done: json_scanner_get_next_token (scanner); - json_array_seal (array); + if (priv->is_immutable) + json_array_seal (array); json_node_take_array (priv->current_node, array); if (priv->is_immutable) @@ -676,7 +668,7 @@ json_parse_object (JsonParser *parser, /* member name */ token = json_scanner_get_next_token (scanner); name = g_strdup (scanner->value.v_string); - if (name == NULL || *name == '\0') + if (name == NULL) { JSON_NOTE (PARSER, "Empty object member name"); @@ -791,7 +783,8 @@ json_parse_object (JsonParser *parser, json_scanner_get_next_token (scanner); - json_object_seal (object); + if (priv->is_immutable) + json_object_seal (object); json_node_take_object (priv->current_node, object); if (priv->is_immutable) @@ -905,12 +898,12 @@ json_scanner_msg_handler (JsonScanner *scanner, JsonParserPrivate *priv = parser->priv; GError *error = NULL; - /* 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 - */ g_set_error (&error, JSON_PARSER_ERROR, priv->error_code, + /* 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 + */ _("%s:%d:%d: Parse error: %s"), priv->is_filename ? priv->filename : "", scanner->line, diff --git a/json-glib/json-path.c b/json-glib/json-path.c index 4604cd9..c325da5 100644 --- a/json-glib/json-path.c +++ b/json-glib/json-path.c @@ -391,9 +391,9 @@ json_path_compile (JsonPath *path, if (!(*(p + 1) == '.' || *(p + 1) == '[' || *(p + 1) == '\0')) { - /* translators: the %c is the invalid character */ g_set_error (error, JSON_PATH_ERROR, JSON_PATH_ERROR_INVALID_QUERY, + /* translators: the %c is the invalid character */ _("Root node followed by invalid character '%c'"), *(p + 1)); return FALSE; diff --git a/json-glib/json-reader.c b/json-glib/json-reader.c index afc2414..cc33629 100644 --- a/json-glib/json-reader.c +++ b/json-glib/json-reader.c @@ -287,6 +287,7 @@ json_reader_set_root (JsonReader *reader, * Return value: %FALSE, to be used to return immediately from * the caller function */ +G_GNUC_PRINTF (3, 4) static gboolean json_reader_set_error (JsonReader *reader, JsonReaderError error_code, diff --git a/json-glib/json-scanner.c b/json-glib/json-scanner.c index daf9ead..0c9919f 100644 --- a/json-glib/json-scanner.c +++ b/json-glib/json-scanner.c @@ -130,25 +130,6 @@ static JsonScannerConfig json_scanner_config_template = #define READ_BUFFER_SIZE (4000) -static const gchar json_symbol_names[] = - "true\0" - "false\0" - "null\0" - "var\0"; - -static const struct -{ - guint name_offset; - guint token; -} json_symbols[] = { - { 0, JSON_TOKEN_TRUE }, - { 5, JSON_TOKEN_FALSE }, - { 11, JSON_TOKEN_NULL }, - { 16, JSON_TOKEN_VAR } -}; - -static const guint n_json_symbols = G_N_ELEMENTS (json_symbols); - /* --- typedefs --- */ typedef struct _JsonScannerKey JsonScannerKey; diff --git a/json-glib/json-version.h b/json-glib/json-version.h index f3455a4..58893be 100644 --- a/json-glib/json-version.h +++ b/json-glib/json-version.h @@ -55,14 +55,14 @@ * * Json micro version component (e.g. 3 if %JSON_VERSION is 1.2.3) */ -#define JSON_MICRO_VERSION (2) +#define JSON_MICRO_VERSION (4) /** * JSON_VERSION * * Json version. */ -#define JSON_VERSION (1.2.2) +#define JSON_VERSION (1.2.4) /** * JSON_VERSION_S: @@ -70,7 +70,7 @@ * JSON-GLib version, encoded as a string, useful for printing and * concatenation. */ -#define JSON_VERSION_S "1.2.2" +#define JSON_VERSION_S "1.2.4" #define JSON_ENCODE_VERSION(major,minor,micro) \ ((major) << 24 | (minor) << 16 | (micro) << 8) diff --git a/json-glib/meson.build b/json-glib/meson.build new file mode 100644 index 0000000..13b7467 --- /dev/null +++ b/json-glib/meson.build @@ -0,0 +1,127 @@ +install_header_subdir = 'json-glib-1.0/json-glib' +install_header_dir = join_paths(json_includedir, install_header_subdir) + +configure_file(output: 'config.h', configuration: cdata) + +source_h = [ + 'json-builder.h', + 'json-generator.h', + 'json-gobject.h', + 'json-gvariant.h', + 'json-parser.h', + 'json-path.h', + 'json-reader.h', + 'json-types.h', + 'json-utils.h', + 'json-version-macros.h' +] + +json_glib_enums = gnome.mkenums('json-enum-types', + sources: source_h, + h_template: 'json-enum-types.h.in', + c_template: 'json-enum-types.c.in', + install_header: true, + install_dir: install_header_dir) + +source_c = [ + 'json-array.c', + 'json-builder.c', + 'json-debug.c', + 'json-gboxed.c', + 'json-generator.c', + 'json-gobject.c', + 'json-gvariant.c', + 'json-node.c', + 'json-object.c', + 'json-parser.c', + 'json-path.c', + 'json-reader.c', + 'json-scanner.c', + 'json-serializable.c', + 'json-utils.c', + 'json-value.c', +] + +version_data = configuration_data() +version_data.set('JSON_MAJOR_VERSION', json_version_major) +version_data.set('JSON_MINOR_VERSION', json_version_minor) +version_data.set('JSON_MICRO_VERSION', json_version_micro) +version_data.set('JSON_VERSION', meson.project_version()) + +version_h = configure_file(input: 'json-version.h.in', + output: 'json-version.h', + install_dir: install_header_dir, + configuration: version_data) + +install_headers(source_h, subdir: install_header_subdir) + +json_c_args = [ + '-DJSON_COMPILATION', + '-DG_LOG_DOMAIN="Json"', + '-DJSON_LOCALEDIR="@0@"'.format(json_localedir) +] + +common_ldflags = [] + +if host_system == 'linux' + common_ldflags = [ '-Wl,-Bsymbolic', '-Wl,-z,relro', '-Wl,-z,now', ] +endif + +# Maintain compatibility with autotools +if host_system == 'darwin' + common_ldflags += [ '-compatibility_version=1', '-current_version=1.0', ] +endif + + +json_lib = library('json-glib-1.0', + source_c, + version: libversion, + soversion: soversion, + include_directories: root_dir, + dependencies: [ gio_dep, gobject_dep, ], + c_args: json_c_args + common_cflags + extra_args, + link_args: common_ldflags, + install: true) + +pkgg = import('pkgconfig') + +pkgg.generate(libraries: [ json_lib ], + subdirs: '.', + version: json_version, + name: 'JSON-GLib', + filebase: 'json-glib-@0@'.format(apiversion), + description: 'JSON Parser for GLib.', + requires: 'glib-2.0 gio-2.0') + +json_gen_sources = [ json_glib_enums, version_h ] +if build_gir + json_gen_sources += gnome.generate_gir(json_lib, + sources: source_c + source_h, + namespace: 'Json', + nsversion: apiversion, + identifier_prefix: 'Json', + symbol_prefix: 'json', + export_packages: 'json-glib-1.0', + includes: [ 'GObject-2.0', 'Gio-2.0', ], + install: true, + extra_args: ['-DJSON_COMPILATION']) +endif + +json_glib_dep = declare_dependency(link_with: json_lib, + include_directories: root_dir, + dependencies: [ gobject_dep, gio_dep, ], + sources: json_gen_sources) + +tools = [ + [ 'json-glib-validate', [ 'json-glib-validate.c', ] ], + [ 'json-glib-format', [ 'json-glib-format.c', ] ], +] + +foreach t: tools + bin_name = t[0] + bin_sources = t[1] + + executable(bin_name, bin_sources, c_args: json_c_args, dependencies: json_glib_dep) +endforeach + +subdir('tests') diff --git a/json-glib/tests/builder.c b/json-glib/tests/builder.c index eaabb0d..b3e07d6 100644 --- a/json-glib/tests/builder.c +++ b/json-glib/tests/builder.c @@ -6,7 +6,7 @@ #include -static const gchar *complex_object = "{\"depth1\":[1,{\"depth2\":[3,[null,false],\"after array\"],\"value2\":true}],\"object1\":{},\"value3\":null,\"value4\":42}"; +static const gchar *complex_object = "{\"depth1\":[1,{\"depth2\":[3,[null,false],\"after array\"],\"value2\":true}],\"object1\":{},\"value3\":null,\"value4\":42,\"\":54}"; static const gchar *empty_object = "{\"a\":{}}"; @@ -58,6 +58,9 @@ test_builder_complex (void) json_builder_set_member_name (builder, "value4"); json_builder_add_int_value (builder, 42); + json_builder_set_member_name (builder, ""); + json_builder_add_int_value (builder, 54); + json_builder_end_object (builder); node = json_builder_get_root (builder); diff --git a/json-glib/tests/generator.c b/json-glib/tests/generator.c index f156fde..e7dabff 100644 --- a/json-glib/tests/generator.c +++ b/json-glib/tests/generator.c @@ -16,7 +16,7 @@ static const gchar *empty_object = "{}"; static const gchar *simple_array = "[true,false,null,42,\"foo\"]"; static const gchar *nested_array = "[true,[false,null],42]"; -static const gchar *simple_object = "{\"Bool1\":true,\"Bool2\":false,\"Null\":null,\"Int\":42,\"String\":\"foo\"}"; +static const gchar *simple_object = "{\"Bool1\":true,\"Bool2\":false,\"Null\":null,\"Int\":42,\"\":54,\"String\":\"foo\"}"; /* taken from the RFC 4627, Examples section */ static const gchar *nested_object = "{" @@ -209,6 +209,7 @@ test_simple_object (void) json_object_set_boolean_member (object, "Bool2", FALSE); json_object_set_null_member (object, "Null"); json_object_set_int_member (object, "Int", 42); + json_object_set_int_member (object, "", 54); json_object_set_string_member (object, "String", "foo"); json_node_take_object (root, object); @@ -334,6 +335,27 @@ test_decimal_separator (void) json_node_free (node); } + +static void +test_double_stays_double (void) +{ + gchar *str; + JsonNode *node = json_node_new (JSON_NODE_VALUE); + JsonGenerator *generator = json_generator_new (); + + json_node_set_double (node, 1.0); + + json_generator_set_root (generator, node); + + str = json_generator_to_data (generator, NULL); + g_assert_cmpstr (str, ==, "1.0"); + + g_free (str); + g_object_unref (generator); + json_node_free (node); +} + + static void test_pretty (void) { @@ -426,6 +448,7 @@ main (int argc, g_test_add_func ("/generator/simple-object", test_simple_object); g_test_add_func ("/generator/nested-object", test_nested_object); g_test_add_func ("/generator/decimal-separator", test_decimal_separator); + 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++) diff --git a/json-glib/tests/gvariant.c b/json-glib/tests/gvariant.c index 701997d..e88b1b9 100644 --- a/json-glib/tests/gvariant.c +++ b/json-glib/tests/gvariant.c @@ -45,7 +45,7 @@ static const TestCase two_way_test_cases[] = { "/double", "(d)", "(1.23,)", "[1.23]" }, /* double */ - { "/double-whole", "(d)", "(123.0,)", "[123]" }, + { "/double-whole", "(d)", "(123.0,)", "[123.0]" }, /* string */ { "/string", "(s)", "('hello world!',)", "[\"hello world!\"]" }, @@ -158,7 +158,7 @@ static const TestCase json_to_gvariant_test_cases[] = { "/string-to-int64", "(x)", "(int64 -666999666999,)", "[\"-666999666999\"]" }, { "/string-to-uint64", "(t)", "(uint64 1999999999999999,)", "[\"1999999999999999\"]" }, { "/string-to-double", "(d)", "(1.23,)", "[\"1.23\"]" }, - { "/string-to-double-whole", "(d)", "(123.0,)", "[\"123\"]" }, + { "/string-to-double-whole", "(d)", "(123.0,)", "[\"123.0\"]" }, }; static void diff --git a/json-glib/tests/invalid.c b/json-glib/tests/invalid.c index c5fad16..b782566 100644 --- a/json-glib/tests/invalid.c +++ b/json-glib/tests/invalid.c @@ -231,7 +231,7 @@ static const struct { "object-4", "{ \"foo\" : 42 ]", test_invalid_object }, { "object-5", "{ \"blah\" }", test_invalid_object }, { "object-6", "{ \"a\" : 0 \"b\" : 1 }", test_invalid_object }, - { "object-7", "{ \"\" : false }", test_invalid_object }, + { "object-7", "{ null: false }", test_invalid_object }, /* missing commas */ { "missing-comma-1", "[ true false ]", test_missing_comma }, diff --git a/json-glib/tests/meson.build b/json-glib/tests/meson.build new file mode 100644 index 0000000..9cab4bc --- /dev/null +++ b/json-glib/tests/meson.build @@ -0,0 +1,37 @@ +tests = [ + 'array', + 'boxed', + 'builder', + 'generator', + 'gvariant', + 'invalid', + 'node', + 'object', + 'parser', + 'path', + 'reader', + 'serialize-simple', + 'serialize-complex', + 'serialize-full', +] + +python3 = find_program('python3') + +test_data = [ + 'stream-load.json', +] + +foreach d: test_data + copy = 'from shutil import copyfile; copyfile("@0@", "@1@")'.format(d, join_paths(meson.current_build_dir(), d)) + cp = run_command(python3, '-c', copy) + if cp.returncode() != 0 + error('Could not copy file: ' + cp.stderr()) + endif +endforeach + +foreach t: tests + exe = executable(t, '@0@.c'.format(t), + c_args: json_c_args, + dependencies: [ json_glib_dep, ]) + test(t, exe) +endforeach diff --git a/json-glib/tests/object.c b/json-glib/tests/object.c index 54b5934..03a478c 100644 --- a/json-glib/tests/object.c +++ b/json-glib/tests/object.c @@ -64,6 +64,9 @@ test_set_member (void) json_object_set_object_member (object, "Object", NULL); g_assert (json_object_get_null_member (object, "Object") == TRUE); + json_object_set_object_member (object, "", NULL); + g_assert (json_object_get_null_member (object, "") == TRUE); + json_object_unref (object); } @@ -95,7 +98,8 @@ static const struct { { "boolean", JSON_NODE_VALUE, G_TYPE_BOOLEAN }, { "string", JSON_NODE_VALUE, G_TYPE_STRING }, { "double", JSON_NODE_VALUE, G_TYPE_DOUBLE }, - { "null", JSON_NODE_NULL, G_TYPE_INVALID } + { "null", JSON_NODE_NULL, G_TYPE_INVALID }, + { "", JSON_NODE_VALUE, G_TYPE_INT64 } }; static void @@ -131,6 +135,7 @@ test_foreach_member (void) json_object_set_string_member (object, "string", "hello"); json_object_set_double_member (object, "double", 3.14159); json_object_set_null_member (object, "null"); + json_object_set_int_member (object, "", 0); json_object_foreach_member (object, verify_foreach, &fixture); @@ -155,6 +160,7 @@ test_iter (void) json_object_set_string_member (object, "string", "hello"); json_object_set_double_member (object, "double", 3.14159); json_object_set_null_member (object, "null"); + json_object_set_int_member (object, "", 0); json_object_iter_init (&iter, object); diff --git a/json-glib/tests/parser.c b/json-glib/tests/parser.c index bdfbf13..f71584a 100644 --- a/json-glib/tests/parser.c +++ b/json-glib/tests/parser.c @@ -96,7 +96,8 @@ static const struct { { "{ \"name\" : \"\", \"state\" : 1 }", 2, "name", JSON_NODE_VALUE, G_TYPE_STRING }, { "{ \"foo\" : \"bar\", \"baz\" : null }", 2, "baz", JSON_NODE_NULL, G_TYPE_INVALID }, { "{ \"channel\" : \"/meta/connect\" }", 1, "channel", JSON_NODE_VALUE, G_TYPE_STRING }, - { "{ \"halign\":0.5, \"valign\":0.5 }", 2, "valign", JSON_NODE_VALUE, G_TYPE_DOUBLE } + { "{ \"halign\":0.5, \"valign\":0.5 }", 2, "valign", JSON_NODE_VALUE, G_TYPE_DOUBLE }, + { "{ \"\" : \"emptiness\" }", 1, "", JSON_NODE_VALUE, G_TYPE_STRING } }; static const gchar *test_nested_objects[] = { diff --git a/meson.build b/meson.build new file mode 100644 index 0000000..14f6e34 --- /dev/null +++ b/meson.build @@ -0,0 +1,157 @@ +project('json-glib', 'c', version: '1.2.4', + license: 'LGPLv2.1+', + default_options: [ + 'warning_level=1', + 'buildtype=debugoptimized', + ], + meson_version: '>= 0.37.1') + + +# Versionning +json_version = meson.project_version() +version_arr = json_version.split('.') +json_version_major = version_arr[0] +json_version_minor = version_arr[1] +json_version_micro = version_arr[2] + +apiversion = '1.0' +soversion = 0 + +if json_version_micro.to_int().is_odd() + json_interface_age = 0 +else + json_interface_age = json_version_micro +endif + +# maintaining compatibility with the previous libtool versioning +# current = minor * 100 + micro - interface +# revision = interface +soversion = 0 +current = json_version_minor.to_int() * 100 + json_version_micro.to_int() - json_interface_age +revision = json_interface_age +libversion = '@0@.@1@.@2@'.format(soversion, current, revision) + +# Paths +json_includedir = join_paths(get_option('prefix'), get_option('includedir')) +json_datadir = join_paths(get_option('prefix'), get_option('datadir')) +json_mandir = join_paths(get_option('prefix'), get_option('mandir')) +json_localedir = join_paths(get_option('prefix'), get_option('localedir')) + +# Dependencies +glib_req_version = '>= 2.37.6' +gobject_dep = dependency('gobject-2.0', version: glib_req_version) +gio_dep = dependency('gio-2.0', version: glib_req_version) + +# Configurations +cc = meson.get_compiler('c') +host_system = host_machine.system() +extra_args = [] + +cdata = configuration_data() +check_headers = [ + ['unistd.h', 'HAVE_UNISTD_H'], +] + +foreach h: check_headers + if cc.has_header(h.get(0)) + cdata.set(h.get(1), 1) + endif +endforeach +cdata.set_quoted('GETTEXT_PACKAGE', 'json-glib-1.0') + +if cc.get_id() == 'msvc' + # Compiler options taken from msvc_recommended_pragmas.h + # in GLib, based on _Win32_Programming_ by Rector and Newcomer + test_cflags = [ + '-we4002', # too many actual parameters for macro + '-we4003', # not enough actual parameters for macro + '-w14010', # single-line comment contains line-continuation character + '-we4013', # 'function' undefined; assuming extern returning int + '-w14016', # no function return type; using int as default + '-we4020', # too many actual parameters + '-we4021', # too few actual parameters + '-we4027', # function declared without formal parameter list + '-we4029', # declared formal parameter list different from definition + '-we4033', # 'function' must return a value + '-we4035', # 'function' : no return value + '-we4045', # array bounds overflow + '-we4047', # different levels of indirection + '-we4049', # terminating line number emission + '-we4053', # an expression of type void was used as an operand + '-we4071', # no function prototype given + '-we4819', # the file contains a character that cannot be represented in the current code page + ] +elif cc.get_id() == 'gcc' or cc.get_id() == 'clang' + test_cflags = [ + '-Wpointer-arith', + '-Wmissing-declarations', + '-Wformat=2', + '-Wstrict-prototypes', + '-Wmissing-prototypes', + '-Wnested-externs', + '-Wold-style-definition', + '-Wdeclaration-after-statement', + '-Wunused', + '-Wno-uninitialized', + '-Wshadow', + '-Wcast-align', + '-Wmissing-noreturn', + '-Wmissing-format-attribute', + '-Wlogical-op', + '-Wno-discarded-qualifiers', + '-Werror=implicit', + '-Werror=nonnull', + '-Werror=init-self', + '-Werror=main', + '-Werror=missing-braces', + '-Werror=sequence-point', + '-Werror=return-type', + '-Werror=trigraphs', + '-Werror=array-bounds', + '-Werror=write-strings', + '-Werror=address', + '-Werror=int-to-pointer-cast', + '-Werror=pointer-to-int-cast', + '-Werror=empty-body', + '-fno-strict-aliasing', + '-Wno-int-conversion', + ] +else + test_cflags = [] +endif + +common_cflags = [] +foreach cflag: test_cflags + if cc.has_argument(cflag) + common_cflags += [ cflag ] + endif +endforeach + +if get_option('default_library') != 'static' + if host_system == 'windows' + cdata.set('DLL_EXPORT', true) + if cc.get_id() == 'msvc' + cdata.set('_JSON_EXTERN', '__declspec(dllexport) extern') + else + cdata.set('_JSON_EXTERN', '__attribute__((visibility("default"))) __declspec(dllexport) extern') + extra_args += ['-fvisibility=hidden'] + endif + else + cdata.set('_JSON_EXTERN', '__attribute__((visibility("default"))) extern') + extra_args += ['-fvisibility=hidden'] + endif +endif + +root_dir = include_directories('.') + +gnome = import('gnome') +gir = find_program('g-ir-scanner', required: false) +build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable_introspection') + +subdir('json-glib') + +subdir('po') + +if get_option('enable-gtk-doc') + subdir('doc/reference') +endif diff --git a/meson_options.txt b/meson_options.txt new file mode 100644 index 0000000..4dc2a01 --- /dev/null +++ b/meson_options.txt @@ -0,0 +1,9 @@ +option('disable_introspection', + type: 'boolean', value: false, + description: 'Whether to disable the introspection generation') +option('enable-gtk-doc', + type: 'boolean', value: false, + description: 'Whether to generate the API reference for JSON-GLib') +option('enable-man', + type: 'boolean', value: false, + description: 'Whether to generate the man pages for JSON-GLib tools') diff --git a/po/Makevars b/po/Makevars index 0df7a65..fe36f8b 100644 --- a/po/Makevars +++ b/po/Makevars @@ -1,5 +1,5 @@ DOMAIN = json-glib-1.0 -XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=P_ --keyword=C_ +XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 --keyword=P_ --add-comments COPYRIGHT_HOLDER = Intel Corporation MSGID_BUGS_ADDRESS = http://bugzilla.gnome.org/enter_bug.cgi?product=json-glib EXTRA_LOCALE_CATEGORIES = diff --git a/po/as.gmo b/po/as.gmo index 4405d1c77aece4bb675bd73641d6a040585a5cac..4f3ea9f76e09cb48c0af80c8203c89e7f8af698c 100644 GIT binary patch delta 29 kcmX?San52x4Yz=~u7R=wt>Os9_~W|0Ej#YaR2}S delta 29 kcmX?San52x4Yz=qu7SC(k)?v6ft9JTwt?a19_~W|0Eq|)fdBvi diff --git a/po/as.po b/po/as.po index abd8713..8990ca4 100644 --- a/po/as.po +++ b/po/as.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2014-08-20 13:18+0530\n" "Last-Translator: Nilamdyuti Goswami \n" "Language-Team: Assamese \n" @@ -27,21 +27,33 @@ msgstr "আউটপুট ধূনীয়া কৰক" msgid "Indentation spaces" 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:77 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:89 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:108 #, c-format msgid "%s: %s: error writing to stdout" msgstr "%s: %s: stdout লৈ লিখোতে ত্ৰুটি" +#. Translators: the first %s is the program name, the second one +#. * is the URI of the file, the third is the error message. +#. #: json-glib/json-glib-format.c:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -51,6 +63,8 @@ msgstr "%s: %s: বন্ধ কৰোতে ত্ৰুটি: %s\n" msgid "FILE" msgstr "ফাইল" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "JSON ফাইলসমূহক ফৰমেট কৰক।" @@ -59,6 +73,10 @@ msgstr "JSON ফাইলসমূহক ফৰমেট কৰক।" 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -70,11 +88,17 @@ msgstr "কমান্ডশাৰী বিকল্পসমূহ বিশ 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:193 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 ফাইলসমূহ সত্যাপন কৰক।" @@ -83,11 +107,13 @@ msgstr "JSON ফাইলসমূহ সত্যাপন কৰক।" msgid "json-glib-validate validates JSON data at the given URI." msgstr "json-glib-validate এ প্ৰদান কৰা URl ত JSON তথ্য সত্যাপন কৰে।" +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, 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:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -128,12 +154,16 @@ msgstr "অবৈধ GVariant স্বাক্ষৰ" msgid "JSON data is empty" msgstr "JSON তথ্য ৰিক্ত" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: বিশ্লেষণ ত্ৰুটি: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "JSON তথ্য UTF-8 এনক'ডেড হব লাগিব" @@ -141,6 +171,7 @@ msgstr "JSON তথ্য UTF-8 এনক'ডেড হব লাগিব" 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:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -175,61 +206,61 @@ msgstr "অভৈধ এৰে সূচী বিৱৰণ '%*s'" msgid "Invalid first character '%c'" msgstr "অবৈধ প্ৰথম আখৰ '%c'" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "বৰ্তমান ন'ডৰ ধৰণ '%s', কিন্তু এটা এৰে অথবা এটা অবজেক্ট আশা কৰা হৈছিল।" -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "সূচী '%d' বৰ্তমান অৱস্থানত এৰেৰ আকাৰতকে অধিক।" -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "সূচী '%d' বৰ্তমান অৱস্থানত অবজেক্টৰ আকাৰতকে ডাঙৰ।" -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "বৰ্তমান অৱস্থানত কোনো ন'ড উপলব্ধ নাই" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "বৰ্তমান অৱস্থানত এটা '%s' আছে কিন্তু এটা এৰে নাই" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "বৰ্তমান ন'ডৰ ধৰণ '%s', কিন্তু এটা অবজেক্ট আশা কৰা হৈছিল।" -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "সদস্য '%s' বৰ্তমান অৱস্থানৰ অবজেক্টত বিৱৰিত নহয়।" -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "বৰ্তমান অৱস্থানত এটা '%s' আছে কিন্তু এটা অবজেক্ট নাই" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "বৰ্তমান অৱস্থানত এটা '%s' আছে কিন্তু এটা মান নাই" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "বৰ্তমান অৱস্থানত এটা স্ট্ৰিং ধৰণ নাই" diff --git a/po/bg.gmo b/po/bg.gmo index 17ab147747a6152ff8a105c46ef561727636c79b..3c1e0a474d580ba013f0619f5a8f90979da9f759 100644 GIT binary patch delta 29 kcmZ3kyj*#MAcugtu7R=wt>NBMUFO30B*$w+5i9m delta 29 kcmZ3kyj*#MAcugNu7SC(k)?v6ft9JTwt?YhMUFO30B?~7>Hq)$ diff --git a/po/bg.po b/po/bg.po index b039eb9..17f1394 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2013-01-08 21:45+0200\n" "Last-Translator: Ivaylo Valkov \n" "Language-Team: Bulgarian \n" @@ -26,21 +26,33 @@ msgstr "" msgid "Indentation spaces" 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:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" 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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "" +#. Translators: the first %s is the program name, the +#. * second one is the URI of the file. +#. #: json-glib/json-glib-format.c:108 #, c-format msgid "%s: %s: error writing to stdout" 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -50,6 +62,8 @@ msgstr "" msgid "FILE" msgstr "" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "" @@ -58,6 +72,10 @@ msgstr "" msgid "json-glib-format formats JSON resources." msgstr "" +#. 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -69,11 +87,17 @@ msgstr "" msgid "Try \"%s --help\" for more information." msgstr "" +#. 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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "" +#. 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 "" @@ -82,11 +106,13 @@ msgstr "" msgid "json-glib-validate validates JSON data at the given URI." msgstr "" +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, 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:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -128,12 +154,16 @@ msgstr "Грешен подпис за вида GVariant" msgid "JSON data is empty" msgstr "Няма данни в JSON" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: Грешка при анализиране: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "" @@ -141,6 +171,7 @@ msgstr "" 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:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -175,60 +206,60 @@ msgstr "Неправилна дефиниция за индекс на маси msgid "Invalid first character '%c'" msgstr "" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "Възелът е от вида „%s“. Очакваше се масив или обект." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "Индексът „%d“ е по-голям от броя на елементите в масива." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "Индексът „%d“ е по-голям от броя на елементите в обекта." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "Липсва възел на тази позиция" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "На тази позиция трябва да има масив, а не „%s“" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "Възелът е от вида „%s“. Очакваше се обект." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "Членът „%s“ не е дефиниран на тази позиция в обекта." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "На тази позиция трябва да има обект, а не „%s“" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "На тази позиция трябва да има стойност, а не „%s“" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "На тази позиция няма низ" diff --git a/po/bn_IN.gmo b/po/bn_IN.gmo index 6cc33402cd912ba9259fcd71f178e5ea55cc1a0b..9d63ed8be8eb2b0e9b5a897e9475e5ca56b272ca 100644 GIT binary patch delta 29 kcmZqIY}efIoL#_N*T7iU&{)CH*vh~_+rVJ+clHT90Dx`?T>t<8 delta 29 kcmZqIY}efIoL#_7*T7uY$Wp=3z{=EE+rV)1clHT90D(FPZ2$lO diff --git a/po/bn_IN.po b/po/bn_IN.po index a8f751d..54c43a5 100644 --- a/po/bn_IN.po +++ b/po/bn_IN.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2012-09-23 11:44+0530\n" "Last-Translator: Sayak Sarkar \n" "Language-Team: Bengali (India) \n" @@ -27,21 +27,33 @@ msgstr "" msgid "Indentation spaces" 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:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" 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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "" +#. Translators: the first %s is the program name, the +#. * second one is the URI of the file. +#. #: json-glib/json-glib-format.c:108 #, c-format msgid "%s: %s: error writing to stdout" 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:129 json-glib/json-glib-validate.c:87 #, fuzzy, c-format msgid "%s: %s: error closing: %s\n" @@ -51,6 +63,8 @@ msgstr "%s:%d: পার্স ত্রুটি: %s" msgid "FILE" msgstr "" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "" @@ -59,6 +73,10 @@ msgstr "" msgid "json-glib-format formats JSON resources." msgstr "" +#. 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -70,11 +88,17 @@ msgstr "" msgid "Try \"%s --help\" for more information." msgstr "" +#. 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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "" +#. 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 "" @@ -83,11 +107,13 @@ msgstr "" msgid "json-glib-validate validates JSON data at the given URI." msgstr "" +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, 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:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -127,12 +153,16 @@ msgstr "অবৈধ GVariant স্বাক্ষর" msgid "JSON data is empty" msgstr "JSON তথ্য খালি" -#: json-glib/json-parser.c:914 +#. 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:907 #, fuzzy, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d: পার্স ত্রুটি: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "" @@ -140,6 +170,7 @@ msgstr "" 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:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -174,60 +205,60 @@ msgstr "অবৈধ অ্যারের সূচক সংজ্ঞা '%*s' msgid "Invalid first character '%c'" msgstr "" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "বর্তমান নোড '%s' ধরনের, কিন্তু একটি অ্যারে অথবা কোনো বস্তু প্রত্যাশিত ছিল।" -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "সূচক '%d' বর্তমান অবস্থান এ অ্যারের মাপের চেয়ে বেশী।" -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "সূচক '% d' বর্তমান অবস্থানে বস্তুর আকারের চেয়ে বৃহত্তর।" -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "বর্তমান অবস্থানে কোন নোড উপলব্ধ নয়" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "বর্তমান অবস্থানে একটি অ্যারের জায়গায় '%s' উপস্থিত" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "বর্তমান নোড '%s' ধরনের, কিন্তু একটি বস্তু প্রত্যাশিত ছিল।" -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "'%s' সদস্য বর্তমান অবস্থানে অবজেক্টে সংজ্ঞায়িত করা নেই।" -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "বর্তমান অবস্থানে একটি বস্তুর জায়গায় '%s' উপস্থিত" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "বর্তমান অবস্থানে একটি মানের জায়গায় '%s' উপস্থিত" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "বর্তমান অবস্থানে কোন স্ট্রিং নেই" diff --git a/po/bs.gmo b/po/bs.gmo index fe95d74375980bd185ad548d40409a884658b763..a45b07a4fdabfa61d5ae0347c435168a66ce6b7f 100644 GIT binary patch delta 29 kcmbQKF;inhDYt;Ru7R=wt>OsR_-Yr0C*e+qW}N^ delta 29 kcmbQKF;inhDYt-`u7SC(k)?v6ft9JTwt?a1R_-Yr0C?yJvj6}9 diff --git a/po/bs.po b/po/bs.po index 0df59f9..fc0e40b 100644 --- a/po/bs.po +++ b/po/bs.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: json-glib\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2015-02-04 15:19+0000\n" "Last-Translator: Samir Ribić \n" "Language-Team: Bosnian \n" @@ -22,21 +22,33 @@ msgstr "Uljepšati izlaz" msgid "Indentation spaces" msgstr "Mjesta indentacije" +#. Translators: the first %s is the program name, the second one +#. * is the URI of the file, the third is the error message. +#. #: json-glib/json-glib-format.c:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" msgstr "%s: %s: greška pri otvaranju datoteke: %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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "%s: %s: greška pri analizi datopteke: %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:108 #, c-format msgid "%s: %s: error writing to stdout" msgstr "%s: %s: greška pri pisanju 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -46,6 +58,8 @@ msgstr "%s: %s: greška pri zatvaranju: %s\n" msgid "FILE" msgstr "DATOTEKA" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "Formatirati JSON datoteke." @@ -54,6 +68,10 @@ msgstr "Formatirati JSON datoteke." msgid "json-glib-format formats JSON resources." msgstr "json-glib-format formatira JSON resurse." +#. 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -65,11 +83,17 @@ msgstr "Greška u prosljeđivanju opcija komandne linije: %s\n" msgid "Try \"%s --help\" for more information." msgstr "Pokušajte \"%s --help\" za više informacija." +#. 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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "%s: datoteke koje nedostaju" +#. 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 "Potvrditi JSON datoteke." @@ -78,11 +102,13 @@ msgstr "Potvrditi JSON datoteke." msgid "json-glib-validate validates JSON data at the given URI." msgstr "json-glib-validate potvrđuje JSON podatke na zadatom URI-u." +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, c-format msgid "Expecting a JSON object, but the root node is of type `%s'" msgstr "Očekivan JSON objekat, ali je korijenski čvor tipa `%s'" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -122,12 +148,16 @@ msgstr "Pogrešan GVariant potpis" msgid "JSON data is empty" msgstr "JSON podaci su prazni" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: Greška u analizi: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "JSON podaci moraju biti UTF-8 kodirani" @@ -135,6 +165,7 @@ msgstr "JSON podaci moraju biti UTF-8 kodirani" msgid "Only one root node is allowed in a JSONPath expression" msgstr "Samo jedan korijenski čvor je dozvoljen u JSONPath izrazu" +#. translators: the %c is the invalid character #: json-glib/json-path.c:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -169,60 +200,60 @@ msgstr "Pogrešna definicija indeksa niza '%*s'" msgid "Invalid first character '%c'" msgstr "Nevažeći prvi znak '%c'" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "Trenutni čvor je tipa '%s', ali je očekivan ili niz ili objekat." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "Indeks '%d' je veći od veličine niza na trenutnoj poziciji." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "Indeks '%d' je veći od veličine objekta na trenutnoj poziciji." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "Nema raspoloživog čvora na trenutnoj poziciji." -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "Trenutna pozicija sadrži '%s', a ne niz." -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "Trenutni čvor je tipa '%s', a očekivan je objekt." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "Član '%s' nije definiran u objektu na trenutnoj poziciji." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "Trenutna pozicija sadrži '%s' a ne objekt." -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "Trenutna pozicija sadrži '%s', a ne vrijednost" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "Trenutna pozicija ne sadrži stringovni tip vrijednosti" diff --git a/po/ca.gmo b/po/ca.gmo index b6cb72481c269c1fcee51196ca80744c6fb81da9..aea524f632c1e8fae8c07939e2421b5647684b75 100644 GIT binary patch delta 29 kcmZqEZqwdS!!2O0YhbKvXslppY-M1eZD6puhx->N0Cpz__y7O^ delta 29 kcmZqEZqwdS!!2N@YhbQxWT{|iU}b8oZD6>$hx->N0Cw{T2mk;8 diff --git a/po/ca.po b/po/ca.po index 51ce03a..06da15f 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2014-02-22 21:47+0100\n" "Last-Translator: Gil Forcada \n" "Language-Team: Catalan \n" @@ -26,21 +26,33 @@ msgstr "Formata la sortida" msgid "Indentation spaces" msgstr "Espais de sagnat" +#. Translators: the first %s is the program name, the second one +#. * is the URI of the file, the third is the error message. +#. #: json-glib/json-glib-format.c:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" msgstr "%s: %s: s'ha produït un error en obrir el fitxer: %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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "%s: %s: s'ha produït un error en analitzar el fitxer: %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:108 #, c-format msgid "%s: %s: error writing to stdout" msgstr "%s: %s: s'ha produït un error en escriure a la sortida estàndard" +#. 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -50,6 +62,8 @@ msgstr "%s: %s: s'ha produït un error en tancar: %s\n" msgid "FILE" msgstr "FITXER" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "Formata fitxers JSON." @@ -58,6 +72,10 @@ msgstr "Formata fitxers JSON." msgid "json-glib-format formats JSON resources." msgstr "El json-glib-format formata recursos 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -70,11 +88,17 @@ msgstr "" msgid "Try \"%s --help\" for more information." msgstr "Per a més informació proveu «%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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "%s: manquen els fitxers" +#. 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 "Valida fitxers JSON." @@ -83,11 +107,13 @@ msgstr "Valida fitxers JSON." msgid "json-glib-validate validates JSON data at the given URI." msgstr "El json-glib-validate valida les dades JSON de l'URI donat." +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, c-format msgid "Expecting a JSON object, but the root node is of type `%s'" msgstr "S'esperava un objecte JSON, però el node arrel és del tipus «%s»" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -128,12 +154,16 @@ msgstr "La signatura de GVariant no és vàlida" msgid "JSON data is empty" msgstr "No hi ha dades de JSON" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: error en l'anàlisi: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "Les dades JSON han d'estar codificades amb UTF-8" @@ -141,6 +171,7 @@ msgstr "Les dades JSON han d'estar codificades amb UTF-8" msgid "Only one root node is allowed in a JSONPath expression" msgstr "Només es pot utilitzar un node arrel en una expressió JSONPath" +#. translators: the %c is the invalid character #: json-glib/json-path.c:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -175,7 +206,7 @@ msgstr "La definició de l'índex de la matriu «%*s» no és vàlida" msgid "Invalid first character '%c'" msgstr "El primer caràcter «%c» no és vàlid" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." @@ -183,54 +214,54 @@ msgstr "" "El node actual és de tipus «%s», però s'esperava una matriu, o bé, un " "objecte." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "L'índex «%d» és més gran que la mida de la matriu a la posició actual." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "L'índex «%d» és més gran que la mida de l'objecte a la posició actual." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "No hi ha cap node disponible a la posició actual" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "A la posició actual hi ha un «%s» i no una matriu" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "El node actual és de tipus «%s», però s'esperava un objecte." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "El membre «%s» no està definit a l'objecte de la posició actual." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "A la posició actual hi ha un «%s» i no un objecte" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "A la posició actual hi ha un «%s» i no un valor" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "A la posició actual no hi ha una cadena" diff --git a/po/ca@valencia.gmo b/po/ca@valencia.gmo index ac00e756382d4895529b37f28bd0a17737fc2d3e..258b454dc5b71f9547ec341b76d228aeaad1fbe6 100644 GIT binary patch delta 29 kcmca1cSCN2Acugtu7R=wt>NBMGkXz0C&#@;Q#;t delta 29 kcmca1cSCN2AcugNu7SC(k)?v6ft9JTwt?YhMGkXz0C<}Q@c;k- diff --git a/po/ca@valencia.po b/po/ca@valencia.po index 9ec16e2..8faba3a 100644 --- a/po/ca@valencia.po +++ b/po/ca@valencia.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2013-01-21 00:26+0100\n" "Last-Translator: Gil Forcada \n" "Language-Team: Catalan \n" @@ -26,21 +26,33 @@ msgstr "" msgid "Indentation spaces" 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:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" 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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "" +#. Translators: the first %s is the program name, the +#. * second one is the URI of the file. +#. #: json-glib/json-glib-format.c:108 #, c-format msgid "%s: %s: error writing to stdout" 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -50,6 +62,8 @@ msgstr "" msgid "FILE" msgstr "" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "" @@ -58,6 +72,10 @@ msgstr "" msgid "json-glib-format formats JSON resources." msgstr "" +#. 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -69,11 +87,17 @@ msgstr "" msgid "Try \"%s --help\" for more information." msgstr "" +#. 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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "" +#. 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 "" @@ -82,11 +106,13 @@ msgstr "" msgid "json-glib-validate validates JSON data at the given URI." msgstr "" +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, c-format msgid "Expecting a JSON object, but the root node is of type `%s'" msgstr "S'esperava un objecte JSON, però el node arrel és del tipus «%s»" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -127,12 +153,16 @@ msgstr "La signatura de GVariant no és vàlida" msgid "JSON data is empty" msgstr "No hi ha dades de JSON" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: error en l'anàlisi: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "" @@ -140,6 +170,7 @@ msgstr "" msgid "Only one root node is allowed in a JSONPath expression" msgstr "Només es pot utilitzar un node arrel en una expressió JSONPath" +#. translators: the %c is the invalid character #: json-glib/json-path.c:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -174,7 +205,7 @@ msgstr "La definició de l'índex de la matriu «%*s» no és vàlida" msgid "Invalid first character '%c'" msgstr "" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." @@ -182,54 +213,54 @@ msgstr "" "El node actual és de tipus «%s», però s'esperava una matriu, o bé, un " "objecte." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "L'índex «%d» és més gran que la mida de la matriu a la posició actual." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "L'índex «%d» és més gran que la mida de l'objecte a la posició actual." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "No hi ha cap node disponible a la posició actual" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "A la posició actual hi ha un «%s» i no una matriu" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "El node actual és de tipus «%s», però s'esperava un objecte." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "El membre «%s» no està definit a l'objecte de la posició actual." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "A la posició actual hi ha un «%s» i no un objecte" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "A la posició actual hi ha un «%s» i no un valor" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "A la posició actual no hi ha una cadena" diff --git a/po/cs.gmo b/po/cs.gmo index 16ef8f988cf6969a2ad97255a97db97bf3da967b..0ae35844dffc147a77d229fc4a5c2a8da83b269d 100644 GIT binary patch delta 29 kcmcbwd0%rw4Yz=~u7R=wt>Os9`0aH0EguV{{R30 delta 29 kcmcbwd0%rw4Yz=qu7SC(k)?v6ft9JTwt?a19`0aH0En>&4*&oF diff --git a/po/cs.po b/po/cs.po index a36071e..8627200 100644 --- a/po/cs.po +++ b/po/cs.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2014-01-18 22:45+0100\n" "Last-Translator: Marek Černocký \n" "Language-Team: Czech \n" @@ -27,21 +27,33 @@ msgstr "Lépe upravit výstup" msgid "Indentation spaces" msgstr "Mezery pro odsazení" +#. Translators: the first %s is the program name, the second one +#. * is the URI of the file, the third is the error message. +#. #: json-glib/json-glib-format.c:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" msgstr "%s: %s: chyba při otevírání souboru: %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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "%s: %s: chyba při analýze souboru: %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:108 #, c-format msgid "%s: %s: error writing to stdout" msgstr "%s: %s: chyba při zápisu do standardního výstupu" +#. 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -51,6 +63,8 @@ msgstr "%s: %s: chyba při zavírání: %s\n" msgid "FILE" msgstr "SOUBOR" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "Formátovat soubory JSON." @@ -59,6 +73,10 @@ msgstr "Formátovat soubory JSON." msgid "json-glib-format formats JSON resources." msgstr "json-glib-format formátuje prostředky 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -70,11 +88,17 @@ msgstr "Chyba při zpracování přepínačů příkazového řádku: %s\n" msgid "Try \"%s --help\" for more information." msgstr "Pro více informací zkuste použít „%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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "%s: schází soubory" +#. 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 "Ověřit platnost souborů JSON." @@ -83,11 +107,13 @@ msgstr "Ověřit platnost souborů JSON." msgid "json-glib-validate validates JSON data at the given URI." msgstr "json-glib-validate ověřuje platnost dat JSON na zadané adrese URI." +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, c-format msgid "Expecting a JSON object, but the root node is of type `%s'" msgstr "Očekává se objekt JSON, ale kořenový uzel je typu „%s“" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -127,12 +153,16 @@ msgstr "Neplatná signatura GVariant" msgid "JSON data is empty" msgstr "Data JSON jsou prázdná" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: Chyba zpracování: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "Data JSON musí být kódována v UTF-8" @@ -140,6 +170,7 @@ msgstr "Data JSON musí být kódována v UTF-8" msgid "Only one root node is allowed in a JSONPath expression" msgstr "Ve výrazu JSONPath je dovolen pouze jeden kořenový uzel" +#. translators: the %c is the invalid character #: json-glib/json-path.c:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -174,60 +205,60 @@ msgstr "Neplatná definice indexu pole „%*s“" msgid "Invalid first character '%c'" msgstr "Neplatný první znak „%c“" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "Aktuální uzel je typu „%s“, ale bylo očekáváno pole nebo objekt." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "Index „%d“ je větší než velikost pole na aktuální pozici." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "Index „%d“ je větší než velikost objektu na aktuální pozici." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "Na aktuální pozici není k dispozici žádný uzel" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "Aktuální pozice obsahuje „%s“ a ne pole" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "Aktuální uzel je typu „%s“, ale byl očekáván objekt." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "Člen „%s“ není na aktuálním pozici v objektu definován." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "Aktuální pozice obsahuje „%s“ a ne objekt" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "Aktuální pozice obsahuje „%s“ a ne hodnotu" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "Aktuální pozice neobsahuje typ string (řetězec)" diff --git a/po/da.gmo b/po/da.gmo index e4a7a90fa1539bb6f2ca5609e9a5df4431876ae0..231dc99572e9199ab0dcdf80abd13b6e18f8a608 100644 GIT binary patch delta 29 kcmcbhaY1844Yz=~u7R=wt>Os9_}L?0EI{hPXGV_ delta 29 kcmcbhaY1844Yz=qu7SC(k)?v6ft9JTwt?a19_}L?0EQF@UjP6A diff --git a/po/da.po b/po/da.po index 4e9ca8f..94d898e 100644 --- a/po/da.po +++ b/po/da.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2014-03-15 13:53+0100\n" "Last-Translator: Ask Hjorth Larsen \n" "Language-Team: Danish \n" @@ -27,21 +27,33 @@ msgstr "Gør udskrift pæn" msgid "Indentation spaces" msgstr "Indrykningsmellemrum" +#. Translators: the first %s is the program name, the second one +#. * is the URI of the file, the third is the error message. +#. #: json-glib/json-glib-format.c:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" msgstr "%s: %s: fejl ved åbning af fil: %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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "%s: %s: fejl ved fortolkning af fil: %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:108 #, c-format msgid "%s: %s: error writing to stdout" msgstr "%s: %s: fejl ved skrivning til 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -51,6 +63,8 @@ msgstr "%s: %s: fejl ved lukning: %s\n" msgid "FILE" msgstr "FIL" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "Formatér JSON-filer." @@ -59,6 +73,10 @@ msgstr "Formatér JSON-filer." msgid "json-glib-format formats JSON resources." msgstr "json-glib-format formaterer JSON-ressourcer." +#. 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -70,11 +88,17 @@ msgstr "Fejl ved fortolkning af kommandolinjetilvalg: %s\n" msgid "Try \"%s --help\" for more information." msgstr "Prøv \"%s --help\" for at få yderligere oplysninger." +#. 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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "%s: manglende filer" +#. 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 "Kontrollér JSON-filer." @@ -83,11 +107,13 @@ msgstr "Kontrollér JSON-filer." msgid "json-glib-validate validates JSON data at the given URI." msgstr "json-glib-validate kontrollerer JSON-data på den givne URI." +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, c-format msgid "Expecting a JSON object, but the root node is of type `%s'" msgstr "Forventer et JSON-objekt, men rodknuden er af typen \"%s\"" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -127,12 +153,16 @@ msgstr "Ugyldig GVariant-underskrift" msgid "JSON data is empty" msgstr "JSON-data er tom" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: Fortolkningsfejl: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "JSON-data skal være UTF-8-kodet" @@ -140,6 +170,7 @@ msgstr "JSON-data skal være UTF-8-kodet" msgid "Only one root node is allowed in a JSONPath expression" msgstr "Kun en rodknude tillades i et JSONPath-udtryk" +#. translators: the %c is the invalid character #: json-glib/json-path.c:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -174,7 +205,7 @@ msgstr "Ugyldig arrayindeksdefinition \"%*s\"" msgid "Invalid first character '%c'" msgstr "Ugyldigt første tegn \"%c\"" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." @@ -182,14 +213,14 @@ msgstr "" "Den nuværende knude er af typen \"%s\", men der blev forventet et array " "eller et objekt." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "" "Indekset \"%d\" er større end størrelsen af arrayet ved nuværende position." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " @@ -198,43 +229,43 @@ msgstr "" "Indekset \"%d\" er større end størrelsen af objektet på den nuværende " "position." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "Ingen tilgængelig knude på nuværende position" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "Den nuværende position holder en \"%s\" og ikke et array" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "" "Den nuværende knude er af typen \"%s\", men der blev forventet et objekt." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "" "Medlemmet \"%s\" er ikke defineret i objektet på den nuværende position." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "Den nuværende position indeholder en \"%s\" og ikke et objekt" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "Den nuværende position indeholder en \"%s\" og ikke en værdi" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "Den nuværende position indeholder ikke en strengtype" diff --git a/po/de.gmo b/po/de.gmo index 2f1cc7bbd1c5a90f1139dc618ecd5af188132c93..bf8400e425d08dc4252234b0b56078a77ec7e347 100644 GIT binary patch delta 29 kcmaE&^+an!4Yz=~u7R=wt>Os9_|~Q0E#^bkN^Mx delta 29 kcmaE&^+an!4Yz=qu7SC(k)?v6ft9JTwt?a19_|~Q0E-C-pa1{> diff --git a/po/de.po b/po/de.po index 126f411..643d559 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2014-08-14 15:52+0100\n" "Last-Translator: Wolfgang Stoeggl \n" "Language-Team: Deutsch \n" @@ -28,21 +28,33 @@ msgstr "Ausgabe hübsch gestalten" msgid "Indentation spaces" msgstr "Einrückungsleerzeichen" +#. Translators: the first %s is the program name, the second one +#. * is the URI of the file, the third is the error message. +#. #: json-glib/json-glib-format.c:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" msgstr "%s: %s: Fehler beim Öffnen der Datei: %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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "%s: %s: Fehler beim Verarbeiten der Datei: %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:108 #, c-format msgid "%s: %s: error writing to stdout" msgstr "%s: %s: Fehler beim Schreiben auf die Standardausgabe" +#. 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -52,6 +64,8 @@ msgstr "%s: %s: Fehler beim Schließen: %s\n" msgid "FILE" msgstr "DATEI" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "JSON-Datei formatieren." @@ -60,6 +74,10 @@ msgstr "JSON-Datei formatieren." msgid "json-glib-format formats JSON resources." msgstr "json-glib-format formatiert JSON-Ressourcen." +#. 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -71,11 +89,17 @@ msgstr "Fehler beim Verarbeiten der Befehlszeilenoptionen: %s\n" msgid "Try \"%s --help\" for more information." msgstr "Versuchen Sie »%s --help« für mehr Informationen." +#. 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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "%s: Fehlende Dateien" +#. 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-Datei auf Gültigkeit prüfen." @@ -84,11 +108,13 @@ msgstr "JSON-Datei auf Gültigkeit prüfen." msgid "json-glib-validate validates JSON data at the given URI." msgstr "json-glib-validate prüft JSON-Daten der angegebenen Adresse." +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, c-format msgid "Expecting a JSON object, but the root node is of type `%s'" msgstr "Ein JSON-Objekt wurde erwartet, aber der Root-Knoten hat den Typ »%s«" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -130,12 +156,16 @@ msgstr "Ungültige GVariant-Signatur" msgid "JSON data is empty" msgstr "JSON-Daten sind leer" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: Verarbeitungsfehler: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "JSON-Daten müssen in UTF-8 kodiert sein" @@ -143,6 +173,7 @@ msgstr "JSON-Daten müssen in UTF-8 kodiert sein" msgid "Only one root node is allowed in a JSONPath expression" msgstr "Im JSONPath-Ausdruck ist nur ein einziger Root-Knoten erlaubt" +#. translators: the %c is the invalid character #: json-glib/json-path.c:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -177,7 +208,7 @@ msgstr "Ungültige Array-Index-Definition »%*s«" msgid "Invalid first character '%c'" msgstr "Ungültiges erstes Zeichen »%c«" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." @@ -185,14 +216,14 @@ msgstr "" "Der Typ des aktuellen Knotens ist »%s«, aber ein Array oder Objekt wurde " "erwartet." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "" "Der Index »%d« übersteigt die Größe des Arrays an der aktuellen Position." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " @@ -200,44 +231,44 @@ msgid "" msgstr "" "Der Index »%d« übersteigt die Größe des Objekts an der aktuellen Position." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "An der aktuellen Position ist kein Knoten verfügbar" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "An der aktuellen Position befindet sich ein »%s« und kein Array" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "Der aktuelle Knoten hat den Typ »%s«, aber ein Objekt wurde erwartet." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "" "Das Mitglied »%s« ist im Objekt an der aktuellen Position nicht definiert." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "An der aktuellen Position befindet sich ein »%s« und kein Objekt" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "" "An der aktuellen Position befindet sich ein »%s«, welches kein Wert ist" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "An der aktuellen Position befindet sich kein Zeichenketten-Typ" diff --git a/po/el.gmo b/po/el.gmo index a3686e3074d97c49aab27cf56191c2582afa2914..59d39929bd8a77e0c36af1e6dbb33ea193d2f9a2 100644 GIT binary patch delta 29 kcmaEB^44TS4Yz=~u7R=wt>Os9`1*H0FGz~!~g&Q delta 29 kcmaEB^44TS4Yz=qu7SC(k)?v6ft9JTwt?a19`1*H0FN{X)Bpeg diff --git a/po/el.po b/po/el.po index 5cd6a36..f261d6b 100644 --- a/po/el.po +++ b/po/el.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2014-07-09 14:38+0200\n" "Last-Translator: Tom Tryfonidis \n" "Language-Team: team@lists.gnome.gr\n" @@ -28,21 +28,33 @@ msgstr "Ωραιοποίηση εξόδου" msgid "Indentation spaces" 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:77 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:89 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:108 #, 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -52,6 +64,8 @@ msgstr "%s: %s: σφάλμα κλεισίματος: %s\n" msgid "FILE" msgstr "ΑΡΧΕΙΟ" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "Μορφή αρχείων JSON." @@ -60,6 +74,10 @@ msgstr "Μορφή αρχείων JSON." 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -71,11 +89,17 @@ msgstr "Σφάλμα ανάλυσης επιλογών της γραμμής ε 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:193 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." @@ -84,11 +108,13 @@ msgstr "Επικυρώστε αρχεία JSON." 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:943 #, 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:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -130,12 +156,16 @@ msgstr "Άκυρη υπογραφή GVariant" msgid "JSON data is empty" msgstr "Τα δεδομένα JSON είναι κενά" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: Σφάλμα ανάλυσης: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "Τα δεδομένα JSON πρέπει να είναι κωδικοποιημένα ως UTF-8" @@ -143,6 +173,7 @@ msgstr "Τα δεδομένα JSON πρέπει να είναι κωδικοπο 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:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -177,7 +208,7 @@ msgstr "Άκυρος ορισμός δείκτη πίνακα '%*s'" msgid "Invalid first character '%c'" msgstr "Άκυρος ο πρώτος χαρακτήρας '%c'" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." @@ -185,7 +216,7 @@ msgstr "" "Ο τρέχων κόμβος είναι τύπου '%s', αλλά αναμενόταν ένας πίνακας ή ένα " "αντικείμενο." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." @@ -193,7 +224,7 @@ msgstr "" "Ο δείκτης '%d' είναι μεγαλύτερος από το μέγεθος του πίνακα στην τρέχουσα " "θέση." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " @@ -202,42 +233,42 @@ msgstr "" "Ο δείκτης '%d' είναι μεγαλύτερος από το μέγεθος του αντικειμένου στην " "τρέχουσα θέση." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "Κανένας διαθέσιμος κόμβος στην τρέχουσα θέση" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "Η τρέχουσα θέση περιέχει ένα '%s' και όχι ένα πίνακα" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "Ο τρέχων κόμβος είναι του τύπου '%s', αλλά αναμενόταν ένα αντικείμενο." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "Το μέλος '%s' δεν ορίζεται στο αντικείμενο στην τρέχουσα θέση." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "Η τρέχουσα θέση περιέχει ένα '%s' και όχι ένα αντικείμενο" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "Η τρέχουσα θέση περιέχει ένα '%s' και όχι μια τιμή" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "Η τρέχουσα θέση δεν περιέχει τύπο συμβολοσειράς" diff --git a/po/en_GB.gmo b/po/en_GB.gmo index 807d9f20f3cdb253cb3839216e0348a0c6d6ed15..1f226866d7c83516336a118b8c3777f217755638 100644 GIT binary patch literal 5058 zcmeH~ON)=-K8?X-k3F43K8enWKxDVV6o+$1UkotKQd=`8kqnH43f_86#N7v zoxcQ0=bu2DuXPZMblwhf@EAxszXFoZAAqFOciY-fc5fG192$IenkmCLbB%OZ+ zYhV>7qWb4R()n$WbiM}8fPa7|!6^hoI$r@v=kGz%dBr37I0r$}`8Y^Ap9e|jH$ceD z9!I9}Z%3wtW?iDPl%6C(oIj`0wKD&gcW*e09UY@n-h8nJGk@=exE|7v6CMt(LAn3#u9buG5Rf= zI;SkPR+{^fGGWr9N2MjNR4Nm^;>|FUH+!E7O;vCC{-O>oy|;=R8>q~>_T$j>Y8iS` z4(N~1qBWTZMV+zd`Oz~%ha#~&2z?u>MCcBeiKX95sr0Skf**U~)Jd)y7jVljhPI7Y z!naX}t3>ix#to_2q#I~AT3^MnNP;Lt0hLm_PLC3sbd6HLi<;fZ8=2*{ExA_8@eJG!z*RKf(9%%S(++sWx%GB07DWK z1~;kjrNN^G5rsj2_$F*6!e(0bUJ0#5hli+pi3hS7CJ-78RLa{COt*eB)W&kZEi@F7 z+V$RhX(VL5RZSCxzP!zAt4Sq9nMv-eWI^igJa-4o+`I(B3erl(sqNhGD9#XAL-Nz} zQ{EV+)Q6@4n-NhH63T$*{bQ1~gjae4n<<=ASeBbk+)xp(3|1h8o1t#^+-7Mc-2}02 zEg8ueQX4AkqRT~uIWYw4n0zYon!QT7gLoohm_@^3QQ!+5aM2`1t9^CZNtIheEQl}? z4fGB#kZb%*YxK)gtTUP=b}A|CxyVlfj0-oSR&rZ|5uw71!NmB`||-ZOEX?{&P$JTDvO<50o@+ zS+rFIX|Y*2f6?+<)LpLvm7~Q^kt5K+RTjA+@1#aC+&in1kIU7`7ht6vz<`Fgv=rnD z+lF>D^Cr9u*I=K(b*}3zERm~v2dx#_-nO~Ix=tfRN865D@VUn*rhjb(JMEUT;hxu) zQM!d=k?>e)Y=3UOxJ|3dPA6S+z$I1-e)ENPV>!2R=7AM!kvz%H(6$E&7j2;zj7q## z6gE6sqZn}xlNZ7Up)!qKv&#Af-3p*~x)()Zw;dIlwZa9N@Y8eCRV*w;pAT<3@Xknl z(Nt3By~cPf3?{WSCuzg>W=ty#yhB;bc=M{x+t#M_p`k|Bx*SH4sJ0Rn%c|0?A*^_* z&*4SYZ-oa^t%A(A6TN0jv!~|0!(lX16G;-fR+_WXW13b-k?H%T7>#9HTLjnI~6qfCp)o5Gai z>zt(S)=Z3y^ZasRTf#R_@ZrJn@ujDhI QmJc*IT;L=7KRD3*1N6?h5C8xG delta 781 zcmajdu}>3W7{~DkM5(PUwMa!kbA*}(>%m>2RW6X&grdbOB!Y=144#pVKtj88AS`YI z%Nz8M(1FAl<0^wDFgmbE7>o;(iHmXZ``j5Ge-E$WG8XVTW^fNJ+{Y4r!*P*K>FW>~ z=7V`GV+(KM9_q$laSHQiMI2m47hhr#KjRqw#yXCk6Pd#etl}Z&G1D0x+{1U2Tf!Rq zOXhskYzej5E7WEmFo$1IoBcvG1nEf!!6cW{dR z<%kDumc0-)yNlYah1%>5YO@p6W+Ta{*#>H}ebj@WBE`bPLpUi`E+#xE7x8a6oA7mc zc7^34=^<&-P1q;=KY(1)h2eE+5xGpVgxeD?BplvQIQ%7~>+iD?BfZ2tO8Vv?>6xpk zoLNlGnD?oMneEy#v2^gZm44c8+PY`WkNAsp*>-N(#Rz+09(D$vmO1)}LR_m3Tf2T4%{h+$AU``XC%;V(! H|8D;W$Rc1@ diff --git a/po/en_GB.po b/po/en_GB.po index 401ffee..fa6185f 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -1,16 +1,16 @@ # British English translation for json-glib. # Copyright (C) 2012 json-glib's COPYRIGHT HOLDER # This file is distributed under the same license as the json-glib package. -# FIRST AUTHOR , YEAR. +# Abigail Brady , Bastien Nocera , 2016. # msgid "" msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" -"PO-Revision-Date: 2012-09-04 16:18+0000\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" +"PO-Revision-Date: 2016-09-18 10:56+0200\n" +"Last-Translator: David King \n" "Language-Team: British English \n" "Language: en_GB\n" "MIME-Version: 1.0\n" @@ -20,73 +20,99 @@ msgstr "" #: json-glib/json-glib-format.c:50 msgid "Prettify output" -msgstr "" +msgstr "Prettify output" #: json-glib/json-glib-format.c:51 msgid "Indentation spaces" -msgstr "" +msgstr "Indentation spaces" +#. Translators: the first %s is the program name, the second one +#. * is the URI of the file, the third is the error message. +#. #: json-glib/json-glib-format.c:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" -msgstr "" +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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" -msgstr "" +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:108 #, c-format msgid "%s: %s: error writing to stdout" -msgstr "" +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:129 json-glib/json-glib-validate.c:87 -#, fuzzy, c-format +#, c-format msgid "%s: %s: error closing: %s\n" -msgstr "%s:%d: Parse error: %s" +msgstr "%s: %s: error closing: %s\n" #: json-glib/json-glib-format.c:158 json-glib/json-glib-validate.c:115 msgid "FILE" -msgstr "" +msgstr "FILE" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." -msgstr "" +msgstr "Format JSON files." #: json-glib/json-glib-format.c:162 msgid "json-glib-format formats JSON resources." -msgstr "" +msgstr "json-glib-format formats JSON resources." +#. 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" -msgstr "" +msgstr "Error parsing commandline options: %s\n" #: json-glib/json-glib-format.c:181 json-glib/json-glib-format.c:195 #: json-glib/json-glib-validate.c:138 json-glib/json-glib-validate.c:152 #, c-format msgid "Try \"%s --help\" for more information." -msgstr "" +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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" -msgstr "" +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:118 msgid "Validate JSON files." -msgstr "" +msgstr "Validate JSON files." #: json-glib/json-glib-validate.c:119 msgid "json-glib-validate validates JSON data at the given URI." -msgstr "" +msgstr "json-glib-validate validates JSON data at the given URI." +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, 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'" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -127,19 +153,24 @@ msgstr "Invalid GVariant signature" msgid "JSON data is empty" msgstr "JSON data is empty" -#: json-glib/json-parser.c:914 -#, fuzzy, c-format +#. 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:907 +#, c-format msgid "%s:%d:%d: Parse error: %s" -msgstr "%s:%d: Parse error: %s" +msgstr "%s:%d:%d: Parse error: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" -msgstr "" +msgstr "JSON data must be UTF-8 encoded" #: json-glib/json-path.c:388 msgid "Only one root node is allowed in a JSONPath expression" msgstr "Only one root node is allowed in a JSONPath expression" +#. translators: the %c is the invalid character #: json-glib/json-path.c:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -147,7 +178,7 @@ msgstr "Root node followed by invalid character '%c'" #: json-glib/json-path.c:437 msgid "Missing member name or wildcard after . character" -msgstr "" +msgstr "Missing member name or wildcard after . character" #: json-glib/json-path.c:511 #, c-format @@ -172,23 +203,23 @@ msgstr "Invalid array index definition '%*s'" #: json-glib/json-path.c:655 #, c-format msgid "Invalid first character '%c'" -msgstr "" +msgstr "Invalid first character '%c'" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "" "The current node is of type '%s', but an array or an object was expected." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "" "The index '%d' is greater than the size of the array at the current position." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " @@ -197,41 +228,41 @@ msgstr "" "The index '%d' is greater than the size of the object at the current " "position." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "No node available at the current position" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format 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:669 +#: json-glib/json-reader.c:670 #, 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." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, 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." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format 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:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format 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:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "The current position does not hold a string type" diff --git a/po/eo.gmo b/po/eo.gmo index cffca456a5cdc398a290d28017bb4547bc70e258..cc75917dd31b47fdcc1f5aa67c38eccc1193ab84 100644 GIT binary patch delta 29 kcmdlayGeEf7l(kku7R=wt>NBDUKOz0B=SH diff --git a/po/eo.po b/po/eo.po index f2efcd3..e254e80 100644 --- a/po/eo.po +++ b/po/eo.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: json-glib\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2013-04-01 18:26+0200\n" "Last-Translator: Kristjan SCHMIDT \n" "Language-Team: Esperanto \n" @@ -27,21 +27,33 @@ msgstr "" msgid "Indentation spaces" 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:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" 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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "" +#. Translators: the first %s is the program name, the +#. * second one is the URI of the file. +#. #: json-glib/json-glib-format.c:108 #, c-format msgid "%s: %s: error writing to stdout" 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -51,6 +63,8 @@ msgstr "" msgid "FILE" msgstr "" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "" @@ -59,6 +73,10 @@ msgstr "" msgid "json-glib-format formats JSON resources." msgstr "" +#. 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -70,11 +88,17 @@ msgstr "" msgid "Try \"%s --help\" for more information." msgstr "" +#. 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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "" +#. 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 "" @@ -83,11 +107,13 @@ msgstr "" msgid "json-glib-validate validates JSON data at the given URI." msgstr "" +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, c-format msgid "Expecting a JSON object, but the root node is of type `%s'" msgstr "Atendis JSON-objekton sed la radika nodo havas la tipon \"%s\"" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -127,12 +153,16 @@ msgstr "Nevalida GVariant-subskribo" msgid "JSON data is empty" msgstr "JSON-datumoj estas malplenaj" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: Analiz-eraro: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "" @@ -140,6 +170,7 @@ msgstr "" msgid "Only one root node is allowed in a JSONPath expression" msgstr "Nur unu 'Root'-nodo estas permesata en JSONPath-esprimo" +#. translators: the %c is the invalid character #: json-glib/json-path.c:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -174,14 +205,14 @@ msgstr "Nevalida tebel-indeks-difino \"%*s\"" msgid "Invalid first character '%c'" msgstr "" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "" "La tipo de la nuna nodo estas \"%s\", sed tabelo aŭ objekto estis atendita." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." @@ -189,7 +220,7 @@ msgstr "" "La indekso '%d' estas pli grande ol la grando de la tabelo ĉe la aktuala " "pozicio." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " @@ -198,42 +229,42 @@ msgstr "" "La indekso '%d' estas pli grande ol la grando de la objekto ĉe la aktuala " "pozicio." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "Neniu nodo estas ĉe la aktuala pozicio" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "La aktuala pozicio havas na '%s' kaj ne tabelon" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "La aktuala nodo havas la tipon '%s', sed objekto estis atendita." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "La membro '%s' ne estas definita en la objekto ĉe la aktuala pozicio." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "La aktuala pozicio havas na '%s' kaj ne objekton" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "La aktuala pozicio havas na '%s' kaj ne valoron" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "La aktuala pozicio ne havas signoĉenan tipon" diff --git a/po/es.gmo b/po/es.gmo index a9d9cbfa4b1f945f8b5bfbf8afa2f87ef18d9146..44946b76f41755921ddb5382750f64733d453eba 100644 GIT binary patch delta 29 kcmeyQ`AKs_4Yz=~u7R=wt>Os9_}\n" "Language-Team: Español \n" @@ -28,21 +28,33 @@ msgstr "Embellecer la salida" msgid "Indentation spaces" msgstr "Espacios de sangrado" +#. Translators: the first %s is the program name, the second one +#. * is the URI of the file, the third is the error message. +#. #: json-glib/json-glib-format.c:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" msgstr "%s: %s: error al abrir el archivo: %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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "%s: %s: error al analizar: %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:108 #, c-format msgid "%s: %s: error writing to stdout" msgstr "%s: %s: error al escribir en la salida estándar" +#. 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -52,6 +64,8 @@ msgstr "%s: %s: error al cerrar: %s\n" msgid "FILE" msgstr "ARCHIVO" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "Formatear archivos JSON." @@ -60,6 +74,10 @@ msgstr "Formatear archivos JSON." msgid "json-glib-format formats JSON resources." msgstr "json-glib-format formatea recursos 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -71,11 +89,17 @@ msgstr "Error al analizar las opciones de la línea de comandos: %s\n" msgid "Try \"%s --help\" for more information." msgstr "Pruebe «%s --help» para obtener más información." +#. 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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "%s: faltan archivos" +#. 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 "Validar archivos JSON." @@ -84,11 +108,13 @@ msgstr "Validar archivos JSON." msgid "json-glib-validate validates JSON data at the given URI." msgstr "json-glib-validate valida los datos JSON del URI dado." +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, c-format msgid "Expecting a JSON object, but the root node is of type `%s'" msgstr "Se esperaba un objeto JSON, pero el nodo raíz es de tipo «%s»" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -130,12 +156,16 @@ msgstr "Firma de GVariant no válida" msgid "JSON data is empty" msgstr "Datos de JSON vacíos" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: Error al analizr: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "Los datos JSON deben estar codificados en UTF-8" @@ -143,6 +173,7 @@ msgstr "Los datos JSON deben estar codificados en UTF-8" msgid "Only one root node is allowed in a JSONPath expression" msgstr "Sólo se permite un nodo raíz en una expresión JSONPath" +#. translators: the %c is the invalid character #: json-glib/json-path.c:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -177,21 +208,21 @@ msgstr "Definición de índice de vector no válida «%*s»" msgid "Invalid first character '%c'" msgstr "Primer carácter «%c» no válido" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "" "El nodo actual es de tipo «%s», pero se esperaba un objeto o un vector." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "" "El índice «%d» es mayor que el tamaño del vector en la posición actual." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " @@ -199,42 +230,42 @@ msgid "" msgstr "" "El índice «%d» es mayor que el tamaño del objeto en la posición actual." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "No hay ningún nodo disponible en la posición actual" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "La posición actual tiene un «%s» y no un vector" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "El nodo actual es de tipo «%s», pero se esperaba un objeto." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "El miembro «%s» no está definido en el objeto en la posición actual." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "La posición actual tiene un «%s» y no un objeto" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "La posición actual tiene un «%s» y no un valor" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "La posición actual no tiene un tipo de cadena" diff --git a/po/et.gmo b/po/et.gmo index f886cb066e3d0705a3c76ae56299d50fb598989b..61e954223f9a70d820585c88e30d4595cbbbf90a 100644 GIT binary patch delta 29 kcmca5b4zA}Acugtu7R=wt>NBMGi|g0C&~~;s5{u delta 29 kcmca5b4zA}AcugNu7SC(k)?v6ft9JTwt?YhMGi|g0C=JX@&Et; diff --git a/po/et.po b/po/et.po index 88963ac..e976553 100644 --- a/po/et.po +++ b/po/et.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2012-10-29 20:51+0300\n" "Last-Translator: Mattias Põldaru \n" "Language-Team: Estonian \n" @@ -26,21 +26,33 @@ msgstr "" msgid "Indentation spaces" 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:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" 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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "" +#. Translators: the first %s is the program name, the +#. * second one is the URI of the file. +#. #: json-glib/json-glib-format.c:108 #, c-format msgid "%s: %s: error writing to stdout" 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -50,6 +62,8 @@ msgstr "" msgid "FILE" msgstr "" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "" @@ -58,6 +72,10 @@ msgstr "" msgid "json-glib-format formats JSON resources." msgstr "" +#. 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -69,11 +87,17 @@ msgstr "" msgid "Try \"%s --help\" for more information." msgstr "" +#. 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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "" +#. 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 "" @@ -82,11 +106,13 @@ msgstr "" msgid "json-glib-validate validates JSON data at the given URI." msgstr "" +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, c-format msgid "Expecting a JSON object, but the root node is of type `%s'" msgstr "Oodati JSON objekti, kuid juursõlme liik on '%s'" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -127,12 +153,16 @@ msgstr "Sobimatu GVariant-i allkiri" msgid "JSON data is empty" msgstr "JSON ei sisalda andmeid" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: parsimise viga: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "" @@ -140,6 +170,7 @@ msgstr "" msgid "Only one root node is allowed in a JSONPath expression" msgstr "Ainult juursõlm on lubatud JSONPath expression lauses" +#. translators: the %c is the invalid character #: json-glib/json-path.c:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -174,60 +205,60 @@ msgstr "Sobimatu massiivi indeksi definitsioon '%*s'" msgid "Invalid first character '%c'" msgstr "" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "Praeguse sõlme liik on '%s', aga oodati massiivi või objekti." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "Indeks '%d' on suurem kui massivi suurus praeguses asukohas." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "Indeks '%d' on suurem kui objekti suurus praeguses asukohas." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "Praeguses asukohas pole saadaval ühtegi sõlme" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "Praegune asukoht sisaldab '%s' ning see pole massiiv" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "Praeguse sõlme liik on '%s', aga oodati objekti." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "Liige '%s' ei ole defineeritud praeguses asukohas asuvas objektis." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "Praegune asukoht sisaldab '%s', mitte objekti" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "Praegune asukoht sisaldab '%s' ning mitte väärtust" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "Praegune asukoht ei sisalda sõne liiki" diff --git a/po/eu.gmo b/po/eu.gmo index 50052d9586f9d840f1fba692310ad6fac3c4ed62..e1099eb7c3b39ca22997132d1594fbfcf04a1519 100644 GIT binary patch delta 29 kcmX@6c}#Od4Yz=~u7R=wt>Os9&Rg60D?OQv;Y7A delta 29 kcmX@6c}#Od4Yz=qu7SC(k)?v6ft9JTwt?a19&Rg60D}hy!~g&Q diff --git a/po/eu.po b/po/eu.po index ba238ae..8c43b50 100644 --- a/po/eu.po +++ b/po/eu.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2014-04-03 17:38+0200\n" "Last-Translator: Iñaki Larrañaga Murgoitio \n" "Language-Team: Basque \n" @@ -27,21 +27,33 @@ msgstr "Koskatu irteera" msgid "Indentation spaces" msgstr "Koskaren zuriuneak" +#. Translators: the first %s is the program name, the second one +#. * is the URI of the file, the third is the error message. +#. #: json-glib/json-glib-format.c:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" msgstr "%s: %s: errorea fitxategia irekitzean: %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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "%s: %s: errorea fitxategia analizatzean: %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:108 #, c-format msgid "%s: %s: error writing to stdout" msgstr "%s: %s: errorea irteera estandarrean idaztean" +#. 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -51,6 +63,8 @@ msgstr "%s: %s: errorea ixtean: %s\n" msgid "FILE" msgstr "FITXATEGIA" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "JSON fitxategien formatua." @@ -59,6 +73,10 @@ msgstr "JSON fitxategien formatua." msgid "json-glib-format formats JSON resources." msgstr "'json-glib-format'-ek JSON baliabideei formatu ematen die." +#. 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -70,11 +88,17 @@ msgstr "Errorea komando-lerroaren aukerak analizatzean: %s\n" msgid "Try \"%s --help\" for more information." msgstr "Saiatu '%s --help' erabiltzen informazio gehiagorako." +#. 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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "%s: fitxategiak falta dira" +#. 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 fitxategien balidazioa." @@ -84,11 +108,13 @@ msgid "json-glib-validate validates JSON data at the given URI." msgstr "" "'json-glib-validate'-ek JSON datuen balidazioa egiten du emandako URIan." +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, c-format msgid "Expecting a JSON object, but the root node is of type `%s'" msgstr "JSON objektu bat espero zen, baina erroaren nodoa '%s' motakoa da" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -130,12 +156,16 @@ msgstr "Baliogabeko GVariant sinadura" msgid "JSON data is empty" msgstr "JSONen datuak hutsik daude" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: analisi-errorea: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "JSON datuak UTF-8 kodeketan egon behar dute" @@ -144,6 +174,7 @@ msgid "Only one root node is allowed in a JSONPath expression" msgstr "" "Soilik erroko nodo bakar bat dago baimenduta JSONPath adierazpen batean" +#. translators: the %c is the invalid character #: json-glib/json-path.c:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -178,60 +209,60 @@ msgstr "Baliogabeko '%*s' matrizearen indizearen definizioa" msgid "Invalid first character '%c'" msgstr "Aurreneko '%c' karakterea baliogabea" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "Uneko nodoa '%s' motakoa da, baina matrize edo objektu bat espero zen." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "'%d' indizea uneko posizioko matrizearen tamaina baino handiagoa da." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "'%d' indizea uneko posizioko objektuaren tamaina baino handiagoa da ." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "Ez dago nodorik erabilgarri uneko posizioan" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "Uneko posizioak '%s' dauka, eta ez matrize bat" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "Uneko nodoa '%s' motakoa da, baina objektu bat espero zen." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "'%s' kidea ez dago uneko posizioko objektuan definituta." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "Uneko posizioak '%s' dauka, baina ez objektu bat" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "Uneko posizioak '%s' dauka, baina ez balio bat" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "Uneko posizioak ez dauka kate motakorik" diff --git a/po/fr.gmo b/po/fr.gmo index cb0842e900a2993e8b22b51bca4ca16aada01fed..17b4cc7bb983c7f2d79ca0c8b12745517688d962 100644 GIT binary patch delta 29 kcmX@2eMEah4Yz=~u7R=wt>Os9&QUR0D?3Jvj6}9 delta 29 kcmX@2eMEah4Yz=qu7SC(k)?v6ft9JTwt?a19&QUR0D}Mr!vFvP diff --git a/po/fr.po b/po/fr.po index d00c67d..808fb85 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2014-03-11 22:43+0100\n" "Last-Translator: Claude Paroz \n" "Language-Team: GNOME French Team \n" @@ -26,21 +26,33 @@ msgstr "Formatage indenté" msgid "Indentation spaces" msgstr "Espaces d'indentation" +#. Translators: the first %s is the program name, the second one +#. * is the URI of the file, the third is the error message. +#. #: json-glib/json-glib-format.c:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" msgstr "%s : %s : erreur d'ouverture du fichier : %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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "%s : %s : erreur d'analyse du fichier : %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:108 #, c-format msgid "%s: %s: error writing to stdout" msgstr "%s : %s : erreur d'écriture vers 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -50,6 +62,8 @@ msgstr "%s : %s : erreur de fermeture : %s\n" msgid "FILE" msgstr "FICHIER" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "Mise en forme de fichiers JSON." @@ -58,6 +72,10 @@ msgstr "Mise en forme de fichiers JSON." msgid "json-glib-format formats JSON resources." msgstr "json-glib-format met en forme des ressources 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -69,11 +87,17 @@ msgstr "Erreur d'analyse des options de la ligne de commande : %s\n" msgid "Try \"%s --help\" for more information." msgstr "Essayez « %s --help » pour plus d'informations." +#. 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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "%s : fichiers manquants" +#. 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 "Validation de fichiers JSON." @@ -82,11 +106,13 @@ msgstr "Validation de fichiers JSON." msgid "json-glib-validate validates JSON data at the given URI." msgstr "json-glib-validate valide des données JSON à l'URI indiquée." +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, c-format msgid "Expecting a JSON object, but the root node is of type `%s'" msgstr "Objet de type JSON attendu mais le nœud racine est de type « %s »" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -128,12 +154,16 @@ msgstr "Signature GVariant non valide" msgid "JSON data is empty" msgstr "Les données JSON sont vides" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: Erreur d'analyse : %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "Les données JSON doivent être codées en UTF-8" @@ -141,6 +171,7 @@ msgstr "Les données JSON doivent être codées en UTF-8" msgid "Only one root node is allowed in a JSONPath expression" msgstr "Un seul nœud racine autorisé dans une expression JSONPath" +#. translators: the %c is the invalid character #: json-glib/json-path.c:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -175,14 +206,14 @@ msgstr "Définition d'indice de tableau invalide « %*s »" msgid "Invalid first character '%c'" msgstr "Premier caractère « %c » non valide" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "" "Le nœud courant est de type « %s » mais un tableau ou un objet était attendu." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." @@ -190,7 +221,7 @@ msgstr "" "L'indice « %d » est plus grand que la taille du tableau à la position " "actuelle." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " @@ -199,45 +230,45 @@ msgstr "" "L'indice « %d » est plus grand que la taille de l'objet indiqué à la " "position actuelle." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "Aucun nœud disponible à cette position." -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "" "La position actuelle contient un élément de type « %s » et non un tableau" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "Le nœud actuel est de type « %s » mais un objet était attendu." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "" "Le membre « %s » n'est pas défini dans l'objet à la position actuelle." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "" "La position actuelle contient un élément de type « %s » et non un objet" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "" "La position actuelle contient un élément de type « %s » et non une valeur" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "La position actuelle ne contient pas une chaîne de caractères" diff --git a/po/fur.gmo b/po/fur.gmo index 48385af82bd1ed3cc08d37bab37c74babe46384c..45ace3079924c3ea8b64eee04aa1ef14f22cb61b 100644 GIT binary patch delta 29 kcmZ3Yu|#7-4Yz=~u7R=wt>Os9_|?&0DDje%K!iX delta 29 kcmZ3Yu|#7-4Yz=qu7SC(k)?v6ft9JTwt?a19_|?&0DK$=+W-In diff --git a/po/fur.po b/po/fur.po index 882fba0..8c1ecd6 100644 --- a/po/fur.po +++ b/po/fur.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2016-04-08 10:15+0200\n" "Last-Translator: Fabio Tomat \n" "Language-Team: Friulian \n" @@ -26,21 +26,33 @@ msgstr "Bilisie l'output" msgid "Indentation spaces" msgstr "Spazis di rientri" +#. Translators: the first %s is the program name, the second one +#. * is the URI of the file, the third is the error message. +#. #: json-glib/json-glib-format.c:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" msgstr "%s: %s: erôr tal vierzi il 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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "%s: %s: erôr tal analizâ il 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:108 #, c-format msgid "%s: %s: error writing to stdout" msgstr "%s: %s: erôr tal scrivi sul 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -50,6 +62,8 @@ msgstr "%s: %s: erôr tal sierâ: %s\n" 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:161 msgid "Format JSON files." msgstr "Formate file JSON." @@ -58,6 +72,10 @@ msgstr "Formate file JSON." msgid "json-glib-format formats JSON resources." msgstr "json-glib-format al formate lis risorsis 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -69,11 +87,17 @@ msgstr "Erôr tal analizâ lis opzions a rie di comant: %s\n" msgid "Try \"%s --help\" for more information." msgstr "Prove \"%s --help\" par vê plui informazions." +#. 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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "%s: a mancjin dai file" +#. 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 "Convalide file JSON." @@ -82,11 +106,13 @@ msgstr "Convalide file JSON." msgid "json-glib-validate validates JSON data at the given URI." msgstr "json-glib-validate al convalide dâts JSON cjatâts al URI furnît." +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, c-format msgid "Expecting a JSON object, but the root node is of type `%s'" msgstr "Si spiete un ogjet JSON, ma il grop lidrîs al è dal gjenar \"%s\"" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -127,12 +153,16 @@ msgstr "Firme GVariant no valide" msgid "JSON data is empty" msgstr "I dâts JSON a son vueits" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: erôr di analisi: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "I dâts JSON a scugnin jessi codificâts in UTF-8" @@ -140,6 +170,7 @@ msgstr "I dâts JSON a scugnin jessi codificâts in UTF-8" msgid "Only one root node is allowed in a JSONPath expression" msgstr "Si amet dome un grop lidrîs intune espression JSON" +#. translators: the %c is the invalid character #: json-glib/json-path.c:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -174,61 +205,61 @@ msgstr "Definizion di indiç array '%*s' no valide" msgid "Invalid first character '%c'" msgstr "Prin caratar '%c' no valit" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "" "Il tipo di grop curint al è \"%s\", ma si spietave un array o un ogjet." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "L'indiç '%d' al è plui grant de dimension dal array ae posizion atuâl." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "L'indiç '%d' al è plui grant de dimension dal ogjet ae posizion atuâl." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "Nissun grop disponibil ae posizion atuâl." -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "La posizion atuâl e ten un \"%s\" e no un array" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "Il tipo di grop atuâl al è \"%s\", ma si spietave un ogjet." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "Nol è definît il membri \"%s\" tal ogjet ae posizion atuâl." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "La posizion atuâl e ten un \"%s\" e no un ogjet" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "La posizion atuâl e ten un \"%s\" e no un valôr" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "La posizion atuâl no ten un tipo stringhe" diff --git a/po/gl.gmo b/po/gl.gmo index b30c6f740d6ed63be442ecf987425b9aa0f2b444..04ad7babaae422d85ecaa3df170198b7fc4e9ecb 100644 GIT binary patch delta 29 kcmX@9c~Wyj4Yz=~u7R=wt>Os9&TGs0D|cUy#N3J delta 29 kcmX@9c~Wyj4Yz=qu7SC(k)?v6ft9JTwt?a19&TGs0E4v$%>V!Z diff --git a/po/gl.po b/po/gl.po index 882d6d8..c23762c 100644 --- a/po/gl.po +++ b/po/gl.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2013-12-19 01:13+0200\n" "Last-Translator: Fran Dieguez \n" "Language-Team: gnome-l10n-gl@gnome.org\n" @@ -27,21 +27,33 @@ msgstr "Mellorar saída" msgid "Indentation spaces" msgstr "Espazos de sangrado" +#. Translators: the first %s is the program name, the second one +#. * is the URI of the file, the third is the error message. +#. #: json-glib/json-glib-format.c:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" msgstr "%s: %s: erro ao abrir o ficheiro: %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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "%s: %s: error ao analizar o ficheiro: %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:108 #, c-format msgid "%s: %s: error writing to stdout" msgstr "%s: %s: erro ao escribir na saída estándar" +#. 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -51,6 +63,8 @@ msgstr "%s: %s: erro ao pechar: %s\n" msgid "FILE" msgstr "FICHEIRO" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "Formatea de ficheiros JSON." @@ -59,6 +73,10 @@ msgstr "Formatea de ficheiros JSON." msgid "json-glib-format formats JSON resources." msgstr "Os recursos de JSON de json-glib-format." +#. 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -70,11 +88,17 @@ msgstr "Produciuse un erro ao analizar as opcións de liña de ordes: %s\n" msgid "Try \"%s --help\" for more information." msgstr "Tente \"%s --help\" para máis información." +#. 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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "%s: ficheiros omitidos" +#. 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 "Validar ficheiros JSON." @@ -83,11 +107,13 @@ msgstr "Validar ficheiros JSON." msgid "json-glib-validate validates JSON data at the given URI." msgstr "json-glib-validate valida os datos JSON dunha URI fornecida." +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, c-format msgid "Expecting a JSON object, but the root node is of type `%s'" msgstr "Agardábase un obxecto JSON, pero o nodo raíz é de tipo «%s»" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -128,12 +154,16 @@ msgstr "Firma de GVariant non válida" msgid "JSON data is empty" msgstr "Datos de JSON baleiros" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: erro de análise: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "Os datos JSON deben ter a codificación UTF-8" @@ -141,6 +171,7 @@ msgstr "Os datos JSON deben ter a codificación UTF-8" msgid "Only one root node is allowed in a JSONPath expression" msgstr "Só se permite un nodo raíz nunha expresión JSONPath" +#. translators: the %c is the invalid character #: json-glib/json-path.c:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -175,61 +206,61 @@ msgstr "Definición de índice de vector non válida «%*s»" msgid "Invalid first character '%c'" msgstr "Primeiro caracter «%c» non válido" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "O nodo actual é de tipo «%s», pero agardábase un obxecto ou un vector." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "O índice «%d» é maior que o tamaño do vector na posición actual." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "O índice «%d» é maior que o tamaño do obxecto na posición actual." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "Non hai ningún nodo dipoñíbel na posición actual" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "A posición actual ten un «%s» e non un vector" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "O nodo actual é de tipo «%s», pero agardábase un obxecto." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "O membro «%s» non está definido no obxecto na posición actual." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "A posición actual ten un «%s» e non un obxecto" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "A posición actual ten un «%s» e non un valor" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "A posición actual non ten un tipo de cadea" diff --git a/po/he.gmo b/po/he.gmo index 3b651faecd7baed11c4f0682ff8b7ed32058d7fb..f07852d5c057007dc06ebd165d109a178d7bfa9d 100644 GIT binary patch delta 29 kcmX@BepY=$4Yz=~u7R=wt>Os9&Set0E1))!~g&Q delta 29 kcmX@BepY=$4Yz=qu7SC(k)?v6ft9JTwt?a19&Set0E93H)Bpeg diff --git a/po/he.po b/po/he.po index a60580c..de75f95 100644 --- a/po/he.po +++ b/po/he.po @@ -9,7 +9,7 @@ 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: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2014-01-26 05:32+0200\n" "Last-Translator: Yosef Or Boczko \n" "Language-Team: עברית <>\n" @@ -28,21 +28,33 @@ msgstr "Prettify output" msgid "Indentation spaces" msgstr "Indentation spaces" +#. Translators: the first %s is the program name, the second one +#. * is the URI of the file, the third is the error message. +#. #: json-glib/json-glib-format.c:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" 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:89 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" +#. Translators: the first %s is the program name, the +#. * second one is the URI of the file. +#. #: json-glib/json-glib-format.c:108 #, c-format msgid "%s: %s: error writing to stdout" 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -52,6 +64,8 @@ msgstr "%s: %s: error closing: %s\n" 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:161 msgid "Format JSON files." msgstr "Format JSON files." @@ -60,6 +74,10 @@ msgstr "Format JSON files." msgid "json-glib-format formats JSON resources." msgstr "json-glib-format formats JSON resources." +#. 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -71,11 +89,17 @@ msgstr "Error parsing commandline options: %s\n" 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:193 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:118 msgid "Validate JSON files." msgstr "Validate JSON files." @@ -84,11 +108,13 @@ msgstr "Validate JSON files." msgid "json-glib-validate validates JSON data at the given URI." msgstr "json-glib-validate validates JSON data at the given URI." +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, 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'" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -129,12 +155,16 @@ msgstr "Invalid GVariant signature" msgid "JSON data is empty" msgstr "JSON data is empty" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: Parse error: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "JSON data must be UTF-8 encoded" @@ -142,6 +172,7 @@ msgstr "JSON data must be UTF-8 encoded" msgid "Only one root node is allowed in a JSONPath expression" msgstr "Only one root node is allowed in a JSONPath expression" +#. translators: the %c is the invalid character #: json-glib/json-path.c:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -176,21 +207,21 @@ msgstr "Invalid array index definition '%*s'" msgid "Invalid first character '%c'" msgstr "Invalid first character '%c'" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "" "The current node is of type '%s', but an array or an object was expected." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "" "The index '%d' is greater than the size of the array at the current position." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " @@ -199,41 +230,41 @@ msgstr "" "The index '%d' is greater than the size of the object at the current " "position." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "No node available at the current position" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format 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:669 +#: json-glib/json-reader.c:670 #, 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." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, 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." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format 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:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format 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:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "The current position does not hold a string type" diff --git a/po/hi.gmo b/po/hi.gmo index afff70aec63d51cc0d518be3ed48fa038e0fd9b7..d41793d5792ac2a876c78df51fd3f1b53ca179fe 100644 GIT binary patch delta 29 lcmZ3YxkPirb9Mo9T?1oXLt_O)V=Ds#Z3BbN-`Usl004&o2($nI delta 29 lcmZ3YxkPirb9MnUT?2DnBTEHC11nQwZ3Dy2-`Usl004)~2*dyY diff --git a/po/hi.po b/po/hi.po index 0b2ed03..e4a365d 100644 --- a/po/hi.po +++ b/po/hi.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2012-09-20 10:33+0530\n" "Last-Translator: chandankumar \n" "Language-Team: Hindi \n" @@ -27,21 +27,33 @@ msgstr "" msgid "Indentation spaces" 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:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" 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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "" +#. Translators: the first %s is the program name, the +#. * second one is the URI of the file. +#. #: json-glib/json-glib-format.c:108 #, c-format msgid "%s: %s: error writing to stdout" 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:129 json-glib/json-glib-validate.c:87 #, fuzzy, c-format msgid "%s: %s: error closing: %s\n" @@ -51,6 +63,8 @@ msgstr "%s:%d: व्याख्या त्रुटि: %s" msgid "FILE" msgstr "" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "" @@ -59,6 +73,10 @@ msgstr "" msgid "json-glib-format formats JSON resources." msgstr "" +#. 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -70,11 +88,17 @@ msgstr "" msgid "Try \"%s --help\" for more information." msgstr "" +#. 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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "" +#. 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 "" @@ -83,11 +107,13 @@ msgstr "" msgid "json-glib-validate validates JSON data at the given URI." msgstr "" +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, 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:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -128,12 +154,16 @@ msgstr "अवैध GVariant हस्ताक्षर" msgid "JSON data is empty" msgstr "JSON डेटा खाली है" -#: json-glib/json-parser.c:914 +#. 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:907 #, fuzzy, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d: व्याख्या त्रुटि: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "" @@ -141,6 +171,7 @@ msgstr "" 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:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -175,60 +206,60 @@ msgstr "अवैध सरणी सूचकांक परिभाषा '% msgid "Invalid first character '%c'" msgstr "" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "वर्तमान नोड प्रकार '%s' में से एक है, लेकिन एक सरणी या एक वस्तु की उम्मीद थी." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "सूचकांक '%d' वर्तमान स्थिति में सरणी के आकार की तुलना में अधिक है." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "सूचकांक '%d' वर्तमान स्थिति में वस्तु के आकार की तुलना में अधिक है." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "वर्तमान स्थिति में कोई नोड उपलब्ध नहीं " -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "मौजूदा स्थिति के पास '%s' हैं और सरणी नहीं है." -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "वर्तमान नोड प्रकार '%s' में से एक है, लेकिन एक वस्तु की उम्मीद थी." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "सदस्य '%s' वर्तमान स्थिति में वस्तु में परिभाषित नहीं है." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "वर्तमान स्थिति के लिए '%s' और कोई ऑब्जेक्ट आयोजित नहीं है" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "वर्तमान स्थिति के लिए '%s' और कोई मान आयोजित नहीं है" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "वर्तमान स्थिति के लिए स्ट्रिंग प्रकार नहीं है" diff --git a/po/hu.gmo b/po/hu.gmo index 54c4a710cc39d47d57937f7a12c1ac95f0a194ac..9125f390ad72d9f2702fe58425c1591631ddb3b8 100644 GIT binary patch delta 29 kcmZ3gy;OTc4Yz=~u7R=wt>Os9&Sl40DCS6RsaA1 delta 29 kcmZ3gy;OTc4Yz=qu7SC(k)?v6ft9JTwt?a19&Sl40DJleW&i*H diff --git a/po/hu.po b/po/hu.po index b9059fc..1a973b3 100644 --- a/po/hu.po +++ b/po/hu.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2014-03-21 18:09+0100\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -28,21 +28,33 @@ msgstr "Kimenet csinosítása" msgid "Indentation spaces" msgstr "Behúzási szóközök" +#. Translators: the first %s is the program name, the second one +#. * is the URI of the file, the third is the error message. +#. #: json-glib/json-glib-format.c:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" msgstr "%s: %s: hiba a fájl megnyitásakor: %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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "%s: %s: hiba a fájl feldolgozásakor: %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:108 #, c-format msgid "%s: %s: error writing to stdout" msgstr "%s: %s: hiba a szabványos kimenetre íráskor" +#. 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -52,6 +64,8 @@ msgstr "%s: %s: hiba a következő lezárásakor: %s\n" msgid "FILE" msgstr "FÁJL" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "JSON fájlok formázása." @@ -60,6 +74,10 @@ msgstr "JSON fájlok formázása." msgid "json-glib-format formats JSON resources." msgstr "A json-glib-format JSON erőforrásokat formáz." +#. 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -71,11 +89,17 @@ msgstr "Hiba a parancssori kapcsolók feldolgozásakor: %s\n" msgid "Try \"%s --help\" for more information." msgstr "További információkért adja ki a következő parancsot: „%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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "%s: hiányzó fájlok" +#. 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 fájlok ellenőrzése." @@ -85,11 +109,13 @@ msgid "json-glib-validate validates JSON data at the given URI." msgstr "" "A json-glib-validate a megadott URI-n található JSON adatokat ellenőrzi." +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, c-format msgid "Expecting a JSON object, but the root node is of type `%s'" msgstr "A várt JSON objektum helyett a gyökérobjektum „%s” típusú" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -129,12 +155,16 @@ msgstr "Érvénytelen GVariant aláírás" msgid "JSON data is empty" msgstr "A JSON adatok üresek" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: feldolgozási hiba: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "A JSON adatoknak UTF-8 kódolásúnak kell lenniük" @@ -142,6 +172,7 @@ msgstr "A JSON adatoknak UTF-8 kódolásúnak kell lenniük" msgid "Only one root node is allowed in a JSONPath expression" msgstr "Csak egy gyökércsomópont engedélyezett a JSONPath kifejezésben" +#. translators: the %c is the invalid character #: json-glib/json-path.c:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -176,19 +207,19 @@ msgstr "Érvénytelen tömbindex-definíció: „%*s”" msgid "Invalid first character '%c'" msgstr "Érvénytelen első karakter: „%c”" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "A jelenlegi csomópont „%s” típusú a várt tömb vagy objektum helyett." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "A(z) „%d” index nagyobb az aktuális pozícióban lévő tömb méreténél." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " @@ -196,42 +227,42 @@ msgid "" msgstr "" "A(z) „%d” index nagyobb az aktuális pozícióban lévő objektum méreténél." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "Nem érhető el csomópont az aktuális pozícióban" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "Az aktuális pozícióban „%s” található tömb helyett" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "A jelenlegi csomópont „%s” típusú a várt objektum helyett." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "" "A(z) „%s” tag nincs definiálva az aktuális pozícióban lévő objektumban." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "Az aktuális pozícióban „%s” található objektum helyett" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "Az aktuális pozícióban „%s” található érték helyett" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "Az aktuális pozícióban nem karakterlánc típus található" diff --git a/po/id.gmo b/po/id.gmo index 6c460e0e55bb5e933ce72f81b256b97a1ac8f2d0..95a06db07639a3144d993bcfc3d1b5ad73cb1f9a 100644 GIT binary patch delta 29 kcmdm@u|;D;4Yz=~u7R=wt>Os9_|$!0DkZX`v3p{ delta 29 kcmdm@u|;D;4Yz=qu7SC(k)?v6ft9JTwt?a19_|$!0Drs)3jhEB diff --git a/po/id.po b/po/id.po index 8f6a49f..8453305 100644 --- a/po/id.po +++ b/po/id.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2014-01-02 23:38+0700\n" "Last-Translator: Andika Triwidada \n" "Language-Team: Indonesian \n" @@ -28,21 +28,33 @@ msgstr "Percantik keluaran" msgid "Indentation spaces" msgstr "Spasi indentasi" +#. Translators: the first %s is the program name, the second one +#. * is the URI of the file, the third is the error message. +#. #: json-glib/json-glib-format.c:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" msgstr "%s: %s: galat saat membuka berkas: %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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "%s: %s: galat saat mengurai berkas: %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:108 #, c-format msgid "%s: %s: error writing to stdout" msgstr "%s: %s: galat saat menulis ke 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -52,6 +64,8 @@ msgstr "%s: %s: galat saat menutup: %s\n" msgid "FILE" msgstr "BERKAS" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "Memformat berkas JSON." @@ -60,6 +74,10 @@ msgstr "Memformat berkas JSON." msgid "json-glib-format formats JSON resources." msgstr "json-glib-format memformat sumber daya 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -71,11 +89,17 @@ msgstr "Galat saat mengurai opsi baris perintah: %s\n" msgid "Try \"%s --help\" for more information." msgstr "Cobalah \"%s --help\" untuk lebih banyak informasi." +#. 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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "%s: kurang berkas" +#. 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 "Validasikan berkas JSON." @@ -84,11 +108,13 @@ msgstr "Validasikan berkas JSON." msgid "json-glib-validate validates JSON data at the given URI." msgstr "json-glib-validate memvalidasi data JSON pada URI yang diberikan." +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, c-format msgid "Expecting a JSON object, but the root node is of type `%s'" msgstr "Mengharapkan objek JSON, tapi node akar bertipe '%s'" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -129,12 +155,16 @@ msgstr "Tanda tangan GVariant tak valid" msgid "JSON data is empty" msgstr "Data JSON kosong" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: Galat mengurai: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "Data JSON mesti ter-enkode UTF-8" @@ -142,6 +172,7 @@ msgstr "Data JSON mesti ter-enkode UTF-8" msgid "Only one root node is allowed in a JSONPath expression" msgstr "Hanya satu node akar yang diijinkan dalam ekspresi JSONPath" +#. translators: the %c is the invalid character #: json-glib/json-path.c:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -176,60 +207,60 @@ msgstr "Definisi indeks larik '%*s' tak valid" msgid "Invalid first character '%c'" msgstr "Karakter pertama '%c' tak valid" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "Node kini bertipe '%s', tapi larik atau objek yang diharapkan." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "Indeks '%d' lebih besar daripada ukuran larik pada posisi kini." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "Indeks '%d' lebih besar daripada ukuran objek pada posisi kini." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "Node tak tersedia pada posisi kini" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "Posisi kini menampung '%s' dan bukan suatu larik" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "Node kini bertipe '%s', tapi yang diharapkan adalah objek." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "Anggota '%s' tak didefinisikan dalam objek pada posisi kini." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "Posisi kini menampung '%s' dan bukan suatu objek" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "Posisi kini menampung '%s' dan bukan suatu nilai" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "Posisi kini tak menampung suatu tipe string" diff --git a/po/it.gmo b/po/it.gmo index 4d62901b061691681708707879b52e4155bbecc2..0a0a2fcdc929ae6133612425f2308f198e360cbf 100644 GIT binary patch delta 29 kcmZ3YxkPhADYt;Ru7R=wt>OsR&IGt0C~{|M*si- delta 29 kcmZ3YxkPhADYt-`u7SC(k)?v6ft9JTwt?a1R&IGt0D7GVR{#J2 diff --git a/po/it.po b/po/it.po index a0c11bb..0598bf1 100644 --- a/po/it.po +++ b/po/it.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: json-glib\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2013-12-11 10:47+0100\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" @@ -28,21 +28,33 @@ msgstr "Output abbellito" msgid "Indentation spaces" msgstr "Spazi di rientro" +#. Translators: the first %s is the program name, the second one +#. * is the URI of the file, the third is the error message. +#. #: json-glib/json-glib-format.c:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" msgstr "%s: %s: errore nell'aprire il 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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "%s: %s: errore nell'analizzare il 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:108 #, c-format msgid "%s: %s: error writing to stdout" msgstr "%s: %s: errore nello scrivere su 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -52,6 +64,8 @@ msgstr "%s: %s: errore nel chiudere: %s\n" 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:161 msgid "Format JSON files." msgstr "Formatta i file JSON." @@ -60,6 +74,10 @@ msgstr "Formatta i file JSON." msgid "json-glib-format formats JSON resources." msgstr "json-glib-format formatta le risorse 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -71,11 +89,17 @@ msgstr "Errore nell'analizzare le opzioni a riga di comando: %s\n" msgid "Try \"%s --help\" for more information." msgstr "Per maggiori informazioni, usare \"%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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "%s: mancano dei file" +#. 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 "Convalida i file JSON." @@ -84,11 +108,13 @@ msgstr "Convalida i file JSON." msgid "json-glib-validate validates JSON data at the given URI." msgstr "json-glib-validate convalida i dati JSON trovati all'URI fornito." +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, c-format msgid "Expecting a JSON object, but the root node is of type `%s'" msgstr "Atteso un oggetto JSON, ma il nodo radice è del tipo \"%s\"" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -130,12 +156,16 @@ msgstr "Firma GVariant non valida" msgid "JSON data is empty" msgstr "I dati JSON sono vuoti" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: errore di analisi: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "I dati JSON devono essere codificati in UTF-8" @@ -143,6 +173,7 @@ msgstr "I dati JSON devono essere codificati in UTF-8" msgid "Only one root node is allowed in a JSONPath expression" msgstr "È consentito un solo nodo radice in una espressione JSON" +#. translators: the %c is the invalid character #: json-glib/json-path.c:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -178,21 +209,21 @@ msgstr "Definizione di indice array '%*s' non valida" msgid "Invalid first character '%c'" msgstr "Primo carattere \"%c\" non valido" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "" "Il tipo del nodo corrente è \"%s\", ma era atteso un array o un oggetto." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "" "L'indice '%d' è maggiore della dimensione dell'array alla posizione corrente." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " @@ -201,41 +232,41 @@ msgstr "" "L'indice '%d' è maggiore della dimensione dell'oggetto alla posizione " "corrente." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "Nessun nodo disponibile alla posizione corrente" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "La posizione corrente contiene un \"%s\" e non un array" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "Il tipo del nodo corrente è \"%s\", ma era atteso un oggetto." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "Non è definito il membro \"%s\" nell'oggetto alla posizione corrente." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "La posizione corrente contiene un \"%s\" e non un oggetto" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "La posizione corrente contiene un \"%s\" e non un valore" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "La posizione corrente non contiene un tipo stringa" diff --git a/po/ja.gmo b/po/ja.gmo index 4859585be51f0f1f772903ed0c82bf60e0937cc7..db875df63448f0ac6e43cb76d68da44ba5ce042a 100644 GIT binary patch delta 29 kcmdlkzg>QVAcugtu7R=wt>NBMUH9g0C9^400000 delta 29 kcmdlkzg>QVAcugNu7SC(k)?v6ft9JTwt?YhMUH9g0CHCc5C8xG diff --git a/po/ja.po b/po/ja.po index b7fb4dc..4b12b14 100644 --- a/po/ja.po +++ b/po/ja.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2013-09-18 22:29+0900\n" "Last-Translator: Jiro Matsuzawa \n" "Language-Team: Japanese \n" @@ -26,21 +26,33 @@ msgstr "" msgid "Indentation spaces" 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:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" 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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "" +#. Translators: the first %s is the program name, the +#. * second one is the URI of the file. +#. #: json-glib/json-glib-format.c:108 #, c-format msgid "%s: %s: error writing to stdout" 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -50,6 +62,8 @@ msgstr "" msgid "FILE" msgstr "" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "" @@ -58,6 +72,10 @@ msgstr "" msgid "json-glib-format formats JSON resources." msgstr "" +#. 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -69,11 +87,17 @@ msgstr "" msgid "Try \"%s --help\" for more information." msgstr "" +#. 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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "" +#. 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 "" @@ -82,11 +106,13 @@ msgstr "" msgid "json-glib-validate validates JSON data at the given URI." msgstr "" +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, 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:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -128,12 +154,16 @@ msgstr "無効な GVariant シグネチャです" msgid "JSON data is empty" msgstr "JSON データが空です" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: パースエラー: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "" @@ -141,6 +171,7 @@ msgstr "" 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:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -175,62 +206,62 @@ msgstr "無効な配列インデックス定義 '%*s'" msgid "Invalid first character '%c'" msgstr "" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "" "現在のノードは '%s' 型ですが、配列あるいはオブジェクトである必要があります。" -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "インデックス '%d' は現在位置にある配列の長さよりも大きいです。" -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "インデックス '%d' は現在位置のオブジェクトの大きさよりも大きいです。" -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "現在位置にノードがありません" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "現在位置は '%s' で、配列ではありません" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "現在のノードは '%s' 型ですが、オブジェクトである必要があります。" -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "現在位置のオブジェクトで '%s' メンバーは定義されていません" -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "現在位置は '%s' で、オブジェクトではありません" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "現在位置は '%s' で値ではありません" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "現在位置が文字列型ではありません" diff --git a/po/json-glib-1.0.pot b/po/json-glib-1.0.pot index 6b4e2b2..68e3802 100644 --- a/po/json-glib-1.0.pot +++ b/po/json-glib-1.0.pot @@ -6,10 +6,10 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: json-glib 1.2.2\n" +"Project-Id-Version: json-glib 1.2.4\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,21 +26,33 @@ msgstr "" msgid "Indentation spaces" 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:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" 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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "" +#. Translators: the first %s is the program name, the +#. * second one is the URI of the file. +#. #: json-glib/json-glib-format.c:108 #, c-format msgid "%s: %s: error writing to stdout" 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -50,6 +62,8 @@ msgstr "" msgid "FILE" msgstr "" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "" @@ -58,6 +72,10 @@ msgstr "" msgid "json-glib-format formats JSON resources." msgstr "" +#. 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -69,11 +87,17 @@ msgstr "" msgid "Try \"%s --help\" for more information." msgstr "" +#. 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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "" +#. 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 "" @@ -82,11 +106,13 @@ msgstr "" msgid "json-glib-validate validates JSON data at the given URI." msgstr "" +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, c-format msgid "Expecting a JSON object, but the root node is of type `%s'" msgstr "" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -126,12 +152,16 @@ msgstr "" msgid "JSON data is empty" msgstr "" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "" @@ -139,6 +169,7 @@ msgstr "" msgid "Only one root node is allowed in a JSONPath expression" msgstr "" +#. translators: the %c is the invalid character #: json-glib/json-path.c:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -173,60 +204,60 @@ msgstr "" msgid "Invalid first character '%c'" msgstr "" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "" -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "" -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "" -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "" -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "" -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "" diff --git a/po/ko.gmo b/po/ko.gmo index e40f49b616f0bf8f190661950136b15cac4ea7eb..be890b12f32b2902db001af10a3ee34da5381633 100644 GIT binary patch delta 29 kcmZqBZqVLP!!2O0YhbKvXslppY-M1eZD6puhx-dB0CdX-<^TWy delta 29 kcmZqBZqVLP!!2N@YhbQxWT{|iU}b8oZD6>$hx-dB0CkrK_5c6? diff --git a/po/ko.po b/po/ko.po index 2a71b8b..183cf43 100644 --- a/po/ko.po +++ b/po/ko.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2014-03-15 02:04+0900\n" "Last-Translator: Seong-ho Cho \n" "Language-Team: Korean \n" @@ -27,21 +27,33 @@ msgstr "출력 정돈" msgid "Indentation spaces" 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:77 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:89 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:108 #, 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -51,6 +63,8 @@ msgstr "%s: %s: 닫는 중 오류: %s\n" msgid "FILE" msgstr "<파일>" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "JSON 파일의 코드를 정렬합니다." @@ -59,6 +73,10 @@ msgstr "JSON 파일의 코드를 정렬합니다." 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -70,11 +88,17 @@ msgstr "명령줄 옵션 해석 중 오류: %s\n" 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:193 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 파일을 검증합니다." @@ -83,11 +107,13 @@ msgstr "JSON 파일을 검증합니다." msgid "json-glib-validate validates JSON data at the given URI." msgstr "json-glib-validate는 주어진 URI의 JSON 데이터를 검증합니다." +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, 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:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -128,12 +154,16 @@ msgstr "잘못된 GVariant 서명입니다" msgid "JSON data is empty" msgstr "JSON 데이터가 비었습니다" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: 해석 오류: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "JSON 데이터는 UTF-8로 인코딩해야 합니다" @@ -141,6 +171,7 @@ msgstr "JSON 데이터는 UTF-8로 인코딩해야 합니다" 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:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -175,60 +206,60 @@ msgstr "잘못된 배열 인덱스 정의 '%*s'" msgid "Invalid first character '%c'" msgstr "잘못된 첫번째 문자 '%c'" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "현재 노드는 '%s' 형식 이지만, 배열 또는 객체를 요구합니다." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "현재 위치의 인덱스 '%d'번은 배열의 크기보다 큽니다." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "현재 위치의 '%d'번 인덱스는 객체의 크기보다 큽니다." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "현재 위치에 노드가 없습니다" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "현재 위치에 배열이 아닌 '%s'이(가) 있습니다" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "현재 노드는 '%s' 형식이지만 객체를 요구합니다." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "현재 위치 객체에 '%s' 구성원을 정의하지 않았습니다." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "현재 위치에 객체가 아닌 '%s'이(가) 있습니다" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "현재 위치에 값이 아닌 '%s'이(가) 있습니다" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "현재 위치에 문자열 값이 없습니다" diff --git a/po/ky.gmo b/po/ky.gmo index 9ae913348ce6b7f9286cc4e076806887f2a9510f..9dbe5404171353f3d3ae7d90483da1dbf3b5f424 100644 GIT binary patch delta 29 kcmX@7bWUl*b9Mo9T?1oXLt_O)V=Ds#Z3BbN-`T@C0geXb%7 diff --git a/po/ky.po b/po/ky.po index 8414ae7..937ff4d 100644 --- a/po/ky.po +++ b/po/ky.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2013-01-05 18:22+0600\n" "Last-Translator: Timur Zhamakeev \n" "Language-Team: Kirghiz \n" @@ -28,21 +28,33 @@ msgstr "" msgid "Indentation spaces" 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:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" 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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "" +#. Translators: the first %s is the program name, the +#. * second one is the URI of the file. +#. #: json-glib/json-glib-format.c:108 #, c-format msgid "%s: %s: error writing to stdout" 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:129 json-glib/json-glib-validate.c:87 #, fuzzy, c-format msgid "%s: %s: error closing: %s\n" @@ -52,6 +64,8 @@ msgstr "%s:%d: Ажыратып окуу катасы: %s" msgid "FILE" msgstr "" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "" @@ -60,6 +74,10 @@ msgstr "" msgid "json-glib-format formats JSON resources." msgstr "" +#. 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -71,11 +89,17 @@ msgstr "" msgid "Try \"%s --help\" for more information." msgstr "" +#. 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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "" +#. 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 "" @@ -84,11 +108,13 @@ msgstr "" msgid "json-glib-validate validates JSON data at the given URI." msgstr "" +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, 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:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -128,12 +154,16 @@ msgstr "GVariant сигнатурасы туура эмес" msgid "JSON data is empty" msgstr "JSON маалыматы жок" -#: json-glib/json-parser.c:914 +#. 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:907 #, fuzzy, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d: Ажыратып окуу катасы: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "" @@ -141,6 +171,7 @@ msgstr "" 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:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -175,60 +206,60 @@ msgstr "Массив индексинин туура эмес аныктамас msgid "Invalid first character '%c'" msgstr "" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "Учурдагы түйүн '%s' тибинде; массив же объект күтүлгөн." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "Учурдагы позициянын индекси:'%d' массивдин узундугунан чоң." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "Учурдагы позициянын индекси:'%d'; объектин узундугунан чоң." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "Учурдагы позицияда түйүн жок" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "Учурдагы позицияда:'%s'; ал массив эмес" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "Учурдагы түйүн '%s' тибинде; объект күтүлгөн." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "Учурку позициядагы объекте '%s' аттуу мүчө аныкталган эмес." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "Учурдагы позицияда:'%s'; ал объект эмес" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "Учурдагы позицияда:'%s'; ал маани эмес" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "Учурдагы позициянын тиби, саптык тип эмес" diff --git a/po/lt.gmo b/po/lt.gmo index 14c2622473702c8aa53ec8e8034b42fd78aa93a6..bcba0397aecef5ed0b948ae1b6957891d7e8b201 100644 GIT binary patch delta 29 kcmeyZ`CD^C4Yz=~u7R=wt>Os9`1Zj0FFHfQvd(} delta 29 kcmeyZ`CD^C4Yz=qu7SC(k)?v6ft9JTwt?a19`1Zj0FMa>V*mgE diff --git a/po/lt.po b/po/lt.po index b6bb061..4a509ac 100644 --- a/po/lt.po +++ b/po/lt.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2014-02-21 23:18+0200\n" "Last-Translator: Aurimas Černius \n" "Language-Team: Lietuvių \n" @@ -28,21 +28,33 @@ msgstr "Graži išvestis" msgid "Indentation spaces" msgstr "Įtrauka tarpais" +#. Translators: the first %s is the program name, the second one +#. * is the URI of the file, the third is the error message. +#. #: json-glib/json-glib-format.c:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" msgstr "%s: %s: klaida atveriant failą: %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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "%s: %s: klaida skaitant failą: %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:108 #, c-format msgid "%s: %s: error writing to stdout" msgstr "%s: %s: klaida rašant į standartinę išvestį" +#. 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -52,6 +64,8 @@ msgstr "%s: %s: klaida užveriant: %s\n" msgid "FILE" msgstr "FAILAS" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "Formatuoti JSON failus." @@ -60,6 +74,10 @@ msgstr "Formatuoti JSON failus." msgid "json-glib-format formats JSON resources." msgstr "json-glib-format formatuoja JSON resursus." +#. 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -71,11 +89,17 @@ msgstr "Klaida skaitant komandų eilutės parametrus: %s\n" msgid "Try \"%s --help\" for more information." msgstr "Daugiau informacijos gausite įvykdę „%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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "%s: trūksta failų" +#. 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 "Tikrinti JSON failus." @@ -84,11 +108,13 @@ msgstr "Tikrinti JSON failus." msgid "json-glib-validate validates JSON data at the given URI." msgstr "json-glib-validate patikrina JSON duomenis ties pateiktu URI." +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, c-format msgid "Expecting a JSON object, but the root node is of type `%s'" msgstr "Tikimasi JSON objekto, bet šakninė viršūnė yra „%s“ tipo" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -128,12 +154,16 @@ msgstr "Netinkamas GVariant aprašas" msgid "JSON data is empty" msgstr "JSON duomenys yra tušti" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: skaitymo klaida: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "JSON duomenys turi būti koduoti UTF-8" @@ -141,6 +171,7 @@ msgstr "JSON duomenys turi būti koduoti UTF-8" msgid "Only one root node is allowed in a JSONPath expression" msgstr "JSONPath išraiškoje leidžiamas vienintelė šakninė viršūnė" +#. translators: the %c is the invalid character #: json-glib/json-path.c:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -175,60 +206,60 @@ msgstr "Netinkamas masyvo apibrėžimas „%*s“" msgid "Invalid first character '%c'" msgstr "Netinkamas pirmasis simbolis „%c“" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "Dabartinė viršūnė yra „%s“ tipo, bet tikėtasi masyvo arba objekto." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "Indeksas „%d“ yra didesnis nei masyvo dydis dabartinėje pozicijoje." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "Indeksas „%d“ yra didesnis nei objekto dydis dabartinėje pozicijoje." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "Nėra viršūnės dabartinėje pozicijoje" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "Dabartinėje pozicijoje yra „%s“, o ne masyvas" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "Dabartinė viršūnė yra „%s“ tipo, bet tikėtasi objekto." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "Narys „%s“ neapibrėžtas dabartinėje pozicijoje esančiame objekte." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "Dabartinė pozicija turi „%s“, o ne objektą" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "Dabartinė pozicija turi „%s“, o ne reikšmę" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "Dabartinė pozicija turi „%s“, o ne eilutės tipą" diff --git a/po/lv.gmo b/po/lv.gmo index f8cb47446c9d3fb2801cec497c37a60e2ff8a496..7aeb734fb0baddfc3b53ae3782b692de5087ff97 100644 GIT binary patch delta 29 kcmbQKIa6~(4Yz=~u7R=wt>Os9&TPv0C))pEdT%j delta 29 kcmbQKIa6~(4Yz=qu7SC(k)?v6ft9JTwt?a19&TPv0C?30Jpcdz diff --git a/po/lv.po b/po/lv.po index 46df1b9..43bd55b 100644 --- a/po/lv.po +++ b/po/lv.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2014-03-07 16:52+0200\n" "Last-Translator: Rūdolfs Mazurs \n" "Language-Team: Latvian \n" @@ -28,21 +28,33 @@ msgstr "Izskaistināt izvadi" msgid "Indentation spaces" msgstr "Atkāpes atstarpes" +#. Translators: the first %s is the program name, the second one +#. * is the URI of the file, the third is the error message. +#. #: json-glib/json-glib-format.c:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" msgstr "%s: %s: kļūda, atverot datni: %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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "%s: %s: kļūda, parsējot datni: %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:108 #, c-format msgid "%s: %s: error writing to stdout" msgstr "%s: %s, kļūda, rakstot uz 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -52,6 +64,8 @@ msgstr "%s: %s: kļūda aizverot: %s\n" msgid "FILE" msgstr "DATNE" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "Formatēt JSON datnes." @@ -60,6 +74,10 @@ msgstr "Formatēt JSON datnes." msgid "json-glib-format formats JSON resources." msgstr "json-glib-format formatē JSON resursus." +#. 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -71,11 +89,17 @@ msgstr "Kļūda, parsējot komandrindas opcijas — %s\n" msgid "Try \"%s --help\" for more information." msgstr "Lietojiet “%s --help”, lai uzzinātu vairāk." +#. 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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "%s: iztrūkstošas datnes" +#. 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 "Pārbaudīt JSON datnes." @@ -84,11 +108,13 @@ msgstr "Pārbaudīt JSON datnes." msgid "json-glib-validate validates JSON data at the given URI." msgstr "json-glib-validate pārbauda JSON datus dotajā URI." +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, c-format msgid "Expecting a JSON object, but the root node is of type `%s'" msgstr "Gaidīja JSON objektu, bet saknes mezglam ir tips “%s”" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -129,12 +155,16 @@ msgstr "Nederīgs GVariant paraksts" msgid "JSON data is empty" msgstr "JSON dati ir tukši" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: parsēšanas kļūda — %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "JSON datiem ir jābūt UTF-8 kodējumā" @@ -142,6 +172,7 @@ msgstr "JSON datiem ir jābūt UTF-8 kodējumā" msgid "Only one root node is allowed in a JSONPath expression" msgstr "JSONPath izteiksmē ir atļauta tikai viens saknes mezgls" +#. translators: the %c is the invalid character #: json-glib/json-path.c:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -176,60 +207,60 @@ msgstr "Nederīga masīva indeksa definīcija “%*s”" msgid "Invalid first character '%c'" msgstr "Nederīga pirmā rakstzīme “%c”" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "Pašreizējam mezglam ir tips “%s”, bet tika gaidīts masīvs vai objekts." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "Indekss “%d” dotajā pozīcijā ir lielāks kā masīva izmērs." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "Indekss “%d” dotajā pozīcijā ir lielāks kā objekta izmērs." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "Šajā pozīcija nav pieejams neviens mezgls" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "Šajā pozīcijā ir “%s”, nevis masīvs" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "Pašreizējam mezglam ir tips “%s”, bet tika gaidīts objekts." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "Šajā pozīcijā objektā loceklis “%s” nav definēts." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "Šajā pozīcijā ir “%s”, nevis objekts" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "Šajā pozīcijā ir “%s”, nevis vērtība" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "Šajā pozīcijā nav virknes tipa" diff --git a/po/meson.build b/po/meson.build new file mode 100644 index 0000000..f6bdacf --- /dev/null +++ b/po/meson.build @@ -0,0 +1,83 @@ +i18n = import('i18n') + +langs = [ + 'as', + 'bg', + 'bn_IN', + 'bs', + 'ca', + 'ca@valencia', + 'cs', + 'da', + 'de', + 'el', + 'en_GB', + 'eo', + 'es', + 'et', + 'eu', + 'fr', + 'fur', + 'gl', + 'he', + 'hi', + 'hu', + 'id', + 'it', + 'ja', + 'ko', + 'ky', + 'lt', + 'lv', + 'ml', + 'nb', + 'oc', + 'or', + 'pa', + 'pl', + 'pt_BR', + 'pt', + 'ro', + 'ru', + 'sk', + 'sl', + 'sr@latin', + 'sr', + 'sv', + 'te', + 'tg', + 'tr', + 'ug', + 'uk', + 'vi', + 'zh_CN', + 'zh_HK', + 'zh_TW', +] + +i18n.gettext('json-glib-1.0', + languages: langs, + args: [ + '--default-domain=' + meson.project_name(), + '--from-code=UTF-8', + '--add-comments', + '--msgid-bugs-address=https://bugzilla.gnome.org/enter_bug.cgi?product=json-glib', + + '--keyword=_', + '--keyword=N_', + '--keyword=C_:1c,2', + '--keyword=NC_:1c,2', + '--keyword=g_dcgettext:2', + '--keyword=g_dngettext:2,3', + '--keyword=g_dpgettext2:2c,3', + + '--flag=N_:1:pass-c-format', + '--flag=C_:2:pass-c-format', + '--flag=NC_:2:pass-c-format', + '--flag=g_dngettext:2:pass-c-format', + '--flag=g_strdup_printf:1:c-format', + '--flag=g_string_printf:2:c-format', + '--flag=g_string_append_printf:2:c-format', + '--flag=g_error_new:3:c-format', + '--flag=g_set_error:4:c-format', + ]) diff --git a/po/ml.gmo b/po/ml.gmo index 77e89fbb3e107fc536ba50080048eb0978931cfc..97950018546a8e93684cecc692da3086fce4c32d 100644 GIT binary patch delta 29 kcmZ3WyFhn?Acugtu7R=wt>NBMUHwt0B=wR-T(jq delta 29 kcmZ3WyFhn?AcugNu7SC(k)?v6ft9JTwt?YhMUHwt0B{@z?f?J) diff --git a/po/ml.po b/po/ml.po index aa963e0..93fb3e6 100644 --- a/po/ml.po +++ b/po/ml.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2013-02-14 21:57+0530\n" "Last-Translator: Jishnu Mohan \n" "Language-Team: Swatantra Malayalam Computing\n" @@ -26,21 +26,33 @@ msgstr "" msgid "Indentation spaces" 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:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" 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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "" +#. Translators: the first %s is the program name, the +#. * second one is the URI of the file. +#. #: json-glib/json-glib-format.c:108 #, c-format msgid "%s: %s: error writing to stdout" 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -50,6 +62,8 @@ msgstr "" msgid "FILE" msgstr "" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "" @@ -58,6 +72,10 @@ msgstr "" msgid "json-glib-format formats JSON resources." msgstr "" +#. 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -69,11 +87,17 @@ msgstr "" msgid "Try \"%s --help\" for more information." msgstr "" +#. 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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "" +#. 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 "" @@ -82,11 +106,13 @@ msgstr "" msgid "json-glib-validate validates JSON data at the given URI." msgstr "" +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, c-format msgid "Expecting a JSON object, but the root node is of type `%s'" msgstr "`%s' അണ് റൂട്ട് നോഡിന്റെ തരം, പക്ഷേ JSON ഒബ്ജക്ട് ആണ് പ്രതീക്ഷിച്ചത്" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -126,12 +152,16 @@ msgstr "അസാധുവായ GVariant ഒപ്പ്" msgid "JSON data is empty" msgstr "JSON ഡാറ്റ ശൂന്യം" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: പാഴ്സ് പിഴവ്: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "" @@ -139,6 +169,7 @@ msgstr "" 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:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -173,60 +204,60 @@ msgstr "'%*s' എന്നത് തെറ്റായ അറേ ഇന്റെ msgid "Invalid first character '%c'" msgstr "" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "ഇപ്പോഴത്തെ നോഡിന്റെ തരം '%s' ആണ്, പക്ഷേ ഒരു അറേയോ ഒബ്ജക്റ്റോ ആണ് പ്രതീക്ഷിച്ചത്." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "ഇപ്പോഴത്തെ സ്ഥാനത്തുള്ള അറേയുടെ വലിപ്പത്തെക്കാള്‍ വലുതാണ് ഇന്‍ഡെക്സ് '%d'" -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "ഇപ്പോഴത്തെ സ്ഥാനത്തുള്ള ഒബ്ജക്റ്റിന്റെ വലിപ്പത്തെക്കാള്‍ വലുതാണ് ഇന്‍ഡെക്സ് '%d'" -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "ഈ സ്ഥാനത്ത് ഒരു നോഡുമില്ല" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "അപ്പോഴത്തെ സ്ഥാനത്ത് '%s' ആണ് ഒരു അറേ അല്ല" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "ഇപ്പോഴത്തെ നോഡിന്റെ തരം '%s' ആണ്, പക്ഷേ ഒരു ഒബ്ജക്റ്റ് ആണ് പ്രതീക്ഷിച്ചത്." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "ഇപ്പോഴത്തെ സ്ഥാനത്തെ ഒബ്ജക്റ്റില്‍ '%s' എന്ന അംഗം നിര്‍വ്വചിച്ചിട്ടില്ല." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "അപ്പോഴത്തെ സ്ഥാനത്ത് '%s' ആണ് ഒരു ഒബ്ജക്ട്ട് അല്ല" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "അപ്പോഴത്തെ സ്ഥാനത്ത് '%s' ആണ് ഒരു മൂല്യം അല്ല" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "അപ്പോഴത്തെ സ്ഥാനത്ത് ഒരു വാചകം അല്ല" diff --git a/po/nb.gmo b/po/nb.gmo index 3a6b2ff56a47b9bdc84df22d84e77f539f61f1d0..8ed2baa888afdf9887009751b2afb17083179865 100644 GIT binary patch delta 1034 zcmaLVKWGzS7{~FarfF-m+JD;mr+Tdxt@TPS0j(K?AcAzTLveEHwYk=_XD+;VsY@l` z=%7OogbIQpPENJBxQLVB=2{9xa8!pbI{AGrHBhC#@Z^)c@8x~p-}~O{-uwNvjh@!W zLOVtsr?#jO>Qf6Jw3$63N72QTxV-JtZQo%x{p)xHzhMD8QX;K*1$*!s4&hDI`R*a> z)#M3Z#^_i>eQ*E83XpXe67!etu8l1kNIRlNHp7pP?@J1_yB+hw&Hc1_$?w z4B!;%hHl|Ge1JCV%Nk!s@e68_&P?M7i`y<^k^Z-+3;jerp`m>uy;wv&nHxy3X45Ox ztKoqDY5VEn0HnrTa+uOP(aE%FDo!bBgh-ku))eefx~NX-0CkXJT{%Q?aLGyW3MB7> zUT4xqqJpL6850_7E(jyPyr5l~8QD1&R=hG}*1R8h$pe3lS6rk2-F5t~@nap2Lo13) zVKrX;(UMAy+>XMsy%6}b_IzmWxUtnBvL>geu3N^7!m638e{UU5JL9?We7!%t&~?$y z=4~f$Ir&01JC@DXAEpO7>CD;AgylGee6GHl-mK~V=RH5Lmb{V`R2LWjL~HK6Ir`yc zB?;#)>Hc@dYd#csNx=U;6D=BlDT(QK2LyG?CD)X!YFu(-clA-*iIlxd;@C5uNmARS Lj;bc|%((mp6wb18 delta 580 zcmXxhKP&@b7{~Fae_V@JOVK}3N+L~h&0SliWiePKSS&_qIuJ=CA(2RoCUFcB3yZ0f zK_Ui|L5$`mEQ~~=tMAkDB)@*{+PC*S?|X;QdgP$d=RFf@kPMM$k|g^sKB!OZ#V?Gb z$1PIEBzkcT`*0mcaT^nOg8IBVPT~{lx*r_DPLD`NL$|B#Ku!i+9MQ*+3TopWjNvtE zqX(S8H#9NmZ|y+lPzT&VJ(=@AUvPo@P-lDKWz?PTVMN!Vi~iC>xNc3wf250almB8+ z;nXBdf`kpq0MXJT)#@Pn3bjIn8C$#6dp!*;Z5q&v@me{xS*_KoTa}x4chl|ojA6sd x+PUnmGhtN1MbnxwbETARm8bKQmhD^`v0%Zpa;BY2*`;z}#(6YeZ|41R&o6w7Iv4-| diff --git a/po/nb.po b/po/nb.po index b8b27ca..a8985d2 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1,15 +1,15 @@ # Norwegian bokmål translation of json-glib. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Kjartan Maraas , 2011-2014. +# Kjartan Maraas , 2011-2017. # msgid "" msgstr "" -"Project-Id-Version: json-glib 0.12.x\n" +"Project-Id-Version: json-glib 1.2.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" -"PO-Revision-Date: 2014-02-12 19:47+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" +"PO-Revision-Date: 2017-02-18 11:32+0100\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Kjartan Maraas \n" "Language: nb\n" @@ -25,38 +25,56 @@ msgstr "" msgid "Indentation spaces" 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:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" -msgstr "" +msgstr "%s: %s: feil ved åpning av fil: %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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" -msgstr "" +msgstr "%s: %s: feil ved lesing av fil: %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:108 #, c-format msgid "%s: %s: error writing to stdout" -msgstr "" +msgstr "%s: %s: feil ved skriving til standard utdata" +#. 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" -msgstr "" +msgstr "%s: %s: feil ved lukking: %s\n" #: json-glib/json-glib-format.c:158 json-glib/json-glib-validate.c:115 msgid "FILE" msgstr "FIL" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "Formater JSON-filer." #: json-glib/json-glib-format.c:162 msgid "json-glib-format formats JSON resources." -msgstr "" +msgstr "json-glib-format formatterer JSON-ressurser." +#. 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -68,11 +86,17 @@ msgstr "" msgid "Try \"%s --help\" for more information." msgstr "" +#. 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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "%s: mangler filer" +#. 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 "Valider JSON-filer." @@ -81,11 +105,13 @@ msgstr "Valider JSON-filer." msgid "json-glib-validate validates JSON data at the given URI." msgstr "" +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, c-format msgid "Expecting a JSON object, but the root node is of type `%s'" msgstr "Forventet et JSON-objekt, men rotnoden er av type «%s»" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -125,12 +151,16 @@ msgstr "Ugyldig signatur for GVariant" msgid "JSON data is empty" msgstr "JSON-datastruktur er tom" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: Tolkefeil: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "JSON-data må være kodet i UTF-8" @@ -138,6 +168,7 @@ msgstr "JSON-data må være kodet i UTF-8" msgid "Only one root node is allowed in a JSONPath expression" msgstr "Kun en rotnode tillates i et JSONPath-uttrykk" +#. translators: the %c is the invalid character #: json-glib/json-path.c:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -172,60 +203,60 @@ msgstr "" msgid "Invalid first character '%c'" msgstr "" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "" -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "" -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "" -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "Ingen node tilgjengelig i denne posisjonen" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "" -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "Medlem «%s» er ikke definert i objekt ved nåværende posisjon." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "Nåværende posisjon innholder en «%s» og ikke et objekt" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "Nåværende posisjon inneholder en «%s» og ikke en verdi" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "Nåværende posisjon inneholder ikke en streng-type" diff --git a/po/oc.gmo b/po/oc.gmo index c0f2837b5bec0cbf5cf0bf44a653c436683feca6..746bb191e34bd56c68d49ac8e65ae91bc80ccb21 100644 GIT binary patch delta 29 kcmeCv>C@Rz!!2O0YhbKvXslppY-M1eZD6puhr5Xj0Cz42lK=n! delta 29 kcmeCv>C@Rz!!2N@YhbQxWT{|iU}b8oZD6>$hr5Xj0C)NaqW}N^ diff --git a/po/oc.po b/po/oc.po index 2c7e122..bd2711b 100644 --- a/po/oc.po +++ b/po/oc.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2016-05-08 18:49+0200\n" "Last-Translator: Cédric Valmary (totenoc.eu) \n" "Language-Team: Tot En Òc\n" @@ -30,21 +30,33 @@ msgstr "Formatatge indentat" msgid "Indentation spaces" msgstr "Espacis d'indentacion" +#. Translators: the first %s is the program name, the second one +#. * is the URI of the file, the third is the error message. +#. #: json-glib/json-glib-format.c:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" msgstr "%s : %s : error de dobertura del fichièr : %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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "%s : %s : error d'analisi del fichièr : %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:108 #, c-format msgid "%s: %s: error writing to stdout" msgstr "%s : %s : error d'escritura cap a 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -54,6 +66,8 @@ msgstr "%s : %s : error de tampadura : %s\n" msgid "FILE" msgstr "FICHIÈR" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "Mesa en forma de fichièrs JSON." @@ -62,6 +76,10 @@ msgstr "Mesa en forma de fichièrs JSON." msgid "json-glib-format formats JSON resources." msgstr "json-glib-format met en forma de ressorsas 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -73,11 +91,17 @@ msgstr "Error d'analisi de las opcions de la linha de comanda : %s\n" msgid "Try \"%s --help\" for more information." msgstr "Ensajatz « %s --help » per mai d'informacions." +#. 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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "%s : fichièrs mancants" +#. 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 "Validacion de fichièrs JSON." @@ -86,11 +110,13 @@ msgstr "Validacion de fichièrs JSON." msgid "json-glib-validate validates JSON data at the given URI." msgstr "json-glib-validate valida de donadas JSON a l'URI indicada." +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, c-format msgid "Expecting a JSON object, but the root node is of type `%s'" msgstr "Objècte de tipe JSON esperat mas lo nosèl raiç es de tipe « %s »" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -132,12 +158,16 @@ msgstr "Signatura GVariant invalida" msgid "JSON data is empty" msgstr "Las donadas JSON son voidas" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: Error d'analisi : %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "Las donadas JSON devon èsser encodadas en UTF-8" @@ -145,6 +175,7 @@ msgstr "Las donadas JSON devon èsser encodadas en UTF-8" msgid "Only one root node is allowed in a JSONPath expression" msgstr "Un sol nosèl raiç d'autorizat dins una expression JSONPath" +#. translators: the %c is the invalid character #: json-glib/json-path.c:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -179,21 +210,21 @@ msgstr "Definicion d'indici de tablèu invalida « %*s »" msgid "Invalid first character '%c'" msgstr "Primièr caractèr « %c » invalid" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "" "Lo nosèl corrent es de tipe « %s » mas un tablèu o un objècte èra esperat." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "" "L'indici « %d » es mai grand que la talha del tablèu a la posicion actuala." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " @@ -202,44 +233,44 @@ msgstr "" "L'indici « %d » es mai grand que la talha de l'objècte indicat a la posicion " "actuala." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "Cap de nosèl pas disponible a aquesta posicion." -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "" "La posicion actuala conten un element de tipe « %s » e non pas un tablèu" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "Lo nosèl actual es de tipe « %s » mas un objècte èra esperat." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "Lo membre « %s » es pas definit dins l'objècte a la posicion actuala." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "" "La posicion actuala conten un element de tipe « %s » e non pas un objècte" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "" "La posicion actuala conten un element de tipe « %s » e non pas una valor" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "La posicion actuala conten pas una cadena de caractèrs" diff --git a/po/or.gmo b/po/or.gmo index 9cea67b013ed246f22a037b497024547c73b5094..043db0e81b30271a47525c1cff435228044df8d0 100644 GIT binary patch delta 29 kcmaE-^-gQUb9Mo9T?1oXLt_O)V=Ds#Z3BbN-`UG~0hap-6#xJL delta 29 kcmaE-^-gQUb9MnUT?2DnBTEHC11nQwZ3Dy2-`UG~0hh-KB>(^b diff --git a/po/or.po b/po/or.po index 759932d..827c82b 100644 --- a/po/or.po +++ b/po/or.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2012-08-09 18:26+0530\n" "Last-Translator: Manoj Kumar Giri \n" "Language-Team: Oriya \n" @@ -27,21 +27,33 @@ msgstr "" msgid "Indentation spaces" 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:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" 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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "" +#. Translators: the first %s is the program name, the +#. * second one is the URI of the file. +#. #: json-glib/json-glib-format.c:108 #, c-format msgid "%s: %s: error writing to stdout" 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:129 json-glib/json-glib-validate.c:87 #, fuzzy, c-format msgid "%s: %s: error closing: %s\n" @@ -51,6 +63,8 @@ msgstr "%s:%d: ବିଶ୍ଳେଷଣ ତ୍ରୁଟି: %s" msgid "FILE" msgstr "" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "" @@ -59,6 +73,10 @@ msgstr "" msgid "json-glib-format formats JSON resources." msgstr "" +#. 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -70,11 +88,17 @@ msgstr "" msgid "Try \"%s --help\" for more information." msgstr "" +#. 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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "" +#. 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 "" @@ -83,11 +107,13 @@ msgstr "" msgid "json-glib-validate validates JSON data at the given URI." msgstr "" +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, 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:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -127,12 +153,16 @@ msgstr "ଅବୈଧ GVariant ହସ୍ତାକ୍ଷର" msgid "JSON data is empty" msgstr "JSON ତଥ୍ୟ ନାହିଁ" -#: json-glib/json-parser.c:914 +#. 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:907 #, fuzzy, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d: ବିଶ୍ଳେଷଣ ତ୍ରୁଟି: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "" @@ -140,6 +170,7 @@ msgstr "" 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:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -174,60 +205,60 @@ msgstr "ଅବୈଧ ଆରେ ଅନୁକ୍ରମଣିକା ସଂଜ୍ଞ msgid "Invalid first character '%c'" msgstr "" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "ପ୍ରଚଳିତ ନୋଡଟି '%s' ପ୍ରକାରର ଅଟେ, କିନ୍ତୁ ଏକ ଆରେ ଅଥବା ବସ୍ତୁ ଆଶାକରାଯାଇଥିଲା।" -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "ଅନୁକ୍ରମଣିକା '%d' ଟି ପ୍ରଚଳିତ ଅବସ୍ଥାନରେ ଆରେ ଆକାର ଠାରୁ ବଡ଼ ଅଟେ।" -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "ଅନୁକ୍ରମଣିକା '%d' ଟି ପ୍ରଚଳିତ ଅବସ୍ଥାନରେ ବସ୍ତୁ ଆକାର ଠାରୁ ବଡ଼ ଅଟେ।" -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "ପ୍ରଚଳିତ ଅବସ୍ଥାନରେ କୌଣସି ନୋଡ ଉପଲବ୍ଧ ନାହିଁ।" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "ପ୍ରଚଳିତ ଅବସ୍ଥାନ ଏକ '%s' କୁ ଧାରଣ କରିଥାଏ ଏବଂ କୌଣସି ଆରେକୁ ଧାରଣ କରିନଥାଏ" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "ପ୍ରଚଳିତ ନୋଡଟି '%s' ପ୍ରକାରର ଅଟେ, କିନ୍ତୁ ଏକ ବସ୍ତୁକୁ ଆଶାକରୁଥିଲା।" -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "'%s' ସଦସ୍ୟଟି ପ୍ରଚଳିତ ଅବସ୍ଥାନରେ ବସ୍ତୁ ପାଖରେ ବ୍ୟାଖ୍ୟା କରିନାହିଁ।" -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "ପ୍ରଚଳିତ ଅବସ୍ଥାନ ଏକ '%s' କୁ ଧାରଣ କରିଥାଏ କିନ୍ତୁ କୌଣସି ବସ୍ତୁକୁ ଧାରଣ କରିନଥାଏ" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "ପ୍ରଚଳିତ ଅବସ୍ଥାନ ଏକ '%s' ଧାରଣ କରିଥାଏ କିନ୍ତୁ କୌଣସି ମୂଲ୍ୟ ଧାରଣ କରିନଥାଏ" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "ପ୍ରଚଳିତ ଅବସ୍ଥାନ କୌଣସି ବାକ୍ୟଖଣ୍ଡ ପ୍ରକାର ଧାରଣ କରିନଥାଏ" diff --git a/po/pa.gmo b/po/pa.gmo index df85bb715ee5563f931bd734a4515142b2041580..da83e91569a9777ce3d4a32491264b5fa54da409 100644 GIT binary patch delta 29 kcmX@7dQNqNAcugtu7R=wt>NBMUJ&x0C)%oQ~&?~ delta 29 kcmX@7dQNqNAcugNu7SC(k)?v6ft9JTwt?YhMUJ&x0C>~~WB>pF diff --git a/po/pa.po b/po/pa.po index afc6cd8..2606cfd 100644 --- a/po/pa.po +++ b/po/pa.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2013-02-26 07:26+0530\n" "Last-Translator: A S Alam \n" "Language-Team: Punjabi/Panjabi \n" @@ -27,21 +27,33 @@ msgstr "" msgid "Indentation spaces" 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:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" 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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "" +#. Translators: the first %s is the program name, the +#. * second one is the URI of the file. +#. #: json-glib/json-glib-format.c:108 #, c-format msgid "%s: %s: error writing to stdout" 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -51,6 +63,8 @@ msgstr "" msgid "FILE" msgstr "" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "" @@ -59,6 +73,10 @@ msgstr "" msgid "json-glib-format formats JSON resources." msgstr "" +#. 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -70,11 +88,17 @@ msgstr "" msgid "Try \"%s --help\" for more information." msgstr "" +#. 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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "" +#. 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 "" @@ -83,11 +107,13 @@ msgstr "" msgid "json-glib-validate validates JSON data at the given URI." msgstr "" +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, 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:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -127,12 +153,16 @@ msgstr "ਅਢੁੱਕਵਾਂ GVariant ਦਸਤਖਤ" msgid "JSON data is empty" msgstr "JSON ਡਾਟਾ ਖਾਲੀ ਹੈ।" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: ਪਾਰਸ ਗਲਤੀ: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "" @@ -140,6 +170,7 @@ msgstr "" 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:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -174,60 +205,60 @@ msgstr "ਗਲਤ ਅਰੇ ਇੰਡੈਕਸ ਪ੍ਰੀਭਾਸ਼ਾ '%*s'" msgid "Invalid first character '%c'" msgstr "" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "ਮੌਜੂਦਾ ਨੋਡ ਦੀ '%s' ਕਿਸਮ ਹੈ, ਪਰ ਅਰੇ ਜਾਂ ਆਬਜੈਕਟ ਦੀ ਮੰਗ ਸੀ।" -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "ਇੰਡੈਕਸ '%d' ਮੌਜੂਦਾ ਸਥਿਤੀ ਉੱਤੇ ਅਰੇ ਦੇ ਆਕਾਰ ਤੋਂ ਵੱਧ ਹੈ।" -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "ਇੰਡੈਕਸ '%d' ਮੌਜੂਦਾ ਸਥਿਤੀ ਉੱਤੇ ਆਬਜੈਕਟ ਦੇ ਆਕਾਰ ਤੋਂ ਵੱਧ ਹੈ।" -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "ਮੌਜੂਦਾ ਸਥਿਤੀ ਉੱਤੇ ਕੋਈ ਵੀ ਨੋਡ ਉਪਲੱਬਧ ਨਹੀਂ" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "ਮੌਜੂਦਾ ਸਥਿਤੀ '%s' ਰੱਖਦੀ ਹੈ ਨਾ ਕਿ ਅਰੇ" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "ਮੌਜੂਦਾ ਨੋਡ ਦੀ '%s' ਕਿਸਮ ਹੈ, ਪਰ ਆਬਜੈਕਟ ਦੀ ਮੰਗ ਸੀ।" -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "ਮੈਂਬਰ '%s' ਨੂੰ ਮੌਜੂਦਾ ਸਥਿਤੀ ਉੱਤੇ ਆਬਜੈਕਟ ਵਿੱਚ ਪ੍ਰਭਾਸ਼ਿਤ ਹੈ।" -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "ਮੌਜੂਦਾ ਸਥਿਤੀ '%s' ਰੱਖਦੀ ਹੈ ਨਾ ਕਿ ਆਬਜੈਕਟ" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "ਮੌਜੂਦਾ ਸਥਿਤੀ '%s' ਰੱਖਦੀ ਹੈ, ਮੁੱਲ ਨਹੀਂ" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "ਮੌਜੂਦਾ ਸਥਿਤੀ ਸਤਰ ਕਿਸਮ ਨਹੀਂ ਰੱਖਦਾ ਹੈ" diff --git a/po/pl.gmo b/po/pl.gmo index 2ad56e1ec90116951e1a74931bacd8c39386ccfc..204ce5b2eccccbf4985f29f7260863331d14ad86 100644 GIT binary patch delta 616 zcmXZXKWI}?6vy$KAXu6|&HGagC=#l+Hu~cGV{Lp@%>79y^{ZQ{ zol2=MX{GjHDx=h1EaO4Ef;oJKefS2)@DmPWe^#jxynq|<3HIVslzEHTgI{qQuHruI z?NM`U!6&(u#wje}WAyPo8n}`4LEM5vIEod#i-++oI=G55c$cQsQLLhgEtHSE#uNB^ zy{_n!orkydPQyIP;BR;Ux08MvtLr|;Q`G;kjH67qaTbgC5+(36+W@ZMA>7>lo_yFf zG;G9we&VI`-TdrGh9pCff`PBH{2Vb6b4r(!k}<- S?KU4*&GXW+XbuX?=7awPCV}(- delta 634 zcmX}o&1(}u7{~G1U_oNiZgyi(in0_+ZFSP!P12WbHT8`mtu*u?LKV82B`%G-wMi>E z<)YxBg0NuE^{5vie}SL{3-zWTh*&&{Ad3Hh-%X3K{5~`D%seyf$B~~SuOBJx{)7;J zl0pm$A<}6f&S3#ZaT%xa8LGI41Nar^Q0Wz79Is;;AL9{xhsSXj<9^?;57WeHJcUJ^ z?i20q#Sd7BH*R4b-=c$mQO7*DpTSF5!WE3`+ZaFa3tD(G!{c!dFJc?B_y*&BpKum+ zO^7L6(rO0>w+1Q&#!-BZ!?=Td;x{pbJ^Y6AC_6tA zn@3Ay(j1req+yv(sc_b`Ofy+okc-}i-|)jgUU8eAW7wuulIDc8#|&%IDcaG?W0g!T z2=9BV^%-}=ch_3^)q0dmeXwuJO6XPnrkr^^K diff --git a/po/pl.po b/po/pl.po index 36af864..a561541 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,28 +1,24 @@ -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Aviary.pl -# Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz -# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas: -# gnomepl@aviary.pl -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Piotr Drąg , 2011-2015. -# Aviary.pl , 2011-2015. +# Polish translation for json-glib. +# Copyright © 2011-2016 the json-glib authors. +# This file is distributed under the same license as the json-glib package. +# Piotr Drąg , 2011-2016. +# Aviary.pl , 2011-2016. +# msgid "" msgstr "" "Project-Id-Version: json-glib\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" -"PO-Revision-Date: 2015-08-26 19:42+0200\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" +"PO-Revision-Date: 2016-08-22 21:33+0200\n" "Last-Translator: Piotr Drąg \n" -"Language-Team: Polish \n" +"Language-Team: Polish \n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Poedit-Language: Polish\n" -"X-Poedit-Country: Poland\n" #: json-glib/json-glib-format.c:50 msgid "Prettify output" @@ -32,21 +28,33 @@ msgstr "Ładniejsze wyjście" msgid "Indentation spaces" msgstr "Spacje wcięcia" +#. Translators: the first %s is the program name, the second one +#. * is the URI of the file, the third is the error message. +#. #: json-glib/json-glib-format.c:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" msgstr "%s: %s: błąd podczas otwierania pliku: %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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "%s: %s: błąd podczas przetwarzania pliku: %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:108 #, c-format msgid "%s: %s: error writing to stdout" msgstr "%s: %s: błąd podczas zapisywania do standardowego wyjścia" +#. 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -56,6 +64,8 @@ msgstr "%s: %s: błąd podczas zamykania: %s\n" msgid "FILE" msgstr "PLIK" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "Formatuje pliki JSON." @@ -64,6 +74,10 @@ msgstr "Formatuje pliki JSON." msgid "json-glib-format formats JSON resources." msgstr "json-glib-format formatuje zasoby 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -75,11 +89,17 @@ msgstr "Błąd podczas przetwarzania opcji wiesza poleceń: %s\n" msgid "Try \"%s --help\" for more information." msgstr "Polecenie „%s --help” wyświetli więcej informacji." +#. 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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "%s: brak plików" +#. 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 "Sprawdza pliki JSON." @@ -88,27 +108,29 @@ msgstr "Sprawdza pliki JSON." msgid "json-glib-validate validates JSON data at the given URI." msgstr "json-glib-validate sprawdza dane JSON na podanym adresie URI." +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, c-format msgid "Expecting a JSON object, but the root node is of type `%s'" msgstr "Oczekiwano obiektu JSON, ale typ głównego węzła to „%s”" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" -msgstr "Nieoczekiwany typ „%s” w węźle JSON" +msgstr "Nieoczekiwany typ „%s” w węźle JSON" #: json-glib/json-gvariant.c:593 msgid "Missing elements in JSON array to conform to a tuple" -msgstr "Brak elementów w tablicy JSON, aby zgadzało się z krotką" +msgstr "Brak elementów w tablicy JSON, aby zgadzało się z krotką" #: json-glib/json-gvariant.c:621 msgid "Missing closing symbol ')' in the GVariant tuple type" -msgstr "Brak zamykającego symbolu „)” w typie krotki GVariant" +msgstr "Brak zamykającego symbolu „)” w typie krotki GVariant" #: json-glib/json-gvariant.c:629 msgid "Unexpected extra elements in JSON array" -msgstr "Nieoczekiwane dodatkowe elementy w tablicy JSON" +msgstr "Nieoczekiwane dodatkowe elementy w tablicy JSON" #: json-glib/json-gvariant.c:908 msgid "Invalid string value converting to GVariant" @@ -118,7 +140,7 @@ msgstr "Nieprawidłowa wartość ciągu konwertowanego do GVariant" msgid "" "A GVariant dictionary entry expects a JSON object with exactly one member" msgstr "" -"Wpis słownika GVariant oczekuje obiektu JSON z dokładnie jednym elementem" +"Wpis słownika GVariant oczekuje obiektu JSON z dokładnie jednym elementem" #: json-glib/json-gvariant.c:1248 #, c-format @@ -133,19 +155,24 @@ msgstr "Nieprawidłowy podpis GVariant" msgid "JSON data is empty" msgstr "Dane JSON są puste" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: błąd przetwarzania: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" -msgstr "Dane JSON muszą być zakodowane w UTF-8" +msgstr "Dane JSON muszą być zakodowane w UTF-8" #: json-glib/json-path.c:388 msgid "Only one root node is allowed in a JSONPath expression" -msgstr "Dozwolony jest tylko jeden węzeł główny w wyrażeniu JSONPath" +msgstr "Dozwolony jest tylko jeden węzeł główny w wyrażeniu JSONPath" +#. translators: the %c is the invalid character #: json-glib/json-path.c:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -180,60 +207,60 @@ msgstr "Nieprawidłowe określenie indeksu tablicy „%*s”" msgid "Invalid first character '%c'" msgstr "Nieprawidłowy pierwszy znak „%c”" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." -msgstr "Bieżący węzeł jest typu „%s”, a oczekiwano tablicy lub obiektu." +msgstr "Bieżący węzeł jest typu „%s”, a oczekiwano tablicy lub obiektu." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." -msgstr "Indeks „%d” jest większy niż rozmiar tablicy w bieżącym położeniu." +msgstr "Indeks „%d” jest większy niż rozmiar tablicy w bieżącym położeniu." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." -msgstr "Indeks „%d” jest większy niż rozmiar obiektu w bieżącym położeniu." +msgstr "Indeks „%d” jest większy niż rozmiar obiektu w bieżącym położeniu." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" -msgstr "Brak węzłów dostępnych w bieżącym położeniu" +msgstr "Brak węzłów dostępnych w bieżącym położeniu" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" -msgstr "Bieżące położenie przechowuje „%s”, a nie tablicę" +msgstr "Bieżące położenie przechowuje „%s”, a nie tablicę" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." -msgstr "Bieżący węzeł jest typu „%s”, a oczekiwano obiektu." +msgstr "Bieżący węzeł jest typu „%s”, a oczekiwano obiektu." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." -msgstr "Element „%s” nie jest określony w obiekcie w bieżącym położeniu." +msgstr "Element „%s” nie jest określony w obiekcie w bieżącym położeniu." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" -msgstr "Bieżące położenie przechowuje „%s”, a nie obiekt" +msgstr "Bieżące położenie przechowuje „%s”, a nie obiekt" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" -msgstr "Bieżące położenie przechowuje „%s”, a nie wartość" +msgstr "Bieżące położenie przechowuje „%s”, a nie wartość" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "Bieżące położenie nie przechowuje typu ciągu" diff --git a/po/pt.gmo b/po/pt.gmo index ecf8020f68d3aac36fa7a24b7d4765a39b5c8cfe..d6ab00ddc08672d0e372a57277dca1d98b5c9f3b 100644 GIT binary patch delta 29 kcmeyS@l9hx0k?p;u7R=wt>Os2JUYh0F0~%wEzGB delta 29 kcmeyS@l9hx0k?peu7SC(k)?v6ft9JTwt?a12JUYh0F8JE#Q*>R diff --git a/po/pt.po b/po/pt.po index 3e4ed65..68e0619 100644 --- a/po/pt.po +++ b/po/pt.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: 3.12\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2015-06-25 09:43+0100\n" "Last-Translator: Pedro Albuquerque \n" "Language-Team: Português \n" @@ -29,21 +29,33 @@ msgstr "Embelezar resultado" msgid "Indentation spaces" msgstr "Espaços da indentação" +#. Translators: the first %s is the program name, the second one +#. * is the URI of the file, the third is the error message. +#. #: json-glib/json-glib-format.c:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" msgstr "%s: %s: erro ao abrir ficheiro: %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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "%s: %s: erro ao processar ficheiro: %s\n" +#. Translators: the first %s is the program name, the +#. * second one is the URI of the file. +#. #: json-glib/json-glib-format.c:108 #, c-format msgid "%s: %s: error writing to stdout" msgstr "%s: %s: erro ao escrever para 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -53,6 +65,8 @@ msgstr "%s: %s: erro ao fechar: %s\n" msgid "FILE" msgstr "FICHEIRO" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "Formatar ficheiros JSON." @@ -61,6 +75,10 @@ msgstr "Formatar ficheiros JSON." msgid "json-glib-format formats JSON resources." msgstr "json-glib-format formata recursos 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -72,11 +90,17 @@ msgstr "Erro ao processar opções de linha de comandos: %s\n" msgid "Try \"%s --help\" for more information." msgstr "Tente \"%s --help\" para mais informações." +#. Translators: the %s is the program name. This error message +#. * means the user is calling json-glib-validate without any +#. * argument. +#. #: json-glib/json-glib-format.c:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "%s: faltam ficheiros" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-validate.c:118 msgid "Validate JSON files." msgstr "Validar ficheiros JSON." @@ -85,11 +109,13 @@ msgstr "Validar ficheiros JSON." msgid "json-glib-validate validates JSON data at the given URI." msgstr "json-glib-validate valida dados JSON no URI indicado." +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, c-format msgid "Expecting a JSON object, but the root node is of type `%s'" msgstr "Esperado um objeto JSON, mas o nó raiz é do tipo \"%s\"" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -131,12 +157,16 @@ msgstr "Assinatura GVariant inválida" msgid "JSON data is empty" msgstr "Dados JSON estão vazios" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: erro de processamento: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "Dados JSON têm de estar codificados em UTF-8" @@ -144,6 +174,7 @@ msgstr "Dados JSON têm de estar codificados em UTF-8" msgid "Only one root node is allowed in a JSONPath expression" msgstr "Só um nó raiz é permitido numa expressão JSONPath" +#. translators: the %c is the invalid character #: json-glib/json-path.c:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -178,60 +209,60 @@ msgstr "Definição inválida de índice de matriz \"%*s\"" msgid "Invalid first character '%c'" msgstr "Primeiro carácter \"%c\" inválido" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "O nó atual é do tipo \"%s\", mas era esperada uma matriz ou um objeto." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "O índice \"%d\" é maior do que o tamanho da matriz na posição atual." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "O índice \"%d\" é maior do que o tamanho do objeto na posição atual." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "Nenhum nó disponível na posição atual" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "A posição atual contém um \"%s\" e não uma matriz" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "O nó atual é do tipo \"%s\", mas era esperado um objeto." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "O membro \"%s\" não está definido no objeto da posição atual." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "A posição atual contém um \"%s\" e não um objeto" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "A posição atual contém um \"%s\" e não um valor" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "A posição atual não contém um tipo cadeia" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo index 531a3c0da1bb6f1b40fd0bf7369f044a84a2ed12..f1f9e1b6c20f87ff1d97c41567a6c9aa95bf6d41 100644 GIT binary patch delta 29 kcmZqEY}4FO!!2O0YhbKvXslppY-M1eZD6puhx-=?0Cl$hx-=?0Ct850{{R3 diff --git a/po/pt_BR.po b/po/pt_BR.po index 6870a02..159c224 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2013-12-19 11:01-0300\n" "Last-Translator: Rafael Ferreira \n" "Language-Team: Brazilian Portuguese \n" @@ -30,21 +30,33 @@ msgstr "Saída formatada" msgid "Indentation spaces" msgstr "Espaços de recuo" +#. Translators: the first %s is the program name, the second one +#. * is the URI of the file, the third is the error message. +#. #: json-glib/json-glib-format.c:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" msgstr "%s: %s: erro ao abrir arquivo: %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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "%s: %s: erro ao analisar arquivo: %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:108 #, c-format msgid "%s: %s: error writing to stdout" msgstr "%s: %s: erro ao gravar na saída padrão" +#. 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -54,6 +66,8 @@ msgstr "%s: %s: erro ao fechar: %s\n" msgid "FILE" msgstr "ARQUIVO" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "Formatar arquivos JSON." @@ -62,6 +76,10 @@ msgstr "Formatar arquivos JSON." msgid "json-glib-format formats JSON resources." msgstr "json-glib-format formata recursos 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -73,11 +91,17 @@ msgstr "Ocorreu erro ao analisar as opções de linha de comando: %s\n" msgid "Try \"%s --help\" for more information." msgstr "Tente \"%s --help\" para mais informações." +#. Translators: the %s is the program name. This error message +#. * means the user is calling json-glib-validate without any +#. * argument. +#. #: json-glib/json-glib-format.c:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "%s: arquivos em falta" +#. 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 "Validar arquivos JSON." @@ -86,11 +110,13 @@ msgstr "Validar arquivos JSON." msgid "json-glib-validate validates JSON data at the given URI." msgstr "json-glib-validate valida dados JSON no URI fornecido." +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, c-format msgid "Expecting a JSON object, but the root node is of type `%s'" msgstr "Objeto JSON esperado, porém o nó raiz é do tipo \"%s\"" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -132,12 +158,16 @@ msgstr "Assinatura GVariant inválida" msgid "JSON data is empty" msgstr "Dados JSON vazios" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d%d: Erro na análise: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "Os dados JSON devem possuir codificação UTF-8" @@ -145,6 +175,7 @@ msgstr "Os dados JSON devem possuir codificação UTF-8" msgid "Only one root node is allowed in a JSONPath expression" msgstr "Apenas um nó raiz é permitido em uma expressão JSONPath" +#. translators: the %c is the invalid character #: json-glib/json-path.c:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -179,61 +210,61 @@ msgstr "Definição de índice de vetor %*s\" inválida" msgid "Invalid first character '%c'" msgstr "Primeiro caractere \"%c\" inválido" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "O nó atual é do tipo \"%s\", mas um vetor ou objeto era esperado." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "O índice \"%d\" é maior do que o tamanho do vetor na posição atual." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "O índice \"%d\" é maior do que o tamanho do objeto na posição atual." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "Nenhum nó disponível na posição atual" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "A posição atual detém um \"%s\" e não um vetor" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "O nó atual é do tipo \"%s\", mas um objeto era esperado." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "O membro \"%s\" não está definido no objeto na posição atual." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "A posição atual detém um \"%s\" e não um objeto" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "A posição atual detém um \"%s\" e não um valor" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "A posição atual não detém um tipo string" diff --git a/po/ro.gmo b/po/ro.gmo index cb8f981a390353c857f3f71f030ea6c820ed7321..17dc42723ac725d5282d6828bfb304b0d85627d0 100644 GIT binary patch delta 29 kcmaE(^+sz$4Yz=~u7R=wt>Os9_|O60E`U?r~m)} delta 29 kcmaE(^+sz$4Yz=qu7SC(k)?v6ft9JTwt?a19_|O60F2oPxBvhE diff --git a/po/ro.po b/po/ro.po index 3707e04..2906832 100644 --- a/po/ro.po +++ b/po/ro.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2015-06-19 19:17+0200\n" "Last-Translator: Daniel Șerbănescu \n" "Language-Team: Gnome Romanian Translation Team\n" @@ -29,21 +29,33 @@ msgstr "Înfrumusețează rezultatul" msgid "Indentation spaces" msgstr "Spații de indentare" +#. Translators: the first %s is the program name, the second one +#. * is the URI of the file, the third is the error message. +#. #: json-glib/json-glib-format.c:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" msgstr "%s: %s: eroare la deschiderea fișierului: %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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "%s: %s: eroare la parsarea fișierului: %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:108 #, c-format msgid "%s: %s: error writing to stdout" msgstr "%s: %s: eroare la scrierea în 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -53,6 +65,8 @@ msgstr "%s: %s: eroare la închidere: %s\n" msgid "FILE" msgstr "FIȘIER" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "Formatează fișiere JSON." @@ -61,6 +75,10 @@ msgstr "Formatează fișiere JSON." msgid "json-glib-format formats JSON resources." msgstr "json-glib-format formatează resurse 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -72,11 +90,17 @@ msgstr "Eroare la parsarea opțiunilor din linia de comandă: %s\n" msgid "Try \"%s --help\" for more information." msgstr "Încercați „%s --help” pentru mai multe informații." +#. 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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "%s: lipsesc fișiere" +#. 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 "Validează fișiere JSON." @@ -85,11 +109,13 @@ msgstr "Validează fișiere JSON." msgid "json-glib-validate validates JSON data at the given URI." msgstr "json-glib-validate validează date JSON la URI-ul dat." +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, c-format msgid "Expecting a JSON object, but the root node is of type `%s'" msgstr "Se așteaptă un obiect JSON, dar nodul rădăcină este de tip „%s”" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -131,12 +157,16 @@ msgstr "Semnătură GVariant nevalidă" msgid "JSON data is empty" msgstr "Datele JSON sunt goale" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: Eroare la parsare: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "Datele JSON trebuie să fie codate UTF-8" @@ -144,6 +174,7 @@ msgstr "Datele JSON trebuie să fie codate UTF-8" msgid "Only one root node is allowed in a JSONPath expression" msgstr "Doar un nod rădăcină este permis într-o expresie JSONPath" +#. translators: the %c is the invalid character #: json-glib/json-path.c:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -178,7 +209,7 @@ msgstr "Definiția indexului matricii nevalidă „%*s”" msgid "Invalid first character '%c'" msgstr "Primul caracter nevalid „%c”" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." @@ -186,14 +217,14 @@ msgstr "" "Nodul curent deste de tipul „%s”, dar o matrice sau un obiect a fost " "așteptat." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "" "Indexul „%d” este mai mare decât dimensiunea matricii la poziția curentă." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " @@ -201,41 +232,41 @@ msgid "" msgstr "" "Indexul „%d” este mai mare decât dimensiunea obiectului la poziția curentă." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "Niciun nod disponibil la poziția curentă" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "Poziția curentă ține un „%s” ci nu o matrice" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "Nodul curent deste de tipul „%s”, dar un obiect a fost așteptat." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "Membrul „%s” nu este definit în obiectul de la poziția curentă." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "Poziția curentă ține un „%s” ci nu un obiect" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "Poziția curentă ține un „%s” ci nu o valoare" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "Poziția curentă nu ține un șir" diff --git a/po/ru.gmo b/po/ru.gmo index 64e6224ba0617a7c7e485ef2d36e59ea6146a695..b0eb01e4c72d8f9b5fdd1f13be234dffc2ef8fb3 100644 GIT binary patch delta 29 kcmexq{L^?t4Yz=~u7R=wt>Os9`0N|0FUYjW&i*H delta 29 kcmexq{L^?t4Yz=qu7SC(k)?v6ft9JTwt?a19`0N|0Fbr_b^rhX diff --git a/po/ru.po b/po/ru.po index 1a24170..6dd7ddd 100644 --- a/po/ru.po +++ b/po/ru.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2014-03-11 12:23+0300\n" "Last-Translator: Yuri Myasoedov \n" "Language-Team: русский \n" @@ -30,21 +30,33 @@ msgstr "Выводить в удобочитаемой форме" msgid "Indentation spaces" 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:77 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:89 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:108 #, 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -54,6 +66,8 @@ msgstr "%s: %s: не удалось закрыть: %s\n" msgid "FILE" msgstr "ФАЙЛ" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "Форматирование файлов JSON." @@ -62,6 +76,10 @@ msgstr "Форматирование файлов JSON." 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -73,11 +91,17 @@ msgstr "Не удалось разобрать параметры командн 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:193 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." @@ -87,11 +111,13 @@ 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:943 #, 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:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -132,12 +158,16 @@ msgstr "Недопустимая подпись GVariant" msgid "JSON data is empty" msgstr "Данные JSON отсутствуют" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: ошибка разбора: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "Данные JSON должны быть в кодировке UTF-8" @@ -145,6 +175,7 @@ msgstr "Данные JSON должны быть в кодировке UTF-8" 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:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -179,61 +210,61 @@ msgstr "Неверное определение индекса массива « msgid "Invalid first character '%c'" msgstr "Неверный первый символ «%c»" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "Текущий узел имеет тип «%s», но ожидается массив или объект." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "В текущей позиции индекс «%d» больше размера массива." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "В текущей позиции индекс «%d» больше размера объекта." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "В текущей позиции отсутствует узел" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "В текущей позиции содержится «%s», а не массив" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "Текущий узел имеет тип «%s», но ожидается объект." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "В текущей позиции член «%s» не определён в объекте." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "В текущей позиции содержится «%s», а не объект" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "В текущей позиции содержится «%s», а не значение" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "В текущей позиции не содержится строковое значение" diff --git a/po/sk.gmo b/po/sk.gmo index c2af5e22649dfeb8821e35dad927660e11a90a2c..93a428c74551924ad4741f9aebc143fc609e734d 100644 GIT binary patch delta 29 kcmeyb`CoHG4Yz=~u7R=wt>Os9`0gJ0FNaIUjP6A delta 29 kcmeyb`CoHG4Yz=qu7SC(k)?v6ft9JTwt?a19`0gJ0FUtqZvX%Q diff --git a/po/sk.po b/po/sk.po index 0ae50d2..d3da5c0 100644 --- a/po/sk.po +++ b/po/sk.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2015-03-09 18:34+0100\n" "Last-Translator: Dušan Kazik \n" "Language-Team: Slovak \n" @@ -27,21 +27,33 @@ msgstr "Skrášliť výstup" msgid "Indentation spaces" msgstr "Odsadenie v medzerách" +#. Translators: the first %s is the program name, the second one +#. * is the URI of the file, the third is the error message. +#. #: json-glib/json-glib-format.c:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" msgstr "%s: %s: chyba pri otváraní súboru: %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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "%s: %s: chyba pri analyzovaní súboru: %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:108 #, c-format msgid "%s: %s: error writing to stdout" msgstr "%s: %s: chyba pri zápise do štandardného výstupu" +#. 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -51,6 +63,8 @@ msgstr "%s: %s: chyba pri zatváraní: %s\n" msgid "FILE" msgstr "SÚBOR" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "Formátovať súbory JSON." @@ -59,6 +73,10 @@ msgstr "Formátovať súbory JSON." msgid "json-glib-format formats JSON resources." msgstr "json-glib-format sformátuje zdroje 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -70,11 +88,17 @@ msgstr "Chyba pri analýze volieb príkazového riadka: %s\n" msgid "Try \"%s --help\" for more information." msgstr "Viac informácií získate po zadaní príkazu „%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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "%s: chýbajúce súbory" +#. 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 "Overovať súbory JSON." @@ -83,11 +107,13 @@ msgstr "Overovať súbory JSON." msgid "json-glib-validate validates JSON data at the given URI." msgstr "json-glib-validate overí údaje JSON na danej URI." +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, c-format msgid "Expecting a JSON object, but the root node is of type `%s'" msgstr "Očakáva sa objekt JSON, ale koreňový uzol je typu „%s“" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -128,12 +154,16 @@ msgstr "Neplatný podpis pre GVariant" msgid "JSON data is empty" msgstr "Dáta JSON sú prázdne" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: Chyba analýzy: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "Údaje JSON musia byť v kódovaní UTF-8" @@ -141,6 +171,7 @@ msgstr "Údaje JSON musia byť v kódovaní UTF-8" msgid "Only one root node is allowed in a JSONPath expression" msgstr "Vo výraze JSONPath môže byť len jeden koreňový uzol" +#. translators: the %c is the invalid character #: json-glib/json-path.c:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -176,20 +207,20 @@ msgstr "Neplatná definícia indexu poľa „%*s“" msgid "Invalid first character '%c'" msgstr "Neplatný prvý znak „%c“" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "Bolo očakávané pole alebo objekt, ale aktuálny uzol je typu „%s“." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "" "Index s hodnotou „%d“ poľa na aktuálnej pozícii je väčší ako jeho veľkosť." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " @@ -197,41 +228,41 @@ msgid "" msgstr "" "Index s hodnotou „%d“ objektu na aktuálnej pozícii je väčší ako jeho veľkosť." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "Na aktuálnej pozícii nie je dostupný žiadny uzol" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "Na aktuálnej pozícii je „%s“ a nie pole" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "Bol očakávaný objekt, ale aktuálny uzol je typu „%s“." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "Člen „%s“ nie je definovaný v objekte na aktuálnej pozícii." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "Na aktuálnej pozícii je „%s“ a nie objekt" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "Na aktuálnej pozícii je „%s“ a nie hodnota" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "Na aktuálnej pozícii je „%s“ a nie reťazec" diff --git a/po/sl.gmo b/po/sl.gmo index 168e088fd299485ce464179ce197e51be68d02b0..76336d04f2fedca07f9b4cb51d3dfc1134b0b832 100644 GIT binary patch delta 29 kcmX@Bc~)~n4Yz=~u7R=wt>Os9&SfY0E5v7$p8QV delta 29 kcmX@Bc~)~n4Yz=qu7SC(k)?v6ft9JTwt?a19&SfY0EC?f*#H0l diff --git a/po/sl.po b/po/sl.po index d537e13..84aed13 100644 --- a/po/sl.po +++ b/po/sl.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2014-04-03 20:37+0100\n" "Last-Translator: Matej Urbančič \n" "Language-Team: Slovenian GNOME Translation Team \n" @@ -30,21 +30,33 @@ msgstr "Olepšaj odvod" msgid "Indentation spaces" msgstr "Presledki zamika" +#. Translators: the first %s is the program name, the second one +#. * is the URI of the file, the third is the error message. +#. #: json-glib/json-glib-format.c:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" msgstr "%s: %s: napaka odpiranja datoteke: %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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "%s: %s: napaka razčlenjevanja datoteke: %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:108 #, c-format msgid "%s: %s: error writing to stdout" msgstr "%s: %s: napaka pisanja na standardni odvod" +#. 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -54,6 +66,8 @@ msgstr "%s: %s: napaka zapiranja: %s\n" msgid "FILE" msgstr "DATOTEKA" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "Oblikuj datoteke JSON." @@ -62,6 +76,10 @@ msgstr "Oblikuj datoteke JSON." msgid "json-glib-format formats JSON resources." msgstr "Možnost json-glib-format oblikuje zapis virov 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -73,11 +91,17 @@ msgstr "Napaka med razčlenjevanjem možnosti ukazne vrstice: %s\n" msgid "Try \"%s --help\" for more information." msgstr "Poskusite \"%s --help\" za več podrobnosti." +#. 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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "%s: manjkajoče datoteke" +#. 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 "Overi datoteke JSON." @@ -86,11 +110,13 @@ msgstr "Overi datoteke JSON." msgid "json-glib-validate validates JSON data at the given URI." msgstr "Možnost json-glib-validate overi podatke JSON za podani naslov URI." +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, c-format msgid "Expecting a JSON object, but the root node is of type `%s'" msgstr "Pričakovan je predmet JSON, vendar pa je korensko vozlišče vrste `%s'" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -130,12 +156,16 @@ msgstr "Neveljaven podpis GVariant" msgid "JSON data is empty" msgstr "Podatki JSON so prazni" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: napaka razčlenjevanje: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "Podatki JSON morajo biti kodirani v naboru UTF-8" @@ -143,6 +173,7 @@ msgstr "Podatki JSON morajo biti kodirani v naboru UTF-8" msgid "Only one root node is allowed in a JSONPath expression" msgstr "Le eno korensko vozlišče je dovoljeno v izrazu JSONPath" +#. translators: the %c is the invalid character #: json-glib/json-path.c:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -177,61 +208,61 @@ msgstr "Neveljavno določilo kazala polja '%*s'" msgid "Invalid first character '%c'" msgstr "Neveljaven prvi znak '%c'" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "Trenutno vozlišče je vrste '%s', pričakovano pa je polje ali predmet." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "Kazalo '%d' je večje od velikosti polja na trenutnem položaju." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "Kazalo '%d' je večje od velikosti predmeta na trenutnem položaju." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "Na trenutnem položaju ni razpoložljivega vozlišča." -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "Trenutni položaj vsebuje '%s' in ne polja" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "Trenutno vozlišče je vrste '%s', pričakovan pa je predmet." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "Določilo '%s' ni določan v predmetu na trenutnem položaju." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "Trenutni položaj vsebuje '%s' in ne predmeta" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "Trenutni položaj vsebuje '%s' in ne vrednosti" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "Trenutni položaj ne vsebuje niza" diff --git a/po/sr.gmo b/po/sr.gmo index dcd8a09c50dc6e832b00ed66967bbc80a5e0fce9..307c7beb5cb3e0622c9112b55ab1b16166483cf2 100644 GIT binary patch delta 29 kcmX?VeAIYD3%7u|u7R=wt>OsDcpv90EF@f(f|Me delta 29 kcmX?VeAIYD3%7uou7SC(k)?v6ft9JTwt?a1Dcpv90ENB>;s5{u diff --git a/po/sr.po b/po/sr.po index 677a1b2..051af8c 100644 --- a/po/sr.po +++ b/po/sr.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: json-glib json-glib-0-14\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2014-03-21 03:58+0200\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian \n" @@ -27,21 +27,33 @@ msgstr "Излаз улепшавања" msgid "Indentation spaces" 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:77 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:89 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:108 #, 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -51,6 +63,8 @@ msgstr "%s: %s: грешка затварања: %s\n" msgid "FILE" msgstr "ДАТОТЕКА" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "Обликујте ЈСОН датотеке." @@ -59,6 +73,10 @@ msgstr "Обликујте ЈСОН датотеке." msgid "json-glib-format formats JSON resources." msgstr "„json-glib-format“ обликује ЈСОН изворишта." +#. 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -70,11 +88,17 @@ msgstr "Грешка обраде опција линије наредби: %s\n 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:193 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 "Потврдите ЈСОН датотеке." @@ -83,11 +107,13 @@ msgstr "Потврдите ЈСОН датотеке." msgid "json-glib-validate validates JSON data at the given URI." msgstr "„json-glib-validate“ потврђује ЈСОН податке и дату путању." +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, c-format msgid "Expecting a JSON object, but the root node is of type `%s'" msgstr "Очекујем ЈСОН објекат, али корени чвор је врсте „%s“" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -127,12 +153,16 @@ msgstr "Неисправан потпис Гваријанта" msgid "JSON data is empty" msgstr "ЈСОН подаци су празни" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: Грешка обраде: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "ЈСОН подаци морају бити у УТФ-8 кодирању" @@ -140,6 +170,7 @@ msgstr "ЈСОН подаци морају бити у УТФ-8 кодирању msgid "Only one root node is allowed in a JSONPath expression" msgstr "Само један корени чвор је допуштен у изразу ЈСОНПутање" +#. translators: the %c is the invalid character #: json-glib/json-path.c:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -174,60 +205,60 @@ msgstr "Неисправна одредница регистра низа „%*s msgid "Invalid first character '%c'" msgstr "Неисправан први знак „%c“" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "Тренутни чвор је врсте „%s“, али је очекиван низ или објекат." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "Регистар „%d“ је већи од величине низа на тренутном положају." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "Регистар „%d“ је већи од величине објекта на тренутном положају." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "Ниједан чвор није доступан на тренутном положају" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "Тренутни положај садржи „%s“ а не низ" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "Тренутни чвор је врсте „%s“, али је очекиван објекат." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "Члан „%s“ није одређен у објекту на тренутном положају." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "Тренутни положај садржи „%s“ а не објекат" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "Тренутни положај садржи „%s“ а не вредност" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "Тренутни положај не садржи врсту ниске" diff --git a/po/sr@latin.gmo b/po/sr@latin.gmo index 5e08408a390b69bb7854c7f4f3d56eeb140b81d4..f4c9a98f56c5305b5b1f955681c634e9ebc44608 100644 GIT binary patch delta 29 kcmX@5c}jCb3%7u|u7R=wt>OsDcok90E6=f$N&HU delta 29 kcmX@5c}jCb3%7uou7SC(k)?v6ft9JTwt?a1Dcok90EE8>*Z=?k diff --git a/po/sr@latin.po b/po/sr@latin.po index 676ad22..cfedd90 100644 --- a/po/sr@latin.po +++ b/po/sr@latin.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: json-glib json-glib-0-14\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2014-03-21 03:58+0200\n" "Last-Translator: Miroslav Nikolić \n" "Language-Team: Serbian \n" @@ -27,21 +27,33 @@ msgstr "Izlaz ulepšavanja" msgid "Indentation spaces" msgstr "Razmaci za uvlačenje" +#. Translators: the first %s is the program name, the second one +#. * is the URI of the file, the third is the error message. +#. #: json-glib/json-glib-format.c:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" msgstr "%s: %s: greška otvaranja datoteke: %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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "%s: %s: greška obrade datoteke: %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:108 #, c-format msgid "%s: %s: error writing to stdout" msgstr "%s: %s: greška pisanja na standardni izlaz" +#. 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -51,6 +63,8 @@ msgstr "%s: %s: greška zatvaranja: %s\n" msgid "FILE" msgstr "DATOTEKA" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "Oblikujte JSON datoteke." @@ -59,6 +73,10 @@ msgstr "Oblikujte JSON datoteke." msgid "json-glib-format formats JSON resources." msgstr "„json-glib-format“ oblikuje JSON izvorišta." +#. 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -70,11 +88,17 @@ msgstr "Greška obrade opcija linije naredbi: %s\n" msgid "Try \"%s --help\" for more information." msgstr "Probajte „%s --help“ za više podataka." +#. 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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "%s: nedostaju datoteke" +#. 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 "Potvrdite JSON datoteke." @@ -83,11 +107,13 @@ msgstr "Potvrdite JSON datoteke." msgid "json-glib-validate validates JSON data at the given URI." msgstr "„json-glib-validate“ potvrđuje JSON podatke i datu putanju." +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, c-format msgid "Expecting a JSON object, but the root node is of type `%s'" msgstr "Očekujem JSON objekat, ali koreni čvor je vrste „%s“" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -127,12 +153,16 @@ msgstr "Neispravan potpis Gvarijanta" msgid "JSON data is empty" msgstr "JSON podaci su prazni" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: Greška obrade: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "JSON podaci moraju biti u UTF-8 kodiranju" @@ -140,6 +170,7 @@ msgstr "JSON podaci moraju biti u UTF-8 kodiranju" msgid "Only one root node is allowed in a JSONPath expression" msgstr "Samo jedan koreni čvor je dopušten u izrazu JSONPutanje" +#. translators: the %c is the invalid character #: json-glib/json-path.c:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -174,60 +205,60 @@ msgstr "Neispravna odrednica registra niza „%*s“" msgid "Invalid first character '%c'" msgstr "Neispravan prvi znak „%c“" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "Trenutni čvor je vrste „%s“, ali je očekivan niz ili objekat." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "Registar „%d“ je veći od veličine niza na trenutnom položaju." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "Registar „%d“ je veći od veličine objekta na trenutnom položaju." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "Nijedan čvor nije dostupan na trenutnom položaju" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "Trenutni položaj sadrži „%s“ a ne niz" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "Trenutni čvor je vrste „%s“, ali je očekivan objekat." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "Član „%s“ nije određen u objektu na trenutnom položaju." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "Trenutni položaj sadrži „%s“ a ne objekat" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "Trenutni položaj sadrži „%s“ a ne vrednost" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "Trenutni položaj ne sadrži vrstu niske" diff --git a/po/sv.gmo b/po/sv.gmo index 0e6f844acd6b38c3d0354292fcc9f0a9ec71869c..c36b19efc0996b9f25609be5fbf9f23ec4e8fa1f 100644 GIT binary patch delta 29 kcmbQDIYo0rDYt;Ru7R=wt>OsR&IVy0Cq747XSbN delta 29 kcmbQDIYo0rDYt-`u7SC(k)?v6ft9JTwt?a1R&IVy0CxQcCjbBd diff --git a/po/sv.po b/po/sv.po index ec00039..56b19ed 100644 --- a/po/sv.po +++ b/po/sv.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: json-glib\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2016-07-19 23:27+0200\n" "Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" @@ -29,21 +29,33 @@ msgstr "Snygga till utmatning" msgid "Indentation spaces" msgstr "Indenteringsblanksteg" +#. Translators: the first %s is the program name, the second one +#. * is the URI of the file, the third is the error message. +#. #: json-glib/json-glib-format.c:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" msgstr "%s: %s: misslyckades att öppna fil: %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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "%s: %s: misslyckades att tolka fil: %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:108 #, c-format msgid "%s: %s: error writing to stdout" msgstr "%s: %s: misslyckades att skriva till 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -53,6 +65,8 @@ msgstr "%s: %s: misslyckades att stänga: %s\n" msgid "FILE" msgstr "FIL" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "Formatera JSON-filer." @@ -61,6 +75,10 @@ msgstr "Formatera JSON-filer." msgid "json-glib-format formats JSON resources." msgstr "json-glib-format formaterar JSON-resurser." +#. 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -72,11 +90,17 @@ msgstr "Misslyckades att tolka kommandoradsflaggor: %s\n" msgid "Try \"%s --help\" for more information." msgstr "Prova ”%s --help” för mer 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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "%s: saknar fil" +#. 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 "Validera JSON-filer." @@ -85,11 +109,13 @@ msgstr "Validera JSON-filer." msgid "json-glib-validate validates JSON data at the given URI." msgstr "json-glib-validate validerar JSON-data vid den givna URI:n." +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, c-format msgid "Expecting a JSON object, but the root node is of type `%s'" msgstr "Förväntar sig ett JSON-objekt, men rotnoden är av typen ”%s”" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -131,12 +157,16 @@ msgstr "Ogiltig GVariant-signatur" msgid "JSON data is empty" msgstr "JSON-datan är tom" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: Tolkningsfel: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "JSON-data måste vara UTF-8-kodad" @@ -144,6 +174,7 @@ msgstr "JSON-data måste vara UTF-8-kodad" msgid "Only one root node is allowed in a JSONPath expression" msgstr "Bara en rotnod är tillåten i ett JSONPath-uttryck" +#. translators: the %c is the invalid character #: json-glib/json-path.c:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -178,21 +209,21 @@ msgstr "Ogiltig vektorindexdefinition ”%*s”" msgid "Invalid first character '%c'" msgstr "Ogiltigt första tecken ”%c”" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "" "Aktuell nod är av typen ”%s”, men en vektor eller ett objekt var förväntat." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "" "Indexet ”%d” är större än storleken på vektorn på den aktuella positionen." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " @@ -200,41 +231,41 @@ msgid "" msgstr "" "Indexet ”%d” är större än storleken på objektet på den aktuella positionen." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "Ingen nod tillgänglig på aktuell position" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "Aktuell position innehåller en ”%s” och inte en vektor" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "Aktuell nod är av typen ”%s”, men ett objekt var förväntat." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "Medlemmen ”%s” är inte definierad i objektet på aktuell position." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "Aktuell position innehåller en ”%s” och inte ett objekt" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "Aktuell position innehåller en ”%s” och inte ett värde" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "Aktuell position innehåller inte en strängtyp" diff --git a/po/te.gmo b/po/te.gmo index 3494d3871b8fa718c896e2d8a47431f96671c893..7c1240e18dae9c9b5deae0951a9cf1ca2bd5199a 100644 GIT binary patch delta 29 lcmX@Bc~*17b9Mo9T?1oXLt_O)V=Ds#Z3BbN-`TJ60059m2`>Nu delta 29 lcmX@Bc~*17b9MnUT?2DnBTEHC11nQwZ3Dy2-`TJ6005B|2|oY; diff --git a/po/te.po b/po/te.po index b9b868f..2734593 100644 --- a/po/te.po +++ b/po/te.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2012-10-09 16:48+0530\n" "Last-Translator: sasi \n" "Language-Team: telugu \n" @@ -29,21 +29,33 @@ msgstr "" msgid "Indentation spaces" 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:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" 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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "" +#. Translators: the first %s is the program name, the +#. * second one is the URI of the file. +#. #: json-glib/json-glib-format.c:108 #, c-format msgid "%s: %s: error writing to stdout" 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:129 json-glib/json-glib-validate.c:87 #, fuzzy, c-format msgid "%s: %s: error closing: %s\n" @@ -53,6 +65,8 @@ msgstr "% s:% d: అన్వయ దోషం:% s" msgid "FILE" msgstr "" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "" @@ -61,6 +75,10 @@ msgstr "" msgid "json-glib-format formats JSON resources." msgstr "" +#. 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -72,11 +90,17 @@ msgstr "" msgid "Try \"%s --help\" for more information." msgstr "" +#. 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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "" +#. 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 "" @@ -85,11 +109,13 @@ msgstr "" msgid "json-glib-validate validates JSON data at the given URI." msgstr "" +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, 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:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -129,12 +155,16 @@ msgstr "చెల్లని GVariant సంతకం" msgid "JSON data is empty" msgstr "JSON డేటా ఖాళీగా ఉంది" -#: json-glib/json-parser.c:914 +#. 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:907 #, fuzzy, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "% s:% d: అన్వయ దోషం:% s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "" @@ -142,6 +172,7 @@ msgstr "" 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:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -176,60 +207,60 @@ msgstr "చెల్లని వరు సూచిక నిర్వచనం msgid "Invalid first character '%c'" msgstr "" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "ప్రస్తుత నోడ్ రకం '%s' యొక్క, కానీ ఒక విన్యాసం లేదా ఒక వస్తువు భావించారు." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "ఇండెక్స్ '%d' ప్రస్తుత స్థితి వద్ద శ్రేణి యొక్క పరిమాణం కంటే ఎక్కువగా ఉంటుంది." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "ఇండెక్స్ '%d' ప్రస్తుత స్థితి వద్ద వస్తువు యొక్క పరిమాణం కంటే ఎక్కువగా ఉంటుంది." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "ప్రస్తుత స్థానంలో అందుబాటులో లేదు నోడ్ " -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "ప్రస్తుత స్థితి ఒక '%s'కలిగి ఉంది మరియు వరుస కాదు " -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "ప్రస్తుత నోడ్ '%s' యొక్క రకం, కానీ ఒక వస్తువుని భావించారు." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "సభ్యుడు '%s', ప్రస్తుత స్థితి వద్ద అంశం వివరించబడలేదు." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "ప్రస్తుత స్థితి ఒక '%s' కలిగి ఉంది మరియు ఒక వస్తువు కాదు " -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "ప్రస్తుత స్థితి ఒక '%s'కలిగి ఉంది మరియు ఒక విలువ కాదు " -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "ప్రస్తుత స్థితి పదాల రకం కలిగి లేదు" diff --git a/po/tg.gmo b/po/tg.gmo index 057c64de1160ebd8821bbb39b8ebc926ad564235..7efbd353f5a61b248a63db53e9e030a5c4df08d1 100644 GIT binary patch delta 29 kcmZ2&yxMp}Ik$khu7R=wt>Osc5W3u0DZg%cK`qY delta 29 kcmZ2&yxMp}Ik$kBu7SC(k)?v6ft9JTwt?a1c5W3u0Dg!EhX4Qo diff --git a/po/tg.po b/po/tg.po index 3fe0a76..58a0531 100644 --- a/po/tg.po +++ b/po/tg.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Tajik Gnome\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2013-12-20 14:32+0500\n" "Last-Translator: Victor Ibragimov \n" "Language-Team: \n" @@ -26,21 +26,33 @@ msgstr "Ҳамворкунии барориш" msgid "Indentation spaces" 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:77 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:89 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:108 #, c-format msgid "%s: %s: error writing to stdout" msgstr "%s: %s: хатои сабт ба stdout" +#. Translators: the first %s is the program name, the second one +#. * is the URI of the file, the third is the error message. +#. #: json-glib/json-glib-format.c:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -50,6 +62,8 @@ msgstr "%s: %s: хатои пӯшидани: %s\n" msgid "FILE" msgstr "ФАЙЛ" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "Формати файли JSON." @@ -58,6 +72,10 @@ msgstr "Формати файли JSON." 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -69,11 +87,17 @@ msgstr "Хатои таҷзияи имконоти хати фармонӣ: %s\n 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:193 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." @@ -84,12 +108,14 @@ msgstr "" "Қимати json-glib-validate иттилооти JSON-ро дар суроғаи URI додашуда тафтиш " "мекунад." +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, c-format msgid "Expecting a JSON object, but the root node is of type `%s'" msgstr "" "Дар ҳоли мунтазири объекти JSON, вале гиреҳи root дорои намуди `%s' мебошад" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -130,12 +156,16 @@ msgstr "Имзои нодурусти GVariant" msgid "JSON data is empty" msgstr "Иттилооти JSON холӣ аст" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: Хатои таҷзия: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "Иттилооти JSON бояд ба формати UTF-8 рамзгузорӣ шавад" @@ -143,6 +173,7 @@ msgstr "Иттилооти JSON бояд ба формати UTF-8 рамзгу 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:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -177,60 +208,60 @@ msgstr "Таърифи индекси қатори \"%*s\" беэътибор а msgid "Invalid first character '%c'" msgstr "Аломати аввалини нодуруст: '%c'" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "Гиреҳи ҷорӣ аз навъи '%s' аст, вале қатор ё объект пешбинӣ шуда буд." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "Индекси '%d' калонтар аз андозаи қатор дар вазъияти ҷорӣ мебошад." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "Индекси '%d' калонтар аз андозаи объект дар вазъияти ҷорӣ аст." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "Ҳеҷ гуна гиреҳ дар вазъияти ҷорӣ дастрас нест" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "Вазъияти ҷорӣ '%s'-ро нигаҳдорӣ мекунад, на қаторро" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "Гиреҳи ҷорӣ аз навъи '%s' аст, вале объект пешбинӣ шудааст." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "Дар вазъияти ҷорӣ аъзои '%s' дар объект муайян нашудааст." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "Вазъияти ҷорӣ '%s'-ро нигаҳдорӣ мекунад, на объектро" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "Вазъияти ҷорӣ '%s'-ро нигаҳдорӣ мекунад, на қиматро" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "Ҷойгиршавии ҷорӣ ягон намуди сатрро дар бар намегирад" diff --git a/po/tr.gmo b/po/tr.gmo index 14bb696ea052a107e22dd08ea50a3821bf64ab61..c8a86830ed88ef3de4af5603df2120001e00fa42 100644 GIT binary patch delta 29 kcmaE?@mOO+4Yz=~u7R=wt>Os9`5TL0Ew0ehyVZp delta 29 kcmaE?@mOO+4Yz=qu7SC(k)?v6ft9JTwt?a19`5TL0E%J=m;e9( diff --git a/po/tr.po b/po/tr.po index 5c4743a..bfbd463 100644 --- a/po/tr.po +++ b/po/tr.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2014-12-04 23:35+0200\n" "Last-Translator: Muhammet Kara \n" "Language-Team: Türkçe \n" @@ -29,21 +29,33 @@ msgstr "Çıktıyı güzelleştir" msgid "Indentation spaces" msgstr "Girinti boşluğu" +#. Translators: the first %s is the program name, the second one +#. * is the URI of the file, the third is the error message. +#. #: json-glib/json-glib-format.c:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" 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:89 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" +#. Translators: the first %s is the program name, the +#. * second one is the URI of the file. +#. #: json-glib/json-glib-format.c:108 #, c-format msgid "%s: %s: error writing to stdout" 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -53,6 +65,8 @@ msgstr "%s: %s: kapatma hatası: %s\n" msgid "FILE" msgstr "DOSYA" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "JSON dosyalarını biçimle." @@ -61,6 +75,10 @@ msgstr "JSON dosyalarını biçimle." msgid "json-glib-format formats JSON resources." msgstr "json-glib-format, JSON verilerini biçimlendirir." +#. 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -72,11 +90,17 @@ msgstr "Komut satırı seçeneklerini ayrıştırırken hata: %s\n" msgid "Try \"%s --help\" for more information." msgstr "Daha fazla bilgi için \"%s --help\" komutunu girin." +#. 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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "%s: dosyalar eksik" +#. 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 dosyalarını doğrula." @@ -85,11 +109,13 @@ msgstr "JSON dosyalarını doğrula." 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:943 #, 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:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -130,12 +156,16 @@ msgstr "Geçersiz GVariant imzası" msgid "JSON data is empty" msgstr "JSON verisi boş" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: Ayrıştırma hatası: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "JSON verisi UTF-8 ile kodlanmış olmalıdır" @@ -143,6 +173,7 @@ msgstr "JSON verisi UTF-8 ile kodlanmış olmalıdır" msgid "Only one root node is allowed in a JSONPath expression" msgstr "JSONPath ifadesinde yalnızca bir kök düğümüne izin verilir" +#. translators: the %c is the invalid character #: json-glib/json-path.c:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -177,61 +208,61 @@ msgstr "Geçersiz dizi indisi tanımı '%*s'" msgid "Invalid first character '%c'" msgstr "Geçersiz ilk karakter '%c'" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "Geçerli düğümün türü '%s', ama bir dizi ya da bir nesne bekleniyordu." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "'%d' indisi, geçerli konumdaki dizinin boyutundan daha büyük." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "'%d' indisi, geçerli konumdaki nesnenin boyutundan daha büyük." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "Geçerli konumda kullanılabilir düğüm yok" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, 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:669 +#: json-glib/json-reader.c:670 #, 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:676 +#: json-glib/json-reader.c:677 #, 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:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, 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:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, 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:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "Geçerli konum bir dizge türü bulundurmuyor" diff --git a/po/ug.gmo b/po/ug.gmo index fd066b8b1d60096106e5a77252bb3161b0be90da..7955b8176f5b7ac0972512ed904f26160010b40f 100644 GIT binary patch delta 29 kcmcbibVF%FJ-dLpu7R=wt>Ose)f}`0EN2\n" "Language-Team: Uyghur Computer Science Association \n" @@ -25,21 +25,33 @@ msgstr "" msgid "Indentation spaces" 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:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" 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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "" +#. Translators: the first %s is the program name, the +#. * second one is the URI of the file. +#. #: json-glib/json-glib-format.c:108 #, c-format msgid "%s: %s: error writing to stdout" 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -49,6 +61,8 @@ msgstr "" msgid "FILE" msgstr "" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "" @@ -57,6 +71,10 @@ msgstr "" msgid "json-glib-format formats JSON resources." msgstr "" +#. 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -68,11 +86,17 @@ msgstr "" msgid "Try \"%s --help\" for more information." msgstr "" +#. 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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "" +#. 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 "" @@ -81,12 +105,14 @@ msgstr "" msgid "json-glib-validate validates JSON data at the given URI." msgstr "" +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, 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:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -128,12 +154,16 @@ msgstr "ئىناۋەتسىز GVariant ئىمزاسى" msgid "JSON data is empty" msgstr "JSON سانلىق-مەلۇماتى قۇرۇق" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: پارچىلاشتا خاتالىق كۆرۈلدى: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "" @@ -142,6 +172,7 @@ 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:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -176,61 +207,61 @@ msgstr "تىزىق ئىندېكس ئېنىقلىمىسى ئىناۋەتسىز msgid "Invalid first character '%c'" msgstr "" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "" "نۆۋەتتىكى تۈگۈننىڭ تىپى ‹%s›، بىراق بۇ يەرگە تىزىق ياكى بىر نەڭ كەلسە بولاتتى" -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "ئىندېكس ‹%d› ، نۆۋەتتىكى ئورۇندىكى تىزىقنىڭ چوڭلۇقىدىن چوڭ." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "ئىندېكس ‹%d› ، نۆۋەتتىكى ئورۇندىكى نەڭنىڭ چوڭلۇقىدىن چوڭ." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "نۆۋەتتىكى ئورۇندا تۈگۈن يوق" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "نۆۋەتتىكى ئورۇندىكىسى ‹%s› بولۇپ، تىزىق ئەمەس" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "نۆۋەتتىكى ئورۇندىكى تۈگۈننىڭ تىپى ‹%s›، بىراق نەڭ كەلسە بولاتتى." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "نۆۋەتتىكى ئورۇندىكى نەڭدە ‹%s› دېگەن ئەزا ئېنىقلانمىغان." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "نۆۋەتتىكى ئورۇندىكىسى ‹%s› بولۇپ، نەڭ ئەمەس" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "نۆۋەتتىكى ئورۇندىكىسى ‹%s› بولۇپ، قىممەت ئەمەس" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "نۆۋەتتىكى ئورۇندىكىسىنىڭ تىپى تېكىست ئەمەس" diff --git a/po/uk.gmo b/po/uk.gmo index b2e68dc2a6f3db2e732259711ced76183041d90d..d8d0f0062125337d548365e31eb36a2f300a5d30 100644 GIT binary patch delta 29 kcmexr{MC3v4Yz=~u7R=wt>Os9_~y&0FMF)S^xk5 delta 29 kcmexr{MC3v4Yz=qu7SC(k)?v6ft9JTwt?a19_~y&0FTZHY5)KL diff --git a/po/uk.po b/po/uk.po index 8ae101c..29a8ccf 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2014-03-30 13:22+0300\n" "Last-Translator: Mykola Tkach \n" "Language-Team: translation@linux.org.ua\n" @@ -29,21 +29,33 @@ msgstr "Виводити у зручночитаній формі" msgid "Indentation spaces" 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:77 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:89 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:108 #, 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -53,6 +65,8 @@ msgstr "%s: %s: не вдалося закрити: %s\n" msgid "FILE" msgstr "ФАЙЛ" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "Форматування файлів JSON." @@ -61,6 +75,10 @@ msgstr "Форматування файлів JSON." 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -72,11 +90,17 @@ msgstr "Не вдалося розібрати параметри командн 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:193 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." @@ -85,11 +109,13 @@ msgstr "Перевірка коректності файлів JSON." 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:943 #, 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:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -129,12 +155,16 @@ msgstr "Неправильний підпис GVariant" msgid "JSON data is empty" msgstr "Дані JSON порожні" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d: помилка розбору: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "Дані JSON повинні бути у кодуванні UTF-8" @@ -142,6 +172,7 @@ msgstr "Дані JSON повинні бути у кодуванні UTF-8" 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:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -176,61 +207,61 @@ msgstr "Неправильне визначення покажчика маси msgid "Invalid first character '%c'" msgstr "Неправильний перший символ «%c»" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "" "Поточний вузол має тип «%s», однак масив або об'єкт не були очікуваними." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "Покажчик «%d» більший за розмір масиву на поточній позиції." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "Покажчик «%d» більший за розмір об'єкту на поточній позиції." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "Немає жодного доступного вузла на поточній позиції" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "Поточна позиція утримує «%s» і не є масивом" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "Поточний вузол має тип «%s», однак об'єкт не був очікуваними." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "Частину «%s» не визначено в об'єкті на поточні позиції." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "Поточна позиція утримує «%s» і не є об'єктом" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "Поточна позиція утримує «%s» і не є значенням" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "Поточна позиція не утримує тип рядка" diff --git a/po/vi.gmo b/po/vi.gmo index 407318151a6e5870c11d406267ed99c84d889164..e7e836127e0da69c4a32a547f74c67a285640c2d 100644 GIT binary patch delta 29 lcmZ1@yGC}y5_SP|T?1oXLt_O)V=Ds#Z3BbNTiAcF0RVq=2x|ZU delta 29 lcmZ1@yGC}y5_SPIT?2DnBTEHC11nQwZ3Dy2TiAcF0RVtN2zvkk diff --git a/po/vi.po b/po/vi.po index 12d8fcf..65f641f 100644 --- a/po/vi.po +++ b/po/vi.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2012-06-30 10:26+0700\n" "Last-Translator: Nguyễn Thái Ngọc Duy \n" "Language-Team: Vietnamese \n" @@ -26,21 +26,33 @@ msgstr "" msgid "Indentation spaces" 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:77 json-glib/json-glib-validate.c:63 #, c-format msgid "%s: %s: error opening file: %s\n" 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:89 json-glib/json-glib-validate.c:75 #, c-format msgid "%s: %s: error parsing file: %s\n" msgstr "" +#. Translators: the first %s is the program name, the +#. * second one is the URI of the file. +#. #: json-glib/json-glib-format.c:108 #, c-format msgid "%s: %s: error writing to stdout" 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:129 json-glib/json-glib-validate.c:87 #, fuzzy, c-format msgid "%s: %s: error closing: %s\n" @@ -50,6 +62,8 @@ msgstr "%s:%d: Lỗi phân tích: %s" msgid "FILE" msgstr "" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "" @@ -58,6 +72,10 @@ msgstr "" msgid "json-glib-format formats JSON resources." msgstr "" +#. 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -69,11 +87,17 @@ msgstr "" msgid "Try \"%s --help\" for more information." msgstr "" +#. 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:193 json-glib/json-glib-validate.c:150 #, c-format msgid "%s: missing files" msgstr "" +#. 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 "" @@ -82,11 +106,13 @@ msgstr "" msgid "json-glib-validate validates JSON data at the given URI." msgstr "" +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, c-format msgid "Expecting a JSON object, but the root node is of type `%s'" msgstr "Cần đối tượng JSON nhưng nút gốc thuộc loại '%s'" +#. translators: the '%s' is the type name #: json-glib/json-gvariant.c:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -126,12 +152,16 @@ msgstr "Chữ ký GVariant không hợp lệ" msgid "JSON data is empty" msgstr "Dữ liệu JSON rỗng" -#: json-glib/json-parser.c:914 +#. 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:907 #, fuzzy, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d: Lỗi phân tích: %s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "" @@ -139,6 +169,7 @@ msgstr "" msgid "Only one root node is allowed in a JSONPath expression" msgstr "Chỉ cho phép duy nhất một nút gốc trong biểu thức JSONPath" +#. translators: the %c is the invalid character #: json-glib/json-path.c:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -173,61 +204,61 @@ msgstr "Định nghĩa chỉ mục mảng '%*s' không hợp lệ" msgid "Invalid first character '%c'" msgstr "" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "Nút hiện thời loại '%s', nhưng đang cần mảng hoặc một đối tượng." -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "Chỉ mục '%d' lớn hơn kích thước mảng tại vị trí hiện thời." -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "Chỉ mục '%d' lớn hơn kích thước đối tượng tại vị trí hiện thời." -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "Không có nút ở vị trí hiện thời." -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "Nút hiện thời thuộc loại '%s', nhưng đang cần đối tượng." -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "Chưa định nghĩa thành viên '%s' trong đối tượng tại vị trí hiện thời." -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "Vị trí hiện thời chứa '%s', không phải đối tượng" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "Vị trí hiện thời chứa '%s', không phải giá trị" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "Vị trí hiện thời không phải kiểu chuỗi" diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo index 8421db019e8fa25a2f21ad253871248599e8a4c4..021438b4ec7e0512416c2918c42e0b4a86f39f61 100644 GIT binary patch delta 29 kcmeBB?@-@R!!2O0YhbKvXslppY-M1eZD6puhx-pZ0Cm9!^Z)<= delta 29 kcmeBB?@-@R!!2N@YhbQxWT{|iU}b8oZD6>$hx-pZ0CtTC1ONa4 diff --git a/po/zh_CN.po b/po/zh_CN.po index a216ef7..460f1ea 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2014-02-22 09:27+0800\n" "Last-Translator: Sphinx Jiang \n" "Language-Team: Chinese Simplified \n" @@ -29,21 +29,33 @@ msgstr "美化输出" msgid "Indentation spaces" 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:77 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:89 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:108 #, 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -53,6 +65,8 @@ msgstr "%s: %s：关闭出错： %s\n" msgid "FILE" msgstr "文件" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "格式化 JSON 文件。" @@ -61,6 +75,10 @@ msgstr "格式化 JSON 文件。" 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -72,11 +90,17 @@ msgstr "解析命令行选项出错：%s\n" 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:193 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 文件" @@ -85,11 +109,13 @@ msgstr "验证 JSON 文件" msgid "json-glib-validate validates JSON data at the given URI." msgstr "json-glib-validate 验证给定 URI 的 JSON 数据。" +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, 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:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -129,12 +155,16 @@ msgstr "无效的 GVariant 签名" msgid "JSON data is empty" msgstr "JSON 数据为空" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s:%d:%d：解析错误：%s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "JSON 数据必须是 UTF-8 编码" @@ -142,6 +172,7 @@ msgstr "JSON 数据必须是 UTF-8 编码" 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:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -176,61 +207,61 @@ msgstr "无效的数组索引定义“%*s”" msgid "Invalid first character '%c'" msgstr "无效的首字符“%c”" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "当前节点的类型是“%s”，应为数组或对象。" -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "索引“%d”大于当前位置数组的大小。" -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "索引“%d”大于当前位置对象的大小。" -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "当前位置无节点可用" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "当前位置是一个“%s”，而不是一个数组" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "当前节点的类型是“%s”，但应为对象。" -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "成员“%s”没有在当前位置的对象中定义。" -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "当前位置是一个“%s”，而不是一个对象" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "当前位置是一个“%s”，不是一个值" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "当前位置不是一个字符串类型" diff --git a/po/zh_HK.gmo b/po/zh_HK.gmo index f42c3a9915f3050db53926d930484f13d28b686c..8bb0bb536bbf02bf52f8e4fc7090b66ec0c830e7 100644 GIT binary patch delta 29 kcmZ3czD#{X4Yz=~u7R=wt>Os9&RZP0D6uGPXGV_ delta 29 kcmZ3czD#{X4Yz=qu7SC(k)?v6ft9JTwt?a19&RZP0DD>oUjP6A diff --git a/po/zh_HK.po b/po/zh_HK.po index 04992e1..81c8057 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2014-02-02 20:40+0800\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Chinese (Hong Kong) \n" @@ -26,21 +26,33 @@ msgstr "Prettify 輸出" msgid "Indentation spaces" 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:77 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:89 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:108 #, 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -50,6 +62,8 @@ msgstr "%s：%s：關閉時發生錯誤：%s\n" msgid "FILE" msgstr "檔案" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "格式化 JSON 檔案。" @@ -58,6 +72,10 @@ msgstr "格式化 JSON 檔案。" 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -69,11 +87,17 @@ msgstr "分析命令列選項時發生錯誤：%s\n" 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:193 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 檔案。" @@ -82,11 +106,13 @@ msgstr "驗證 JSON 檔案。" msgid "json-glib-validate validates JSON data at the given URI." msgstr "json-glib-validate 驗證指定 URI 的 JSON 資料。" +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, 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:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -126,12 +152,16 @@ msgstr "無效的 GVariant 簽署" msgid "JSON data is empty" msgstr "JSON 資料是空的" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s：%d：%d：解析錯誤：%s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "JSON 資料必須以 UTF-8 編碼" @@ -139,6 +169,7 @@ msgstr "JSON 資料必須以 UTF-8 編碼" 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:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -173,61 +204,61 @@ msgstr "無效的陣列索引定義「%*s」" msgid "Invalid first character '%c'" msgstr "無效的第一個字符「%c」" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "目前的節點類型是「%s」，但預期應為陣列或物件。" -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "索引「%d」大於目前位置的陣列大小。" -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "索引「%d」大於目前位置的物件大小。" -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "目前的位置沒有可用的節點" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "目前的位置持有一個「%s」，並非陣列" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "目前的節點類型是「%s」，但預期應為物件。" -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "成員「%s」並未在目前的位置的物件中定義。" -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "目前的位置持有一個「%s」，並非物件" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "目前的位置持有一個「%s」，並非數值" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "目前的位置並未持有字串類型" diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo index 75bdcb12e83acac84616f7b0beadbc014c2028e8..20857b90a8d2b71814fd125cb6e6a503bcbc32df 100644 GIT binary patch delta 29 kcmZ3fzEXWd4Yz=~u7R=wt>Os9&T9<0DC+KSO5S3 delta 29 kcmZ3fzEXWd4Yz=qu7SC(k)?v6ft9JTwt?a19&T9<0DK4sXaE2J diff --git a/po/zh_TW.po b/po/zh_TW.po index 2a7ed8f..229d8c7 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: json-glib master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=json-" "glib\n" -"POT-Creation-Date: 2016-07-29 10:53+0100\n" +"POT-Creation-Date: 2017-03-13 13:00+0000\n" "PO-Revision-Date: 2014-02-01 19:05+0800\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Chinese (Taiwan) \n" @@ -26,21 +26,33 @@ msgstr "Prettify 輸出" msgid "Indentation spaces" 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:77 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:89 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:108 #, 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:129 json-glib/json-glib-validate.c:87 #, c-format msgid "%s: %s: error closing: %s\n" @@ -50,6 +62,8 @@ msgstr "%s：%s：關閉時發生錯誤：%s\n" msgid "FILE" msgstr "檔案" +#. Translators: this message will appear after the usage string +#. and before the list of options. #: json-glib/json-glib-format.c:161 msgid "Format JSON files." msgstr "格式化 JSON 檔案。" @@ -58,6 +72,10 @@ msgstr "格式化 JSON 檔案。" 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:179 json-glib/json-glib-validate.c:136 #, c-format msgid "Error parsing commandline options: %s\n" @@ -69,11 +87,17 @@ msgstr "分析命令列選項時發生錯誤：%s\n" 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:193 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 檔案。" @@ -82,11 +106,13 @@ msgstr "驗證 JSON 檔案。" msgid "json-glib-validate validates JSON data at the given URI." msgstr "json-glib-validate 驗證指定 URI 的 JSON 資料。" +#. translators: the %s is the name of the data structure #: json-glib/json-gobject.c:943 #, 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:523 #, c-format msgid "Unexpected type '%s' in JSON node" @@ -126,12 +152,16 @@ msgstr "無效的 GVariant 簽章" msgid "JSON data is empty" msgstr "JSON 資料是空的" -#: json-glib/json-parser.c:914 +#. 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:907 #, c-format msgid "%s:%d:%d: Parse error: %s" msgstr "%s：%d：%d：解析錯誤：%s" -#: json-glib/json-parser.c:997 +#: json-glib/json-parser.c:990 msgid "JSON data must be UTF-8 encoded" msgstr "JSON 資料必須以 UTF-8 編碼" @@ -139,6 +169,7 @@ msgstr "JSON 資料必須以 UTF-8 編碼" 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:397 #, c-format msgid "Root node followed by invalid character '%c'" @@ -173,61 +204,61 @@ msgstr "無效的陣列索引定義「%*s」" msgid "Invalid first character '%c'" msgstr "無效的第一個字元「%c」" -#: json-glib/json-reader.c:473 +#: json-glib/json-reader.c:474 #, c-format msgid "" "The current node is of type '%s', but an array or an object was expected." msgstr "目前的節點類型是「%s」，但預期應為陣列或物件。" -#: json-glib/json-reader.c:485 +#: json-glib/json-reader.c:486 #, c-format msgid "" "The index '%d' is greater than the size of the array at the current position." msgstr "索引「%d」大於目前位置的陣列大小。" -#: json-glib/json-reader.c:502 +#: json-glib/json-reader.c:503 #, c-format msgid "" "The index '%d' is greater than the size of the object at the current " "position." msgstr "索引「%d」大於目前位置的物件大小。" -#: json-glib/json-reader.c:586 json-glib/json-reader.c:750 -#: json-glib/json-reader.c:801 json-glib/json-reader.c:839 -#: json-glib/json-reader.c:877 json-glib/json-reader.c:915 -#: json-glib/json-reader.c:953 json-glib/json-reader.c:998 -#: json-glib/json-reader.c:1034 json-glib/json-reader.c:1060 +#: json-glib/json-reader.c:587 json-glib/json-reader.c:751 +#: json-glib/json-reader.c:802 json-glib/json-reader.c:840 +#: json-glib/json-reader.c:878 json-glib/json-reader.c:916 +#: json-glib/json-reader.c:954 json-glib/json-reader.c:999 +#: json-glib/json-reader.c:1035 json-glib/json-reader.c:1061 msgid "No node available at the current position" msgstr "目前的位置沒有可用的節點" -#: json-glib/json-reader.c:593 +#: json-glib/json-reader.c:594 #, c-format msgid "The current position holds a '%s' and not an array" msgstr "目前的位置持有一個「%s」，並非陣列" -#: json-glib/json-reader.c:669 +#: json-glib/json-reader.c:670 #, c-format msgid "The current node is of type '%s', but an object was expected." msgstr "目前的節點類型是「%s」，但預期應為物件。" -#: json-glib/json-reader.c:676 +#: json-glib/json-reader.c:677 #, c-format msgid "The member '%s' is not defined in the object at the current position." msgstr "成員「%s」並未在目前的位置的物件中定義。" -#: json-glib/json-reader.c:757 json-glib/json-reader.c:808 +#: json-glib/json-reader.c:758 json-glib/json-reader.c:809 #, c-format msgid "The current position holds a '%s' and not an object" msgstr "目前的位置持有一個「%s」，並非物件" -#: json-glib/json-reader.c:848 json-glib/json-reader.c:886 -#: json-glib/json-reader.c:924 json-glib/json-reader.c:962 -#: json-glib/json-reader.c:1007 +#: json-glib/json-reader.c:849 json-glib/json-reader.c:887 +#: json-glib/json-reader.c:925 json-glib/json-reader.c:963 +#: json-glib/json-reader.c:1008 #, c-format msgid "The current position holds a '%s' and not a value" msgstr "目前的位置持有一個「%s」，並非數值" -#: json-glib/json-reader.c:970 +#: json-glib/json-reader.c:971 msgid "The current position does not hold a string type" msgstr "目前的位置並未持有字串類型" -- 2.7.4