Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package girara for openSUSE:Factory checked in at 2023-02-27 12:55:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/girara (Old) and /work/SRC/openSUSE:Factory/.girara.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "girara" Mon Feb 27 12:55:22 2023 rev:15 rq:1067853 version:0.3.9 Changes: -------- --- /work/SRC/openSUSE:Factory/girara/girara.changes 2022-03-01 17:04:45.492352378 +0100 +++ /work/SRC/openSUSE:Factory/.girara.new.31432/girara.changes 2023-02-27 12:55:22.971427848 +0100 @@ -1,0 +2,7 @@ +Sun Feb 26 22:35:55 UTC 2023 - OndÅej Súkup <mimi...@gmail.com> + +- update to 0.3.9 + * Switch to json-glib + * Add support for non-ASCII keys + +------------------------------------------------------------------- Old: ---- girara-0.3.7.tar.xz New: ---- girara-0.3.9.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ girara.spec ++++++ --- /var/tmp/diff_new_pack.4esrUQ/_old 2023-02-27 12:55:23.439430733 +0100 +++ /var/tmp/diff_new_pack.4esrUQ/_new 2023-02-27 12:55:23.451430807 +0100 @@ -1,7 +1,7 @@ # # spec file for package girara # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define libname libgirara-gtk3 %define so_ver 3 Name: girara -Version: 0.3.7 +Version: 0.3.9 Release: 0 Summary: Graphical user interface library License: Zlib @@ -33,7 +33,7 @@ BuildRequires: pkgconfig(check) BuildRequires: pkgconfig(glib-2.0) >= 2.50 BuildRequires: pkgconfig(gtk+-3.0) >= 3.20 -BuildRequires: pkgconfig(json-c) +BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(pango) >= 1.14 ++++++ girara-0.3.7.tar.xz -> girara-0.3.9.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.7/.gitlab-ci.yml new/girara-0.3.9/.gitlab-ci.yml --- old/girara-0.3.7/.gitlab-ci.yml 2022-02-13 19:11:34.000000000 +0100 +++ new/girara-0.3.9/.gitlab-ci.yml 2023-01-15 16:58:16.000000000 +0100 @@ -32,12 +32,12 @@ except: - tags -# Debian 10 (Buster) -build:debian-buster: +# Debian 11 (bullseye) +build:debian-bullseye: tags: - pwmt stage: build - image: registry.pwmt.org/pwmt/gitlab-runner-images/debian:buster + image: registry.pwmt.org/pwmt/gitlab-runner-images/debian:bullseye script: - mkdir -p build && cd build - meson .. @@ -49,25 +49,25 @@ except: - tags -test:debian-buster: +test:debian-bullseye: tags: - pwmt stage: test - image: registry.pwmt.org/pwmt/gitlab-runner-images/debian:buster + image: registry.pwmt.org/pwmt/gitlab-runner-images/debian:bullseye script: - cd build - ninja test dependencies: - - build:debian-buster + - build:debian-bullseye except: - tags -# Ubuntu 18.04 LTS (Bionic Beaver) -build:ubuntu-bionic: +# Debian 12 (bookworm) +build:debian-bookworm: tags: - pwmt stage: build - image: registry.pwmt.org/pwmt/gitlab-runner-images/ubuntu:bionic + image: registry.pwmt.org/pwmt/gitlab-runner-images/debian:bookworm script: - mkdir -p build && cd build - meson .. @@ -79,25 +79,25 @@ except: - tags -test:ubuntu-bionic: +test:debian-bookworm: tags: - pwmt stage: test - image: registry.pwmt.org/pwmt/gitlab-runner-images/ubuntu:bionic + image: registry.pwmt.org/pwmt/gitlab-runner-images/debian:bookworm script: - cd build - ninja test dependencies: - - build:ubuntu-bionic + - build:debian-bookworm except: - tags -# Ubuntu 19.10 (Eoan Ermine) -build:ubuntu-eoan: +# Ubuntu 20.04 LTS (focal) +build:ubuntu-focal: tags: - pwmt stage: build - image: registry.pwmt.org/pwmt/gitlab-runner-images/ubuntu:eoan + image: registry.pwmt.org/pwmt/gitlab-runner-images/ubuntu:focal script: - mkdir -p build && cd build - meson .. @@ -109,15 +109,46 @@ except: - tags -test:ubuntu-eoan: +test:ubuntu-focal: tags: - pwmt stage: test - image: registry.pwmt.org/pwmt/gitlab-runner-images/ubuntu:eoan + image: registry.pwmt.org/pwmt/gitlab-runner-images/ubuntu:focal script: - cd build - ninja test dependencies: - - build:ubuntu-eoan + - build:ubuntu-focal except: - tags + +# Ubuntu 22.04 LTS (jammy) +build:ubuntu-jammy: + tags: + - pwmt + stage: build + image: registry.pwmt.org/pwmt/gitlab-runner-images/ubuntu:jammy + script: + - mkdir -p build && cd build + - meson .. + - ninja + artifacts: + expire_in: 1 day + paths: + - build + except: + - tags + +test:ubuntu-jammy: + tags: + - pwmt + stage: test + image: registry.pwmt.org/pwmt/gitlab-runner-images/ubuntu:jammy + script: + - cd build + - ninja test + dependencies: + - build:ubuntu-jammy + except: + - tags + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.7/README.md new/girara-0.3.9/README.md --- old/girara-0.3.7/README.md 2022-02-13 19:11:34.000000000 +0100 +++ new/girara-0.3.9/README.md 2023-01-15 16:58:16.000000000 +0100 @@ -18,21 +18,22 @@ The following dependencies are optional: -* `libnotify`: notification support -* `json-c`: configuration dumping support +* `libnotify`: notification support (deprecated, disabled by default) +* `json-glib-1.0`: configuration dumping support For building girara, the following dependencies are also required: * `meson` (>= 0.56) * `gettext` +* `pkgconf` The following dependencies are optional build-time only dependencies: * `check` (>= 0.11): for tests * `doxygen`: HTML documentation -To disable the optional support for `libnotify` and `json-c`, configure the build -system with `-Dnotify=disabled` or `-Djson=disabled`. +To disable the optional support for `json-glib-1.0`, configure the build system +with `-Djson=disabled`. Installation ------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.7/girara/callbacks.c new/girara-0.3.9/girara/callbacks.c --- old/girara-0.3.7/girara/callbacks.c 2022-02-13 19:11:34.000000000 +0100 +++ new/girara-0.3.9/girara/callbacks.c 2023-01-15 16:58:16.000000000 +0100 @@ -128,14 +128,17 @@ } ); + gunichar codepoint = gdk_keyval_to_unicode(keyval); + /* update buffer */ - if (keyval >= 0x21 && keyval <= 0x7E) { + /* 0xff00 was chosen because every "special" keyval seems to be above it */ + if (keyval >= 0x21 && keyval < 0xff00 && codepoint) { /* overall buffer */ if (session->global.buffer == NULL) { session->global.buffer = g_string_new(""); } - session->global.buffer = g_string_append_c(session->global.buffer, keyval); + session->global.buffer = g_string_append_unichar(session->global.buffer, codepoint); if (session_private->buffer.command == NULL && keyval >= 0x30 && keyval <= 0x39) { if (((session_private->buffer.n * 10) + (keyval - '0')) < INT_MAX) { @@ -146,7 +149,7 @@ session_private->buffer.command = g_string_new(""); } - session_private->buffer.command = g_string_append_c(session_private->buffer.command, keyval); + session_private->buffer.command = g_string_append_unichar(session_private->buffer.command, codepoint); } if (session->events.buffer_changed != NULL) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.7/girara/commands.c new/girara-0.3.9/girara/commands.c --- old/girara-0.3.7/girara/commands.c 2022-02-13 19:11:34.000000000 +0100 +++ new/girara-0.3.9/girara/commands.c 2023-01-15 16:58:16.000000000 +0100 @@ -125,12 +125,13 @@ size_t current_command = 0; char* tmp = girara_list_nth(argument_list, current_command); - size_t tmp_length = strlen(tmp); + size_t tmp_length = g_utf8_strlen(tmp, -1); + size_t tmp_size = strlen(tmp); /* Check first argument for mode */ bool is_mode = false; - if (tmp_length >= 3 && tmp[0] == '[' && tmp[tmp_length - 1] == ']') { - char* tmp_inner = g_strndup(tmp + 1, tmp_length - 2); + if (tmp_length >= 3 && tmp[0] == '[' && tmp[tmp_size - 1] == ']') { + char* tmp_inner = g_strndup(tmp + 1, tmp_size - 2); GIRARA_LIST_FOREACH_BODY(session->modes.identifiers, girara_mode_string_t*, mode, if (!g_strcmp0(tmp_inner, mode->name)) { @@ -151,17 +152,19 @@ if (is_mode == true) { tmp = girara_list_nth(argument_list, ++current_command); - tmp_length = strlen(tmp); + tmp_length = g_utf8_strlen(tmp, -1); + tmp_size = strlen(tmp); } /* Check for multi key shortcut */ - if (tmp_length >= 3 && tmp[0] == '<' && tmp[tmp_length - 1] == '>') { - tmp = g_strndup(tmp + 1, tmp_length - 2); - tmp_length = strlen(tmp); + if (tmp_length >= 3 && tmp[0] == '<' && tmp[tmp_size - 1] == '>') { + tmp = g_strndup(tmp + 1, tmp_size - 2); + tmp_length = g_utf8_strlen(tmp, -1); + tmp_size = strlen(tmp); /* Multi key shortcut */ - if (strchr(tmp, '-') != NULL && tmp[1] == '-' && tmp_length > 2) { - switch (tmp[0]) { + if (strchr(tmp, '-') != NULL && g_utf8_get_char(g_utf8_offset_to_pointer(tmp, 1)) == '-' && tmp_length > 2) { + switch (g_utf8_get_char(tmp)) { case 'S': shortcut_mask = GDK_SHIFT_MASK; break; @@ -181,7 +184,7 @@ /* Single key */ if (tmp_length == 3) { - shortcut_key = tmp[2]; + shortcut_key = gdk_unicode_to_keyval(g_utf8_get_char(g_utf8_offset_to_pointer(tmp, 2))); /* Possible special key */ } else { bool found = false; @@ -258,7 +261,7 @@ g_free(tmp); /* Single key shortcut */ } else if (tmp_length == 1) { - shortcut_key = tmp[0]; + shortcut_key = gdk_unicode_to_keyval(g_utf8_get_char(tmp)); /* Buffer command */ } else { shortcut_buffer_command = g_strdup(tmp); @@ -269,16 +272,17 @@ if (unmap == false) { if (++current_command < number_of_arguments) { tmp = girara_list_nth(argument_list, current_command); - tmp_length = strlen(tmp); + tmp_length = g_utf8_strlen(tmp, -1); + tmp_size = strlen(tmp); - if (tmp_length >= 3 && tmp[0] == '[' && tmp[tmp_length - 1] == ']') { + if (tmp_length >= 3 && tmp[0] == '[' && tmp[tmp_size - 1] == ']') { mouse_mode = true; if (mouse_event == false) { girara_warning("Mode passed on non-mouse event: %s", tmp); return false; } - char* tmp_inner = g_strndup(tmp + 1, tmp_length - 2); + char* tmp_inner = g_strndup(tmp + 1, tmp_size - 2); bool found = false; for (unsigned int i = 0; i < LENGTH(mouse_events); i++) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.7/girara/session.h new/girara-0.3.9/girara/session.h --- old/girara-0.3.7/girara/session.h 2022-02-13 19:11:34.000000000 +0100 +++ new/girara-0.3.9/girara/session.h 2023-01-15 16:58:16.000000000 +0100 @@ -140,7 +140,7 @@ * @param body The content */ void girara_libnotify(girara_session_t* session, const char *summary, - const char *body) GIRARA_VISIBLE; + const char *body) GIRARA_VISIBLE GIRARA_DEPRECATED_; /** * Displays a notification for the user. It is possible to pass GIRARA_INFO, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.7/girara/settings.c new/girara-0.3.9/girara/settings.c --- old/girara-0.3.7/girara/settings.c 2022-02-13 19:11:34.000000000 +0100 +++ new/girara-0.3.9/girara/settings.c 2023-01-15 16:58:16.000000000 +0100 @@ -5,7 +5,7 @@ #include <glib/gi18n-lib.h> #include <string.h> #ifdef WITH_JSON -#include <json.h> +#include <json-glib/json-glib.h> #endif #include "settings.h" @@ -236,6 +236,47 @@ } #ifdef WITH_JSON +static void dump_setting(JsonBuilder* builder, const girara_setting_t* setting) { + json_builder_set_member_name(builder, setting->name); + json_builder_begin_object(builder); + json_builder_set_member_name(builder, "value"); + const char* type = NULL; + switch (setting->type) { + case BOOLEAN: + json_builder_add_boolean_value(builder, setting->value.b); + type = "boolean"; + break; + case FLOAT: + json_builder_add_double_value(builder, setting->value.f); + type = "float"; + break; + case INT: + json_builder_add_int_value(builder, setting->value.i); + type = "int"; + break; + case STRING: + json_builder_add_string_value(builder, + setting->value.s ? setting->value.s : ""); + type = "string"; + break; + default: + girara_debug("Invalid setting: %s", setting->name); + } + + if (type != NULL) { + json_builder_set_member_name(builder, "type"); + json_builder_add_string_value(builder, type); + } + + if (setting->description != NULL) { + json_builder_set_member_name(builder, "description"); + json_builder_add_string_value(builder, setting->description); + } + json_builder_set_member_name(builder, "init-only"); + json_builder_add_boolean_value(builder, setting->init_only); + json_builder_end_object(builder); +} + bool girara_cmd_dump_config(girara_session_t* session, girara_list_t* argument_list) { @@ -253,52 +294,31 @@ return false; } - json_object* json_config = json_object_new_object(); - + JsonBuilder* builder = json_builder_new(); + json_builder_begin_object(builder); GIRARA_LIST_FOREACH_BODY(session->private_data->settings, girara_setting_t*, setting, - json_object* json_setting = json_object_new_object(); - - json_object* json_value = NULL; - json_object* json_type = NULL; - switch(setting->type) { - case BOOLEAN: - json_value = json_object_new_boolean(setting->value.b); - json_type = json_object_new_string("boolean"); - break; - case FLOAT: - json_value = json_object_new_double(setting->value.f); - json_type = json_object_new_string("float"); - break; - case INT: - json_value = json_object_new_int(setting->value.i); - json_type = json_object_new_string("int"); - break; - case STRING: - json_value = json_object_new_string(setting->value.s ? setting->value.s : ""); - json_type = json_object_new_string("string"); - break; - default: - girara_debug("Invalid setting: %s", setting->name); - } - if (json_value != NULL) { - json_object_object_add(json_setting, "value", json_value); - json_object_object_add(json_setting, "type", json_type); - } - - if (setting->description != NULL) { - json_object_object_add(json_setting, "description", - json_object_new_string(setting->description)); - } - json_object_object_add(json_setting, "init-only", - json_object_new_boolean(setting->init_only)); - - json_object_object_add(json_config, setting->name, json_setting); + dump_setting(builder, setting); ); + json_builder_end_object(builder); - json_object_to_file_ext(girara_list_nth(argument_list, 0), json_config, - JSON_C_TO_STRING_PRETTY); - json_object_put(json_config); + JsonGenerator* gen = json_generator_new(); + json_generator_set_pretty(gen, true); + JsonNode* root = json_builder_get_root(builder); + json_generator_set_root(gen, root); + + bool ret = true; + GError* error = NULL; + if (!json_generator_to_file(gen, girara_list_nth(argument_list, 0), &error)) { + girara_warning("Failed to write JSON: %s", error->message); + girara_notify(session, GIRARA_ERROR, _("Failed to write JSON: %s"), error->message); + g_error_free(error); + ret = false; + } + + json_node_free(root); + g_object_unref(gen); + g_object_unref(builder); - return true; + return ret; } #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.7/girara/utils.c new/girara-0.3.9/girara/utils.c --- old/girara-0.3.7/girara/utils.c 2022-02-13 19:11:34.000000000 +0100 +++ new/girara-0.3.9/girara/utils.c 2023-01-15 16:58:16.000000000 +0100 @@ -409,7 +409,7 @@ GString* str = g_string_new(""); while (*value != '\0') { const char c = *value++; - if (strchr("\\ \t\"\'", c) != NULL) { + if (strchr("\\ \t\"\'#", c) != NULL) { g_string_append_c(str, '\\'); } g_string_append_c(str, c); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.7/meson.build new/girara-0.3.9/meson.build --- old/girara-0.3.7/meson.build 2022-02-13 19:11:34.000000000 +0100 +++ new/girara-0.3.9/meson.build 2023-01-15 16:58:16.000000000 +0100 @@ -1,5 +1,5 @@ project('girara', 'c', - version: '0.3.7', + version: '0.3.9', meson_version: '>=0.56', default_options: ['c_std=c11', 'warning_level=3'], ) @@ -63,7 +63,7 @@ # optional dependencies pc_requires_private = ['pango'] libnotify = dependency('libnotify', version: '>=0.7.0', required: get_option('notify')) -jsonc = dependency('json-c', required: get_option('json')) +jsonc = dependency('json-glib-1.0', required: get_option('json')) if libnotify.found() build_dependencies += libnotify @@ -74,7 +74,7 @@ if jsonc.found() build_dependencies += jsonc defines += '-DWITH_JSON' - pc_requires_private += 'json-c' + pc_requires_private += 'json-glib-1.0' endif # generate version header file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.7/po/ar.po new/girara-0.3.9/po/ar.po --- old/girara-0.3.7/po/ar.po 2022-02-13 19:11:34.000000000 +0100 +++ new/girara-0.3.9/po/ar.po 2023-01-15 16:58:16.000000000 +0100 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: girara\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-06 14:42+0100\n" -"PO-Revision-Date: 2021-07-14 15:12+0000\n" +"POT-Creation-Date: 2022-09-10 11:35+0200\n" +"PO-Revision-Date: 2012-03-26 16:41+0000\n" "Last-Translator: Sebastian Ramacher <sebastian+...@ramacher.at>\n" "Language-Team: Arabic (http://www.transifex.com/pwmt/girara/language/ar/)\n" "Language: ar\n" @@ -226,11 +226,16 @@ msgid "Dump settings to a file" msgstr "" -#: girara/settings.c:251 +#: girara/settings.c:292 #, c-format msgid "Invalid number of arguments passed: %zu instead of 1" msgstr "" +#: girara/settings.c:313 +#, c-format +msgid "Failed to write JSON: %s" +msgstr "" + #: girara/utils.c:473 #, c-format msgid "Failed to execute command: %s" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.7/po/de.po new/girara-0.3.9/po/de.po --- old/girara-0.3.7/po/de.po 2022-02-13 19:11:34.000000000 +0100 +++ new/girara-0.3.9/po/de.po 2023-01-15 16:58:16.000000000 +0100 @@ -11,9 +11,9 @@ msgstr "" "Project-Id-Version: girara\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-06 14:42+0100\n" -"PO-Revision-Date: 2021-07-14 15:12+0000\n" "Last-Translator: Sebastian Ramacher <sebastian+...@ramacher.at>\n" +"POT-Creation-Date: 2022-11-27 16:25+0100\n" +"PO-Revision-Date: 2022-09-10 11:36+0200\n" "Language-Team: German (http://www.transifex.com/pwmt/girara/language/de/)\n" "Language: de\n" "MIME-Version: 1.0\n" @@ -234,11 +234,16 @@ msgid "Dump settings to a file" msgstr "Speichere Einstellungen in einer Datei" -#: girara/settings.c:251 +#: girara/settings.c:292 #, c-format msgid "Invalid number of arguments passed: %zu instead of 1" msgstr "Ungültige Anzahl an Argumente übergeben: %zu anstatt von 1" +#: girara/settings.c:313 +#, c-format +msgid "Failed to write JSON: %s" +msgstr "Konnte JSON-Datei nicht schreiben: %s" + #: girara/utils.c:473 #, c-format msgid "Failed to execute command: %s" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.7/po/el.po new/girara-0.3.9/po/el.po --- old/girara-0.3.7/po/el.po 2022-02-13 19:11:34.000000000 +0100 +++ new/girara-0.3.9/po/el.po 2023-01-15 16:58:16.000000000 +0100 @@ -8,9 +8,9 @@ msgstr "" "Project-Id-Version: girara\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-06 14:42+0100\n" -"PO-Revision-Date: 2021-07-14 15:12+0000\n" -"Last-Translator: Sebastian Ramacher <sebastian+...@ramacher.at>\n" +"POT-Creation-Date: 2022-09-10 11:35+0200\n" +"PO-Revision-Date: 2022-09-10 11:36+0200\n" +"Last-Translator: Nisok Kosin <ni...@in.gr>, 2012\n" "Language-Team: Greek (http://www.transifex.com/pwmt/girara/language/el/)\n" "Language: el\n" "MIME-Version: 1.0\n" @@ -227,11 +227,16 @@ msgid "Dump settings to a file" msgstr "" -#: girara/settings.c:251 +#: girara/settings.c:292 #, c-format msgid "Invalid number of arguments passed: %zu instead of 1" msgstr "" +#: girara/settings.c:313 +#, c-format +msgid "Failed to write JSON: %s" +msgstr "" + #: girara/utils.c:473 #, c-format msgid "Failed to execute command: %s" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.7/po/eo.po new/girara-0.3.9/po/eo.po --- old/girara-0.3.7/po/eo.po 2022-02-13 19:11:34.000000000 +0100 +++ new/girara-0.3.9/po/eo.po 2023-01-15 16:58:16.000000000 +0100 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: girara\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-13 09:01+0200\n" -"PO-Revision-Date: 2019-06-01 09:25+0000\n" +"POT-Creation-Date: 2022-09-10 11:35+0200\n" +"PO-Revision-Date: 2022-09-10 11:37+0200\n" "Last-Translator: Sebastian Ramacher <sebastian+...@ramacher.at>\n" "Language-Team: Esperanto (http://www.transifex.com/pwmt/girara/language/" "eo/)\n" @@ -226,11 +226,16 @@ msgid "Dump settings to a file" msgstr "" -#: girara/settings.c:251 +#: girara/settings.c:292 #, c-format msgid "Invalid number of arguments passed: %zu instead of 1" msgstr "" +#: girara/settings.c:313 +#, c-format +msgid "Failed to write JSON: %s" +msgstr "" + #: girara/utils.c:473 #, c-format msgid "Failed to execute command: %s" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.7/po/es.po new/girara-0.3.9/po/es.po --- old/girara-0.3.7/po/es.po 2022-02-13 19:11:34.000000000 +0100 +++ new/girara-0.3.9/po/es.po 2023-01-15 16:58:16.000000000 +0100 @@ -8,15 +8,16 @@ msgstr "" "Project-Id-Version: girara\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-06 14:42+0100\n" -"PO-Revision-Date: 2021-07-14 15:12+0000\n" +"POT-Creation-Date: 2022-09-10 11:35+0200\n" +"PO-Revision-Date: 2022-09-10 11:37+0200\n" "Last-Translator: Sebastian Ramacher <sebastian+...@ramacher.at>\n" "Language-Team: Spanish (http://www.transifex.com/pwmt/girara/language/es/)\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? " +"1 : 2;\n" #: girara/commands.c:111 girara/commands.c:311 #, c-format @@ -227,11 +228,16 @@ msgid "Dump settings to a file" msgstr "" -#: girara/settings.c:251 +#: girara/settings.c:292 #, c-format msgid "Invalid number of arguments passed: %zu instead of 1" msgstr "" +#: girara/settings.c:313 +#, c-format +msgid "Failed to write JSON: %s" +msgstr "" + #: girara/utils.c:473 #, c-format msgid "Failed to execute command: %s" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.7/po/fa_IR.po new/girara-0.3.9/po/fa_IR.po --- old/girara-0.3.7/po/fa_IR.po 2022-02-13 19:11:34.000000000 +0100 +++ new/girara-0.3.9/po/fa_IR.po 2023-01-15 16:58:16.000000000 +0100 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: girara\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-06 14:42+0100\n" -"PO-Revision-Date: 2021-07-14 15:12+0000\n" +"POT-Creation-Date: 2022-09-10 11:35+0200\n" +"PO-Revision-Date: 2012-03-26 16:41+0000\n" "Last-Translator: Goudarz Jafari <goudarz.jaf...@gmail.com>\n" "Language-Team: Persian (Iran) (http://www.transifex.com/pwmt/girara/language/" "fa_IR/)\n" @@ -227,11 +227,16 @@ msgid "Dump settings to a file" msgstr "" -#: girara/settings.c:251 +#: girara/settings.c:292 #, c-format msgid "Invalid number of arguments passed: %zu instead of 1" msgstr "" +#: girara/settings.c:313 +#, c-format +msgid "Failed to write JSON: %s" +msgstr "" + #: girara/utils.c:473 #, c-format msgid "Failed to execute command: %s" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.7/po/fr.po new/girara-0.3.9/po/fr.po --- old/girara-0.3.7/po/fr.po 2022-02-13 19:11:34.000000000 +0100 +++ new/girara-0.3.9/po/fr.po 2023-01-15 16:58:16.000000000 +0100 @@ -9,15 +9,16 @@ msgstr "" "Project-Id-Version: girara\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-06 14:42+0100\n" -"PO-Revision-Date: 2021-07-14 15:12+0000\n" -"Last-Translator: Sebastian Ramacher <sebastian+...@ramacher.at>\n" +"POT-Creation-Date: 2022-09-10 11:35+0200\n" +"PO-Revision-Date: 2022-09-10 11:38+0200\n" +"Last-Translator: rike, 2013\n" "Language-Team: French (http://www.transifex.com/pwmt/girara/language/fr/)\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % " +"1000000 == 0 ? 1 : 2;\n" #: girara/commands.c:111 girara/commands.c:311 #, c-format @@ -230,11 +231,16 @@ msgid "Dump settings to a file" msgstr "" -#: girara/settings.c:251 +#: girara/settings.c:292 #, c-format msgid "Invalid number of arguments passed: %zu instead of 1" msgstr "" +#: girara/settings.c:313 +#, c-format +msgid "Failed to write JSON: %s" +msgstr "" + #: girara/utils.c:473 #, c-format msgid "Failed to execute command: %s" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.7/po/he.po new/girara-0.3.9/po/he.po --- old/girara-0.3.7/po/he.po 2022-02-13 19:11:34.000000000 +0100 +++ new/girara-0.3.9/po/he.po 2023-01-15 16:58:16.000000000 +0100 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: girara\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-06 14:42+0100\n" -"PO-Revision-Date: 2021-07-14 15:12+0000\n" +"POT-Creation-Date: 2022-09-10 11:35+0200\n" +"PO-Revision-Date: 2012-03-26 16:41+0000\n" "Last-Translator: Sebastian Ramacher <sebastian+...@ramacher.at>\n" "Language-Team: Hebrew (http://www.transifex.com/pwmt/girara/language/he/)\n" "Language: he\n" @@ -227,11 +227,16 @@ msgid "Dump settings to a file" msgstr "" -#: girara/settings.c:251 +#: girara/settings.c:292 #, c-format msgid "Invalid number of arguments passed: %zu instead of 1" msgstr "" +#: girara/settings.c:313 +#, c-format +msgid "Failed to write JSON: %s" +msgstr "" + #: girara/utils.c:473 #, c-format msgid "Failed to execute command: %s" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.7/po/it.po new/girara-0.3.9/po/it.po --- old/girara-0.3.7/po/it.po 2022-02-13 19:11:34.000000000 +0100 +++ new/girara-0.3.9/po/it.po 2023-01-15 16:58:16.000000000 +0100 @@ -7,15 +7,16 @@ msgstr "" "Project-Id-Version: girara\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-06 14:42+0100\n" -"PO-Revision-Date: 2021-07-14 15:12+0000\n" -"Last-Translator: Sebastian Ramacher <sebastian+...@ramacher.at>\n" +"POT-Creation-Date: 2022-09-10 11:35+0200\n" +"PO-Revision-Date: 2022-09-10 11:38+0200\n" +"Last-Translator: TheLemonMan <segnalazionidal...@gmail.com>, 2012,2015\n" "Language-Team: Italian (http://www.transifex.com/pwmt/girara/language/it/)\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? " +"1 : 2;\n" #: girara/commands.c:111 girara/commands.c:311 #, c-format @@ -226,11 +227,16 @@ msgid "Dump settings to a file" msgstr "" -#: girara/settings.c:251 +#: girara/settings.c:292 #, c-format msgid "Invalid number of arguments passed: %zu instead of 1" msgstr "Numero degli argomenti non valido: %zu immessi, 1 attesi" +#: girara/settings.c:313 +#, c-format +msgid "Failed to write JSON: %s" +msgstr "" + #: girara/utils.c:473 #, c-format msgid "Failed to execute command: %s" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.7/po/nl.po new/girara-0.3.9/po/nl.po --- old/girara-0.3.7/po/nl.po 2022-02-13 19:11:34.000000000 +0100 +++ new/girara-0.3.9/po/nl.po 2023-01-15 16:58:16.000000000 +0100 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: girara\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-06 14:42+0100\n" -"PO-Revision-Date: 2021-07-14 17:37+0000\n" +"POT-Creation-Date: 2022-09-10 11:35+0200\n" +"PO-Revision-Date: 2012-03-26 16:41+0000\n" "Last-Translator: Heimen Stoffels <vistau...@fastmail.com>\n" "Language-Team: Dutch (http://www.transifex.com/pwmt/girara/language/nl/)\n" "Language: nl\n" @@ -227,11 +227,16 @@ msgid "Dump settings to a file" msgstr "Instellingen opslaan naar een bestand" -#: girara/settings.c:251 +#: girara/settings.c:292 #, c-format msgid "Invalid number of arguments passed: %zu instead of 1" msgstr "Ongeldig aantal argumenten: %zu i.p.v. 1" +#: girara/settings.c:313 +#, c-format +msgid "Failed to write JSON: %s" +msgstr "De json kan niet worden weggeschreven: %s" + #: girara/utils.c:473 #, c-format msgid "Failed to execute command: %s" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.7/po/pl.po new/girara-0.3.9/po/pl.po --- old/girara-0.3.7/po/pl.po 2022-02-13 19:11:34.000000000 +0100 +++ new/girara-0.3.9/po/pl.po 2023-01-15 16:58:16.000000000 +0100 @@ -8,17 +8,17 @@ msgstr "" "Project-Id-Version: girara\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-06 14:42+0100\n" -"PO-Revision-Date: 2021-07-14 15:12+0000\n" -"Last-Translator: Sebastian Ramacher <sebastian+...@ramacher.at>\n" +"POT-Creation-Date: 2022-09-10 11:35+0200\n" +"PO-Revision-Date: 2022-09-10 11:39+0200\n" +"Last-Translator: p <poczciw...@gmail.com>, 2012\n" "Language-Team: Polish (http://www.transifex.com/pwmt/girara/language/pl/)\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=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n" -"%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n" -"%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && " +"(n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && " +"n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" #: girara/commands.c:111 girara/commands.c:311 #, c-format @@ -229,11 +229,16 @@ msgid "Dump settings to a file" msgstr "" -#: girara/settings.c:251 +#: girara/settings.c:292 #, c-format msgid "Invalid number of arguments passed: %zu instead of 1" msgstr "" +#: girara/settings.c:313 +#, c-format +msgid "Failed to write JSON: %s" +msgstr "" + #: girara/utils.c:473 #, c-format msgid "Failed to execute command: %s" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.7/po/pt_BR.po new/girara-0.3.9/po/pt_BR.po --- old/girara-0.3.7/po/pt_BR.po 2022-02-13 19:11:34.000000000 +0100 +++ new/girara-0.3.9/po/pt_BR.po 2023-01-15 16:58:16.000000000 +0100 @@ -9,16 +9,17 @@ msgstr "" "Project-Id-Version: girara\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-06 14:42+0100\n" -"PO-Revision-Date: 2021-07-14 15:12+0000\n" -"Last-Translator: Sebastian Ramacher <sebastian+...@ramacher.at>\n" +"POT-Creation-Date: 2022-09-10 11:35+0200\n" +"PO-Revision-Date: 2022-09-10 11:40+0200\n" +"Last-Translator: Alexandro Casanova <shorterf...@gmail.com>, 2012-2014\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/pwmt/girara/" "language/pt_BR/)\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % " +"1000000 == 0 ? 1 : 2;\n" #: girara/commands.c:111 girara/commands.c:311 #, c-format @@ -231,11 +232,16 @@ msgid "Dump settings to a file" msgstr "" -#: girara/settings.c:251 +#: girara/settings.c:292 #, c-format msgid "Invalid number of arguments passed: %zu instead of 1" msgstr "" +#: girara/settings.c:313 +#, c-format +msgid "Failed to write JSON: %s" +msgstr "" + #: girara/utils.c:473 #, c-format msgid "Failed to execute command: %s" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.7/po/ru.po new/girara-0.3.9/po/ru.po --- old/girara-0.3.7/po/ru.po 2022-02-13 19:11:34.000000000 +0100 +++ new/girara-0.3.9/po/ru.po 2023-01-15 16:58:16.000000000 +0100 @@ -8,17 +8,17 @@ msgstr "" "Project-Id-Version: girara\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-06 14:42+0100\n" -"PO-Revision-Date: 2021-07-14 15:12+0000\n" -"Last-Translator: crt0r citrus\n" +"POT-Creation-Date: 2022-09-10 11:35+0200\n" +"PO-Revision-Date: 2022-09-10 11:40+0200\n" +"Last-Translator: Vladimir Lomov <irk.transla...@yandex.ru>, 2013,2015\n" "Language-Team: Russian (http://www.transifex.com/pwmt/girara/language/ru/)\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n" -"%100>=11 && n%100<=14)? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || " +"(n%100>=11 && n%100<=14)? 2 : 3);\n" #: girara/commands.c:111 girara/commands.c:311 #, c-format @@ -229,11 +229,16 @@ msgid "Dump settings to a file" msgstr "СкопиÑоваÑÑ Ð½Ð°ÑÑÑойки в Ñайл" -#: girara/settings.c:251 +#: girara/settings.c:292 #, c-format msgid "Invalid number of arguments passed: %zu instead of 1" msgstr "ÐеÑедано невеÑное колиÑеÑÑво аÑгÑменÑов: %zu вмеÑÑо как минимÑм 1" +#: girara/settings.c:313 +#, c-format +msgid "Failed to write JSON: %s" +msgstr "" + #: girara/utils.c:473 #, c-format msgid "Failed to execute command: %s" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.7/po/sv.po new/girara-0.3.9/po/sv.po --- old/girara-0.3.7/po/sv.po 2022-02-13 19:11:34.000000000 +0100 +++ new/girara-0.3.9/po/sv.po 2023-01-15 16:58:16.000000000 +0100 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: girara\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-06 14:42+0100\n" -"PO-Revision-Date: 2021-07-14 15:12+0000\n" +"POT-Creation-Date: 2022-09-10 11:35+0200\n" +"PO-Revision-Date: 2012-03-26 16:41+0000\n" "Last-Translator: Sebastian Ramacher <sebastian+...@ramacher.at>\n" "Language-Team: Swedish (http://www.transifex.com/pwmt/girara/language/sv/)\n" "Language: sv\n" @@ -225,11 +225,16 @@ msgid "Dump settings to a file" msgstr "" -#: girara/settings.c:251 +#: girara/settings.c:292 #, c-format msgid "Invalid number of arguments passed: %zu instead of 1" msgstr "" +#: girara/settings.c:313 +#, c-format +msgid "Failed to write JSON: %s" +msgstr "" + #: girara/utils.c:473 #, c-format msgid "Failed to execute command: %s" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.7/po/tr.po new/girara-0.3.9/po/tr.po --- old/girara-0.3.7/po/tr.po 2022-02-13 19:11:34.000000000 +0100 +++ new/girara-0.3.9/po/tr.po 2023-01-15 16:58:16.000000000 +0100 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: girara\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-06 14:42+0100\n" -"PO-Revision-Date: 2021-07-14 15:12+0000\n" +"POT-Creation-Date: 2022-09-10 11:35+0200\n" +"PO-Revision-Date: 2022-09-10 11:40+0200\n" "Last-Translator: Sebastian Ramacher <sebastian+...@ramacher.at>\n" "Language-Team: Turkish (http://www.transifex.com/pwmt/girara/language/tr/)\n" "Language: tr\n" @@ -232,11 +232,16 @@ msgid "Dump settings to a file" msgstr "" -#: girara/settings.c:251 +#: girara/settings.c:292 #, c-format msgid "Invalid number of arguments passed: %zu instead of 1" msgstr "" +#: girara/settings.c:313 +#, c-format +msgid "Failed to write JSON: %s" +msgstr "" + #: girara/utils.c:473 #, c-format msgid "Failed to execute command: %s" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.7/po/uk_UA.po new/girara-0.3.9/po/uk_UA.po --- old/girara-0.3.7/po/uk_UA.po 2022-02-13 19:11:34.000000000 +0100 +++ new/girara-0.3.9/po/uk_UA.po 2023-01-15 16:58:16.000000000 +0100 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: girara\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-06 14:42+0100\n" -"PO-Revision-Date: 2021-07-14 15:12+0000\n" +"POT-Creation-Date: 2022-09-10 11:35+0200\n" +"PO-Revision-Date: 2022-09-10 11:40+0200\n" "Last-Translator: ЮÑÑй ЯновÑÑкий <lytvyn...@ukr.net>\n" "Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/pwmt/girara/" "language/uk_UA/)\n" @@ -229,11 +229,16 @@ msgid "Dump settings to a file" msgstr "ÐбеÑегÑи налаÑÑÑÐ²Ð°Ð½Ð½Ñ Ñ Ñайл" -#: girara/settings.c:251 +#: girara/settings.c:292 #, c-format msgid "Invalid number of arguments passed: %zu instead of 1" msgstr "ÐепÑавилÑна кÑлÑкÑÑÑÑ Ð¿ÐµÑÐµÐ´Ð°Ð½Ð¸Ñ Ð°ÑгÑменÑÑв: %zu замÑÑÑÑ 1" +#: girara/settings.c:313 +#, c-format +msgid "Failed to write JSON: %s" +msgstr "" + #: girara/utils.c:473 #, c-format msgid "Failed to execute command: %s"