diff -Nru flatpak-0.8.3/app/flatpak-builtins-list.c flatpak-0.8.4/app/flatpak-builtins-list.c --- flatpak-0.8.3/app/flatpak-builtins-list.c 2017-02-14 10:13:28.000000000 +0000 +++ flatpak-0.8.4/app/flatpak-builtins-list.c 2017-03-10 09:17:20.000000000 +0000 @@ -325,13 +325,6 @@ if (system_dir == NULL) return FALSE; - if (system_dir == NULL) - { - g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, - "Can't find installation %s", installations[i]); - return FALSE; - } - if (!find_refs_for_dir (system_dir, app ? &installation_apps : NULL, runtime ? &installation_runtimes : NULL, cancellable, error)) return FALSE; diff -Nru flatpak-0.8.3/app/flatpak-builtins-list-remotes.c flatpak-0.8.4/app/flatpak-builtins-list-remotes.c --- flatpak-0.8.3/app/flatpak-builtins-list-remotes.c 2017-02-14 10:13:28.000000000 +0000 +++ flatpak-0.8.4/app/flatpak-builtins-list-remotes.c 2017-03-10 09:17:20.000000000 +0000 @@ -138,9 +138,10 @@ else flatpak_table_printer_add_column (printer, "-"); - ostree_repo_remote_get_url (flatpak_dir_get_repo (dir), remote_name, &remote_url, NULL); - - flatpak_table_printer_add_column (printer, remote_url); + if (ostree_repo_remote_get_url (flatpak_dir_get_repo (dir), remote_name, &remote_url, NULL)) + flatpak_table_printer_add_column (printer, remote_url); + else + flatpak_table_printer_add_column (printer, "-"); prio = flatpak_dir_get_remote_prio (dir, remote_name); prio_as_string = g_strdup_printf ("%d", prio); diff -Nru flatpak-0.8.3/app/flatpak-transaction.c flatpak-0.8.4/app/flatpak-transaction.c --- flatpak-0.8.3/app/flatpak-transaction.c 2017-02-14 09:49:43.000000000 +0000 +++ flatpak-0.8.4/app/flatpak-transaction.c 2017-03-10 09:17:20.000000000 +0000 @@ -106,7 +106,7 @@ } static gboolean -dir_ref_is_installed (FlatpakDir *dir, const char *ref, char **remote_out) +dir_ref_is_installed (FlatpakDir *dir, const char *ref, char **remote_out, GVariant **deploy_data_out) { g_autoptr(GVariant) deploy_data = NULL; @@ -116,6 +116,10 @@ if (remote_out) *remote_out = g_strdup (flatpak_deploy_data_get_origin (deploy_data)); + + if (deploy_data_out) + *deploy_data_out = g_variant_ref (deploy_data); + return TRUE; } @@ -417,7 +421,7 @@ else { /* Update if in same dir */ - if (dir_ref_is_installed (self->dir, full_runtime_ref, &runtime_remote)) + if (dir_ref_is_installed (self->dir, full_runtime_ref, &runtime_remote, NULL)) { FlatpakTransactionOp *op; g_debug ("Updating dependent runtime %s", full_runtime_ref); @@ -456,7 +460,7 @@ if (kind == FLATPAK_TRANSACTION_OP_KIND_UPDATE) { - if (!dir_ref_is_installed (self->dir, ref, &origin)) + if (!dir_ref_is_installed (self->dir, ref, &origin, NULL)) { g_set_error (error, FLATPAK_ERROR, FLATPAK_ERROR_NOT_INSTALLED, _("%s not installed"), pref); @@ -473,7 +477,7 @@ else if (kind == FLATPAK_TRANSACTION_OP_KIND_INSTALL) { g_assert (remote != NULL); - if (dir_ref_is_installed (self->dir, ref, NULL)) + if (dir_ref_is_installed (self->dir, ref, NULL, NULL)) { g_set_error (error, FLATPAK_ERROR, FLATPAK_ERROR_ALREADY_INSTALLED, _("%s already installed"), pref); @@ -671,8 +675,25 @@ kind = op->kind; if (kind == FLATPAK_TRANSACTION_OP_KIND_INSTALL_OR_UPDATE) { - if (dir_ref_is_installed (self->dir, op->ref, NULL)) - kind = FLATPAK_TRANSACTION_OP_KIND_UPDATE; + g_autoptr(GVariant) deploy_data = NULL; + + if (dir_ref_is_installed (self->dir, op->ref, NULL, &deploy_data)) + { + g_autofree const char **current_subpaths = NULL; + + /* When we update a dependency, we always inherit the subpaths + rather than use the default. */ + g_strfreev (op->subpaths); + current_subpaths = flatpak_deploy_data_get_subpaths (deploy_data); + op->subpaths = g_strdupv ((char **)current_subpaths); + + /* Don't use the remote from related ref on update, always use + the current remote. */ + g_free (op->remote); + op->remote = g_strdup (flatpak_deploy_data_get_origin (deploy_data)); + + kind = FLATPAK_TRANSACTION_OP_KIND_UPDATE; + } else kind = FLATPAK_TRANSACTION_OP_KIND_INSTALL; } diff -Nru flatpak-0.8.3/common/flatpak-dir.c flatpak-0.8.4/common/flatpak-dir.c --- flatpak-0.8.3/common/flatpak-dir.c 2017-02-14 10:14:38.000000000 +0000 +++ flatpak-0.8.4/common/flatpak-dir.c 2017-03-10 09:20:21.000000000 +0000 @@ -354,8 +354,7 @@ keyfile = g_key_file_new (); - g_key_file_load_from_file (keyfile, file_path, G_KEY_FILE_NONE, &my_error); - if (my_error != NULL) + if (!g_key_file_load_from_file (keyfile, file_path, G_KEY_FILE_NONE, &my_error)) { g_debug ("Could not get list of system installations: %s\n", my_error->message); g_propagate_error (error, g_steal_pointer (&my_error)); @@ -1792,26 +1791,18 @@ } static gboolean -flatpak_dir_pull_extra_data (FlatpakDir *self, - OstreeRepo *repo, - const char *repository, - const char *ref, - const char *rev, - FlatpakPullFlags flatpak_flags, - OstreeAsyncProgress *progress, - GCancellable *cancellable, - GError **error) +flatpak_dir_setup_extra_data (FlatpakDir *self, + OstreeRepo *repo, + const char *rev, + FlatpakPullFlags flatpak_flags, + OstreeAsyncProgress *progress, + GCancellable *cancellable, + GError **error) { g_autoptr(GVariant) extra_data_sources = NULL; - g_autoptr(GVariant) detached_metadata = NULL; - g_auto(GVariantDict) new_metadata_dict = FLATPAK_VARIANT_DICT_INITIALIZER; - g_autoptr(GVariantBuilder) extra_data_builder = NULL; - g_autoptr(GVariant) new_detached_metadata = NULL; - g_autoptr(GVariant) extra_data = NULL; int i; gsize n_extra_data; guint64 total_download_size; - ExtraDataProgress extra_data_progress = { NULL }; extra_data_sources = flatpak_repo_get_extra_data_sources (repo, rev, cancellable, NULL); if (extra_data_sources == NULL) @@ -1824,8 +1815,6 @@ if ((flatpak_flags & FLATPAK_PULL_FLAGS_DOWNLOAD_EXTRA_DATA) == 0) return flatpak_fail (error, "extra data not supported for non-gpg-verified local system installs"); - extra_data_builder = g_variant_builder_new (G_VARIANT_TYPE ("a(ayay)")); - total_download_size = 0; for (i = 0; i < n_extra_data; i++) { @@ -1843,13 +1832,53 @@ if (progress) { - ostree_async_progress_set_uint64 (progress, "start-time-extra-data", g_get_monotonic_time ()); ostree_async_progress_set_uint (progress, "outstanding-extra-data", n_extra_data); ostree_async_progress_set_uint (progress, "total-extra-data", n_extra_data); ostree_async_progress_set_uint64 (progress, "total-extra-data-bytes", total_download_size); ostree_async_progress_set_uint64 (progress, "transferred-extra-data-bytes", 0); } + return TRUE; +} + +static gboolean +flatpak_dir_pull_extra_data (FlatpakDir *self, + OstreeRepo *repo, + const char *repository, + const char *ref, + const char *rev, + FlatpakPullFlags flatpak_flags, + OstreeAsyncProgress *progress, + GCancellable *cancellable, + GError **error) +{ + g_autoptr(GVariant) extra_data_sources = NULL; + g_autoptr(GVariant) detached_metadata = NULL; + g_auto(GVariantDict) new_metadata_dict = FLATPAK_VARIANT_DICT_INITIALIZER; + g_autoptr(GVariantBuilder) extra_data_builder = NULL; + g_autoptr(GVariant) new_detached_metadata = NULL; + g_autoptr(GVariant) extra_data = NULL; + int i; + gsize n_extra_data; + ExtraDataProgress extra_data_progress = { NULL }; + + extra_data_sources = flatpak_repo_get_extra_data_sources (repo, rev, cancellable, NULL); + if (extra_data_sources == NULL) + return TRUE; + + n_extra_data = g_variant_n_children (extra_data_sources); + if (n_extra_data == 0) + return TRUE; + + if ((flatpak_flags & FLATPAK_PULL_FLAGS_DOWNLOAD_EXTRA_DATA) == 0) + return flatpak_fail (error, "extra data not supported for non-gpg-verified local system installs"); + + extra_data_builder = g_variant_builder_new (G_VARIANT_TYPE ("a(ayay)")); + + /* Other fields were already set in flatpak_dir_setup_extra_data() */ + if (progress) + ostree_async_progress_set_uint64 (progress, "start-time-extra-data", g_get_monotonic_time ()); + extra_data_progress.progress = progress; for (i = 0; i < n_extra_data; i++) @@ -2100,6 +2129,15 @@ /* Past this we must use goto out, so we clean up console and abort the transaction on error */ + /* Setup extra data information before starting to pull, so we can have precise + * progress reports */ + if (!flatpak_dir_setup_extra_data (self, repo, rev, + flatpak_flags, + progress, + cancellable, + error)) + goto out; + if (subpaths != NULL && subpaths[0] != NULL) { subdirs_arg = g_ptr_array_new_with_free_func (g_free); @@ -3638,24 +3676,31 @@ if (runtime_ref_parts == NULL) return FALSE; - runtime_deploy = flatpak_find_deploy_for_ref (runtime_ref, cancellable, error); - if (runtime_deploy == NULL) - return FALSE; + if (!g_key_file_get_boolean (metakey, "Extra Data", "NoRuntime", NULL)) + { + runtime_deploy = flatpak_find_deploy_for_ref (runtime_ref, cancellable, error); + if (runtime_deploy == NULL) + return FALSE; + runtime_files = flatpak_deploy_get_files (runtime_deploy); + } app_files = g_file_get_child (checkoutdir, "files"); app_export_file = g_file_get_child (checkoutdir, "export"); extra_files = g_file_get_child (app_files, "extra"); extra_export_file = g_file_get_child (extra_files, "export"); - runtime_files = flatpak_deploy_get_files (runtime_deploy); argv_array = g_ptr_array_new_with_free_func (g_free); fd_array = g_array_new (FALSE, TRUE, sizeof (int)); g_array_set_clear_func (fd_array, clear_fd); g_ptr_array_add (argv_array, g_strdup (flatpak_get_bwrap ())); - add_args (argv_array, - "--ro-bind", flatpak_file_get_path_cached (runtime_files), "/usr", + if (runtime_files) + add_args (argv_array, + "--ro-bind", flatpak_file_get_path_cached (runtime_files), "/usr", "--lock-file", "/usr/.ref", + NULL); + + add_args (argv_array, "--ro-bind", flatpak_file_get_path_cached (app_files), "/app", "--bind", flatpak_file_get_path_cached (extra_files), "/app/extra", "--chdir", "/app/extra", @@ -4909,7 +4954,8 @@ if (repository != NULL && g_str_has_suffix (repository, "-origin") && - flatpak_dir_get_remote_noenumerate (self, repository)) + flatpak_dir_get_remote_noenumerate (self, repository) && + !flatpak_dir_remote_has_deploys (self, repository)) ostree_repo_remote_delete (self->repo, repository, NULL, NULL); if (!keep_ref) @@ -6384,6 +6430,31 @@ } return FALSE; +} + +gboolean +flatpak_dir_remote_has_deploys (FlatpakDir *self, + const char *remote) +{ + g_autoptr(GHashTable) refs = NULL; + GHashTableIter hash_iter; + gpointer key; + + refs = flatpak_dir_get_all_installed_refs (self, FLATPAK_KINDS_APP | FLATPAK_KINDS_RUNTIME, NULL); + if (refs == NULL) + return FALSE; + + g_hash_table_iter_init (&hash_iter, refs); + while (g_hash_table_iter_next (&hash_iter, &key, NULL)) + { + const char *ref = (const char *)key; + g_autofree char *origin = flatpak_dir_get_origin (self, ref, NULL, NULL); + + if (strcmp (remote, origin) == 0) + return TRUE; + } + + return FALSE; } gint diff -Nru flatpak-0.8.3/common/flatpak-dir.h flatpak-0.8.4/common/flatpak-dir.h --- flatpak-0.8.3/common/flatpak-dir.h 2017-02-10 15:13:02.000000000 +0000 +++ flatpak-0.8.4/common/flatpak-dir.h 2017-03-10 09:17:20.000000000 +0000 @@ -451,6 +451,8 @@ GHashTable *hash, GCancellable *cancellable, GError **error); +gboolean flatpak_dir_remote_has_deploys (FlatpakDir *self, + const char *remote); char *flatpak_dir_create_origin_remote (FlatpakDir *self, const char *url, const char *id, diff -Nru flatpak-0.8.3/common/flatpak-run.c flatpak-0.8.4/common/flatpak-run.c --- flatpak-0.8.3/common/flatpak-run.c 2017-02-14 10:13:28.000000000 +0000 +++ flatpak-0.8.4/common/flatpak-run.c 2017-03-10 09:17:20.000000000 +0000 @@ -1745,6 +1745,26 @@ return au_len == strlen (str) && memcmp (str, au_str, au_len) == 0; } +static gboolean +xauth_entry_should_propagate (Xauth *xa, + char *hostname, + char *number) +{ + /* ensure entry isn't for remote access */ + if (xa->family != FamilyLocal && xa->family != FamilyWild) + return FALSE; + + /* ensure entry is for this machine */ + if (xa->family == FamilyLocal && !auth_streq (hostname, xa->address, xa->address_length)) + return FALSE; + + /* ensure entry is for this session */ + if (xa->number != NULL && !auth_streq (number, xa->number, xa->number_length)) + return FALSE; + + return TRUE; +} + static void write_xauth (char *number, FILE *output) { @@ -1769,9 +1789,7 @@ xa = XauReadAuth (f); if (xa == NULL) break; - if (xa->family == FamilyLocal && - auth_streq (unames.nodename, xa->address, xa->address_length) && - (xa->number == NULL || auth_streq (number, xa->number, xa->number_length))) + if (xauth_entry_should_propagate (xa, unames.nodename, number)) { local_xa = *xa; if (local_xa.number) @@ -2358,10 +2376,12 @@ if (!path_is_visible (keys, n_keys, hash_table, path)) { g_autofree char *resolved = flatpak_resolve_link (path, NULL); - g_autofree char *parent = g_path_get_dirname (path); - g_autofree char *relative = make_relative (parent, resolved); if (resolved) - add_args (argv_array, "--symlink", relative, path, NULL); + { + g_autofree char *parent = g_path_get_dirname (path); + g_autofree char *relative = make_relative (parent, resolved); + add_args (argv_array, "--symlink", relative, path, NULL); + } } } else if (ep->mode == FAKE_MODE_HIDDEN) @@ -3060,7 +3080,7 @@ if (!g_file_test (path, G_FILE_TEST_EXISTS)) return flatpak_fail (error, - "No systemd user session available, sandboxing not available"); + "No systemd user session available, cgroups not available"); main_context = g_main_context_new (); main_loop = g_main_loop_new (main_context, FALSE); @@ -3940,18 +3960,21 @@ else if (g_file_test ("/var/lib/dbus/machine-id", G_FILE_TEST_EXISTS)) add_args (argv_array, "--ro-bind", "/var/lib/dbus/machine-id", "/etc/machine-id", NULL); - etc = g_file_get_child (runtime_files, "etc"); - if ((flags & FLATPAK_RUN_FLAG_WRITABLE_ETC) == 0 && + if (runtime_files) + etc = g_file_get_child (runtime_files, "etc"); + if (etc != NULL && + (flags & FLATPAK_RUN_FLAG_WRITABLE_ETC) == 0 && g_file_query_exists (etc, NULL)) { g_auto(GLnxDirFdIterator) dfd_iter = { 0, }; struct dirent *dent; char path_buffer[PATH_MAX + 1]; ssize_t symlink_size; + gboolean inited; - glnx_dirfd_iterator_init_at (AT_FDCWD, flatpak_file_get_path_cached (etc), FALSE, &dfd_iter, NULL); + inited = glnx_dirfd_iterator_init_at (AT_FDCWD, flatpak_file_get_path_cached (etc), FALSE, &dfd_iter, NULL); - while (TRUE) + while (inited) { g_autofree char *src = NULL; g_autofree char *dest = NULL; @@ -4002,7 +4025,7 @@ NULL); } - for (i = 0; i < G_N_ELEMENTS (usr_links); i++) + for (i = 0; runtime_files != NULL && i < G_N_ELEMENTS (usr_links); i++) { const char *subdir = usr_links[i]; g_autoptr(GFile) runtime_subdir = g_file_get_child (runtime_files, subdir); diff -Nru flatpak-0.8.3/common/flatpak-utils.c flatpak-0.8.4/common/flatpak-utils.c --- flatpak-0.8.3/common/flatpak-utils.c 2017-02-14 10:14:41.000000000 +0000 +++ flatpak-0.8.4/common/flatpak-utils.c 2017-03-10 09:20:18.000000000 +0000 @@ -1058,8 +1058,6 @@ /* Reference found in at least one of the system installations */ break; } - - goto out; } } @@ -2129,10 +2127,11 @@ if (S_ISDIR (stbuf.st_mode)) { g_auto(GLnxDirFdIterator) dfd_iter = { 0, }; + gboolean inited; - glnx_dirfd_iterator_init_at (parent_dfd, rel_path, FALSE, &dfd_iter, NULL); + inited = glnx_dirfd_iterator_init_at (parent_dfd, rel_path, FALSE, &dfd_iter, NULL); - while (TRUE) + while (inited) { struct dirent *dent; @@ -2910,7 +2909,7 @@ { g_autoptr(GVariant) dirmeta = NULL; g_autoptr(GFileInfo) file_info = g_file_info_new (); - g_autofree guchar *csum; + g_autofree guchar *csum = NULL; g_autofree char *checksum = NULL; g_file_info_set_name (file_info, "/"); @@ -2993,7 +2992,7 @@ bundle->attribute_values[0] = g_strdup ("flatpak"); i = 1; - if (runtime) + if (runtime && !g_str_has_prefix (runtime, "runtime/")) { bundle->attribute_names[i] = g_strdup ("runtime"); bundle->attribute_values[i] = g_strdup (runtime); @@ -3577,13 +3576,97 @@ return FALSE; } +static GList * +add_extension (GKeyFile *metakey, + const char *group, + const char *extension, + const char *arch, + const char *branch, + GList *res) +{ + FlatpakExtension *ext; + g_autofree char *directory = g_key_file_get_string (metakey, group, "directory", NULL); + g_autofree char *add_ld_path = g_key_file_get_string (metakey, group, "add-ld-path", NULL); + g_auto(GStrv) merge_dirs = g_key_file_get_string_list (metakey, group, "merge-dirs", NULL, NULL); + g_autofree char *enable_if = g_key_file_get_string (metakey, group, "enable-if", NULL); + g_autofree char *subdir_suffix = g_key_file_get_string (metakey, group, "subdirectory-suffix", NULL); + g_autofree char *ref = NULL; + gboolean is_unmaintained = FALSE; + g_autoptr(GFile) files = NULL; + + if (directory == NULL) + return res; + + ref = g_build_filename ("runtime", extension, arch, branch, NULL); + + files = flatpak_find_unmaintained_extension_dir_if_exists (extension, arch, branch, NULL); + + if (files == NULL) + files = flatpak_find_files_dir_for_ref (ref, NULL, NULL); + else + is_unmaintained = TRUE; + + /* Prefer a full extension (org.freedesktop.Locale) over subdirectory ones (org.freedesktop.Locale.sv) */ + if (files != NULL) + { + if (flatpak_extension_matches_reason (extension, enable_if, TRUE)) + { + ext = flatpak_extension_new (extension, extension, ref, directory, add_ld_path, subdir_suffix, merge_dirs, files, is_unmaintained); + res = g_list_prepend (res, ext); + } + } + else if (g_key_file_get_boolean (metakey, group, + "subdirectories", NULL)) + { + g_autofree char *prefix = g_strconcat (extension, ".", NULL); + g_auto(GStrv) refs = NULL; + g_auto(GStrv) unmaintained_refs = NULL; + int j; + + refs = flatpak_list_deployed_refs ("runtime", prefix, arch, branch, + NULL, NULL); + for (j = 0; refs != NULL && refs[j] != NULL; j++) + { + g_autofree char *extended_dir = g_build_filename (directory, refs[j] + strlen (prefix), NULL); + g_autofree char *dir_ref = g_build_filename ("runtime", refs[j], arch, branch, NULL); + g_autoptr(GFile) subdir_files = flatpak_find_files_dir_for_ref (dir_ref, NULL, NULL); + + if (subdir_files && flatpak_extension_matches_reason (refs[j], enable_if, TRUE)) + { + ext = flatpak_extension_new (extension, refs[j], dir_ref, extended_dir, add_ld_path, subdir_suffix, merge_dirs, subdir_files, FALSE); + ext->needs_tmpfs = TRUE; + res = g_list_prepend (res, ext); + } + } + + unmaintained_refs = flatpak_list_unmaintained_refs (prefix, arch, branch, + NULL, NULL); + for (j = 0; unmaintained_refs != NULL && unmaintained_refs[j] != NULL; j++) + { + g_autofree char *extended_dir = g_build_filename (directory, unmaintained_refs[j] + strlen (prefix), NULL); + g_autofree char *dir_ref = g_build_filename ("runtime", unmaintained_refs[j], arch, branch, NULL); + g_autoptr(GFile) subdir_files = flatpak_find_unmaintained_extension_dir_if_exists (unmaintained_refs[j], arch, branch, NULL); + + if (subdir_files && flatpak_extension_matches_reason (unmaintained_refs[j], enable_if, TRUE)) + { + ext = flatpak_extension_new (extension, unmaintained_refs[j], dir_ref, extended_dir, add_ld_path, subdir_suffix, merge_dirs, subdir_files, TRUE); + ext->needs_tmpfs = TRUE; + res = g_list_prepend (res, ext); + } + } + } + + return res; +} + + GList * flatpak_list_extensions (GKeyFile *metakey, const char *arch, const char *default_branch) { g_auto(GStrv) groups = NULL; - int i; + int i, j; GList *res; res = NULL; @@ -3594,89 +3677,27 @@ groups = g_key_file_get_groups (metakey, NULL); for (i = 0; groups[i] != NULL; i++) { - FlatpakExtension *ext; char *extension; if (g_str_has_prefix (groups[i], "Extension ") && *(extension = (groups[i] + strlen ("Extension "))) != 0) { - g_autofree char *directory = g_key_file_get_string (metakey, groups[i], "directory", NULL); g_autofree char *version = g_key_file_get_string (metakey, groups[i], "version", NULL); - g_autofree char *add_ld_path = g_key_file_get_string (metakey, groups[i], "add-ld-path", NULL); - g_auto(GStrv) merge_dirs = g_key_file_get_string_list (metakey, groups[i], "merge-dirs", NULL, NULL); - g_autofree char *enable_if = g_key_file_get_string (metakey, groups[i], "enable-if", NULL); - g_autofree char *subdir_suffix = g_key_file_get_string (metakey, groups[i], "subdirectory-suffix", NULL); - g_autofree char *ref = NULL; - const char *branch; - gboolean is_unmaintained = FALSE; - g_autoptr(GFile) files = NULL; - - if (directory == NULL) - continue; + g_auto(GStrv) versions = g_key_file_get_string_list (metakey, groups[i], "versions", NULL, NULL); + const char *default_branches[] = { default_branch, NULL}; + const char **branches; - if (version) - branch = version; + if (versions) + branches = (const char **)versions; else - branch = default_branch; - - ref = g_build_filename ("runtime", extension, arch, branch, NULL); - - files = flatpak_find_unmaintained_extension_dir_if_exists (extension, arch, branch, NULL); - - if (files == NULL) - files = flatpak_find_files_dir_for_ref (ref, NULL, NULL); - else - is_unmaintained = TRUE; - - /* Prefer a full extension (org.freedesktop.Locale) over subdirectory ones (org.freedesktop.Locale.sv) */ - if (files != NULL) { - if (flatpak_extension_matches_reason (extension, enable_if, TRUE)) - { - ext = flatpak_extension_new (extension, extension, ref, directory, add_ld_path, subdir_suffix, merge_dirs, files, is_unmaintained); - res = g_list_prepend (res, ext); - } + if (version) + default_branches[0] = version; + branches = default_branches; } - else if (g_key_file_get_boolean (metakey, groups[i], - "subdirectories", NULL)) - { - g_autofree char *prefix = g_strconcat (extension, ".", NULL); - g_auto(GStrv) refs = NULL; - g_auto(GStrv) unmaintained_refs = NULL; - int j; - - refs = flatpak_list_deployed_refs ("runtime", prefix, arch, branch, - NULL, NULL); - for (j = 0; refs != NULL && refs[j] != NULL; j++) - { - g_autofree char *extended_dir = g_build_filename (directory, refs[j] + strlen (prefix), NULL); - g_autofree char *dir_ref = g_build_filename ("runtime", refs[j], arch, branch, NULL); - g_autoptr(GFile) subdir_files = flatpak_find_files_dir_for_ref (dir_ref, NULL, NULL); - - if (subdir_files && flatpak_extension_matches_reason (refs[j], enable_if, TRUE)) - { - ext = flatpak_extension_new (extension, refs[j], dir_ref, extended_dir, add_ld_path, subdir_suffix, merge_dirs, subdir_files, FALSE); - ext->needs_tmpfs = TRUE; - res = g_list_prepend (res, ext); - } - } - unmaintained_refs = flatpak_list_unmaintained_refs (prefix, arch, branch, - NULL, NULL); - for (j = 0; unmaintained_refs != NULL && unmaintained_refs[j] != NULL; j++) - { - g_autofree char *extended_dir = g_build_filename (directory, unmaintained_refs[j] + strlen (prefix), NULL); - g_autofree char *dir_ref = g_build_filename ("runtime", unmaintained_refs[j], arch, branch, NULL); - g_autoptr(GFile) subdir_files = flatpak_find_unmaintained_extension_dir_if_exists (unmaintained_refs[j], arch, branch, NULL); - - if (subdir_files && flatpak_extension_matches_reason (unmaintained_refs[j], enable_if, TRUE)) - { - ext = flatpak_extension_new (extension, unmaintained_refs[j], dir_ref, extended_dir, add_ld_path, subdir_suffix, merge_dirs, subdir_files, TRUE); - ext->needs_tmpfs = TRUE; - res = g_list_prepend (res, ext); - } - } - } + for (j = 0; branches[j] != NULL; j++) + res = add_extension (metakey, groups[i], extension, arch, branches[j], res); } } @@ -4076,7 +4097,7 @@ if (app_metadata != NULL) { if (!g_variant_lookup (metadata, "metadata", "s", app_metadata)) - *runtime_repo = NULL; + *app_metadata = NULL; } if (gpg_keys != NULL) diff -Nru flatpak-0.8.3/configure flatpak-0.8.4/configure --- flatpak-0.8.3/configure 2017-02-14 10:16:22.000000000 +0000 +++ flatpak-0.8.4/configure 2017-03-10 09:43:51.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Flatpak 0.8.3. +# Generated by GNU Autoconf 2.69 for Flatpak 0.8.4. # # Report bugs to . # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='Flatpak' PACKAGE_TARNAME='flatpak' -PACKAGE_VERSION='0.8.3' -PACKAGE_STRING='Flatpak 0.8.3' +PACKAGE_VERSION='0.8.4' +PACKAGE_STRING='Flatpak 0.8.4' PACKAGE_BUGREPORT='https://github.com/flatpak/flatpak/issues' PACKAGE_URL='http://flatpak.org/' @@ -1493,7 +1493,7 @@ # 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 Flatpak 0.8.3 to adapt to many kinds of systems. +\`configure' configures Flatpak 0.8.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1563,7 +1563,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Flatpak 0.8.3:";; + short | recursive ) echo "Configuration of Flatpak 0.8.4:";; esac cat <<\_ACEOF @@ -1771,7 +1771,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Flatpak configure 0.8.3 +Flatpak configure 0.8.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2140,7 +2140,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Flatpak $as_me 0.8.3, which was +It was created by Flatpak $as_me 0.8.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -12687,7 +12687,7 @@ # Define the identity of the package. PACKAGE='flatpak' - VERSION='0.8.3' + VERSION='0.8.4' # Some tools Automake needs. @@ -17727,9 +17727,9 @@ FLATPAK_MAJOR_VERSION=0 FLATPAK_MINOR_VERSION=8 -FLATPAK_MICRO_VERSION=3 -FLATPAK_INTERFACE_AGE=3 -FLATPAK_VERSION=0.8.3 +FLATPAK_MICRO_VERSION=4 +FLATPAK_INTERFACE_AGE=4 +FLATPAK_VERSION=0.8.4 @@ -17761,7 +17761,7 @@ -LT_VERSION_INFO="800:3:800" +LT_VERSION_INFO="800:4:800" LT_CURRENT_MINUS_AGE=0 @@ -18370,7 +18370,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Flatpak $as_me 0.8.3, which was +This file was extended by Flatpak $as_me 0.8.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18437,7 +18437,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Flatpak config.status 0.8.3 +Flatpak config.status 0.8.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru flatpak-0.8.3/configure.ac flatpak-0.8.4/configure.ac --- flatpak-0.8.3/configure.ac 2017-02-14 10:15:55.000000000 +0000 +++ flatpak-0.8.4/configure.ac 2017-03-10 09:43:27.000000000 +0000 @@ -15,8 +15,8 @@ m4_define([flatpak_major_version], [0]) m4_define([flatpak_minor_version], [8]) -m4_define([flatpak_micro_version], [3]) -m4_define([flatpak_interface_age], [3]) +m4_define([flatpak_micro_version], [4]) +m4_define([flatpak_interface_age], [4]) m4_define([flatpak_binary_age], [m4_eval(10000 * flatpak_major_version + 100 * flatpak_minor_version + flatpak_micro_version)]) m4_define([flatpak_version], diff -Nru flatpak-0.8.3/debian/changelog flatpak-0.8.4/debian/changelog --- flatpak-0.8.3/debian/changelog 2017-02-14 14:14:45.000000000 +0000 +++ flatpak-0.8.4/debian/changelog 2017-03-12 13:59:18.000000000 +0000 @@ -1,3 +1,46 @@ +flatpak (0.8.4-2) experimental; urgency=medium + + * Explicitly build-depend on automake. Otherwise, the aspcud resolver + used in experimental sometimes chooses automake1.11 as the best + solution to dh-autoreconf's dependency on automake | automaken, + causing FTBFS. + - Set the dependency to 1.14.1 since flatpak is known to build + successfully with that version in jessie-backports, whereas older + versions are not known to work. + + -- Simon McVittie Sun, 12 Mar 2017 13:59:18 +0000 + +flatpak (0.8.4-1) experimental; urgency=medium + + * New upstream bugfix release + - Don't add flatpak directories to XDG_DATA_DIRS if already present + - Do add flatpak directories to XDG_DATA_DIRS if it already has + a non-default value + - Improve progress estimates and reporting for UI frontends + - Fill in many missing options in man pages + - Support extensions that apply to multiple versions, particularly + useful for OpenGL drivers + - Support extensions that do not depend on any specific runtime, + particularly useful for proprietary OpenGL drivers packaged with + a static binary helper + - Various fixes for error checking and crashes + - Make flatpak_get_system_installations() return an array that owns + (takes responsibility for freeing) its contents. This is + technically an ABI break, but it makes this function consistent + with others that have a similar signature, and nothing in Debian + uses it yet. + - Disable spliced reads in the FUSE file system, which don't appear + to work + - Make FamilyWild xauth tokens available in the sandbox, not + just FamilyLocal + - Fix a misleading message on systems without systemd --user: + it now disables an optional feature without breaking sandboxing + * Add patch simplifying profile.d snippet + * Initially upload to experimental since this is relatively large + for a stable-branch release + + -- Simon McVittie Sat, 11 Mar 2017 13:00:05 +0000 + flatpak (0.8.3-1) unstable; urgency=medium * New upstream bugfix release diff -Nru flatpak-0.8.3/debian/control flatpak-0.8.4/debian/control --- flatpak-0.8.3/debian/control 2017-02-14 14:14:45.000000000 +0000 +++ flatpak-0.8.4/debian/control 2017-03-12 13:59:18.000000000 +0000 @@ -7,6 +7,7 @@ Simon McVittie , Build-Depends: attr, + automake (>= 1.14.1), bubblewrap (>= 0.1.5), ca-certificates, dbus, diff -Nru flatpak-0.8.3/debian/.gitignore flatpak-0.8.4/debian/.gitignore --- flatpak-0.8.3/debian/.gitignore 1970-01-01 00:00:00.000000000 +0000 +++ flatpak-0.8.4/debian/.gitignore 2017-03-12 13:59:18.000000000 +0000 @@ -0,0 +1,9 @@ +/*.debhelper +/*.substvars +/flatpak-builder/ +/flatpak-tests/ +/flatpak/ +/gir1.2-flatpak-1.0/ +/libflatpak-dev/ +/libflatpak-doc/ +/libflatpak0/ diff -Nru flatpak-0.8.3/debian/patches/Improve-and-simplify-profile-snippet.patch flatpak-0.8.4/debian/patches/Improve-and-simplify-profile-snippet.patch --- flatpak-0.8.3/debian/patches/Improve-and-simplify-profile-snippet.patch 1970-01-01 00:00:00.000000000 +0000 +++ flatpak-0.8.4/debian/patches/Improve-and-simplify-profile-snippet.patch 2017-03-12 13:59:18.000000000 +0000 @@ -0,0 +1,45 @@ +From: Simon McVittie +Date: Fri, 10 Mar 2017 20:01:49 +0000 +Subject: Improve and simplify profile snippet + +Avoid setting a temporary variable flatpak_dirs which, while not +exported to the environment, would still be defined as a +shell "parameter" (variable) in the login shell itself. + +Consistently put the Flatpak directories before other XDG_DATA_DIRS, +rather than putting them last if XDG_DATA_DIRS happens to be already +set. + +Expand XDG_DATA_HOME if necessary, rather than assuming it will +always be ~/.local/share. + +I don't know exactly which shells source profile.d, but it's possible +that one of them might only implement POSIX test syntax, so prefer +[ x = y ] over [ x == y ]. + +Fix some insufficient quoting that could have gone wrong if +XDG_DATA_DIRS somehow contained spaces. + +Signed-off-by: Simon McVittie +--- + profile/flatpak.sh.in | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/profile/flatpak.sh.in b/profile/flatpak.sh.in +index cc9c342..8b350e8 100644 +--- a/profile/flatpak.sh.in ++++ b/profile/flatpak.sh.in +@@ -1,11 +1,7 @@ + # @sysconfdir@/profile.d/flatpak.sh - set XDG_DATA_DIRS + +-flatpak_dirs=$HOME/.local/share/flatpak/exports/share/:@localstatedir@/lib/flatpak/exports/share/ +- +-if [ -z "${XDG_DATA_DIRS}" ]; then +- XDG_DATA_DIRS="$flatpak_dirs:/usr/local/share/:/usr/share/" +-elif [ "${XDG_DATA_DIRS#*flatpak}" == ${XDG_DATA_DIRS} ]; then +- XDG_DATA_DIRS="$XDG_DATA_DIRS:$flatpak_dirs" ++if [ "${XDG_DATA_DIRS#*flatpak}" = "${XDG_DATA_DIRS}" ]; then ++ XDG_DATA_DIRS="${XDG_DATA_HOME:-"$HOME/.local/share"}/flatpak/exports/share:@localstatedir@/lib/flatpak/exports/share:${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" + fi + + export XDG_DATA_DIRS diff -Nru flatpak-0.8.3/debian/patches/series flatpak-0.8.4/debian/patches/series --- flatpak-0.8.3/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ flatpak-0.8.4/debian/patches/series 2017-03-12 13:59:18.000000000 +0000 @@ -0,0 +1 @@ +Improve-and-simplify-profile-snippet.patch diff -Nru flatpak-0.8.3/doc/flatpak-build-export.xml flatpak-0.8.4/doc/flatpak-build-export.xml --- flatpak-0.8.3/doc/flatpak-build-export.xml 2017-02-10 15:13:02.000000000 +0000 +++ flatpak-0.8.4/doc/flatpak-build-export.xml 2017-03-10 09:19:52.000000000 +0000 @@ -185,6 +185,7 @@ + diff -Nru flatpak-0.8.3/doc/flatpak-build-finish.xml flatpak-0.8.4/doc/flatpak-build-finish.xml --- flatpak-0.8.3/doc/flatpak-build-finish.xml 2017-02-14 10:13:28.000000000 +0000 +++ flatpak-0.8.4/doc/flatpak-build-finish.xml 2017-03-10 09:19:52.000000000 +0000 @@ -209,6 +209,20 @@ + + + + Remove access to the specified subset of the filesystem from + the application. This overrides to the Context section from the + application metadata. + FILESYSTEM can be one of: home, host, xdg-desktop, xdg-documents, xdg-download + xdg-music, xdg-pictures, xdg-public-share, xdg-templates, xdg-videos, + an absolute path, or a homedir-relative path like ~/dir. + This option can be used multiple times. + + + + diff -Nru flatpak-0.8.3/doc/flatpak-build-update-repo.xml flatpak-0.8.4/doc/flatpak-build-update-repo.xml --- flatpak-0.8.3/doc/flatpak-build-update-repo.xml 2016-10-28 08:41:14.000000000 +0000 +++ flatpak-0.8.4/doc/flatpak-build-update-repo.xml 2017-03-10 09:19:52.000000000 +0000 @@ -78,6 +78,14 @@ + + + + A default branch for the repository, mainly for use in a UI. + + + + @@ -107,7 +115,7 @@ - Remove unreferences objects in repo. + Remove unreferenced objects in repo. diff -Nru flatpak-0.8.3/doc/flatpak-build.xml flatpak-0.8.4/doc/flatpak-build.xml --- flatpak-0.8.3/doc/flatpak-build.xml 2017-02-14 10:13:28.000000000 +0000 +++ flatpak-0.8.4/doc/flatpak-build.xml 2017-03-10 09:19:52.000000000 +0000 @@ -178,6 +178,38 @@ + + + + Allow access to a specific feature. This updates + the [Context] group in the metadata. + FEATURE must be one of: devel, multiarch. + This option can be used multiple times. + + The devel feature allows the application to + access certain syscalls such as ptrace(), and + perf_event_open(). + + The multiarch feature allows the application to + execute programs compiled for an ABI other than the one supported + natively by the system. For example, for the x86_64 + architecture, 32-bit x86 binaries will be allowed as + well. + + + + + + + + Disallow access to a specific feature. This updates + the [Context] group in the metadata. + FEATURE must be one of: devel, multiarch. + This option can be used multiple times. + + + + diff -Nru flatpak-0.8.3/doc/flatpak-document-export.xml flatpak-0.8.4/doc/flatpak-document-export.xml --- flatpak-0.8.3/doc/flatpak-document-export.xml 2016-10-28 08:41:14.000000000 +0000 +++ flatpak-0.8.4/doc/flatpak-document-export.xml 2017-03-10 09:19:52.000000000 +0000 @@ -70,6 +70,7 @@ + Don't reuse an existing document id @@ -79,6 +80,7 @@ + @@ -88,6 +90,7 @@ + @@ -99,6 +102,7 @@ + @@ -116,6 +120,7 @@ + @@ -132,6 +137,7 @@ + @@ -148,6 +154,7 @@ + diff -Nru flatpak-0.8.3/doc/flatpak-info.xml flatpak-0.8.4/doc/flatpak-info.xml --- flatpak-0.8.3/doc/flatpak-info.xml 2017-02-10 15:13:02.000000000 +0000 +++ flatpak-0.8.4/doc/flatpak-info.xml 2017-03-10 09:19:52.000000000 +0000 @@ -114,6 +114,14 @@ + + + + Query for this architecture. + + + + @@ -163,14 +171,8 @@ Examples - $ flatpak --user list + $ flatpak info org.gnome.Builder//master - -org.gnome.Builder -org.freedesktop.glxgears -org.gnome.MyApp -org.gnome.GEdit - diff -Nru flatpak-0.8.3/doc/flatpak-list.xml flatpak-0.8.4/doc/flatpak-list.xml --- flatpak-0.8.3/doc/flatpak-list.xml 2017-02-14 10:13:28.000000000 +0000 +++ flatpak-0.8.4/doc/flatpak-list.xml 2017-03-10 09:19:52.000000000 +0000 @@ -104,6 +104,7 @@ + diff -Nru flatpak-0.8.3/doc/flatpak-override.xml flatpak-0.8.4/doc/flatpak-override.xml --- flatpak-0.8.3/doc/flatpak-override.xml 2017-02-10 15:13:02.000000000 +0000 +++ flatpak-0.8.4/doc/flatpak-override.xml 2017-03-10 09:19:52.000000000 +0000 @@ -165,6 +165,38 @@ + + + + Allow access to a specific feature. This updates + the [Context] group in the metadata. + FEATURE must be one of: devel, multiarch. + This option can be used multiple times. + + The devel feature allows the application to + access certain syscalls such as ptrace(), and + perf_event_open(). + + The multiarch feature allows the application to + execute programs compiled for an ABI other than the one supported + natively by the system. For example, for the x86_64 + architecture, 32-bit x86 binaries will be allowed as + well. + + + + + + + + Disallow access to a specific feature. This updates + the [Context] group in the metadata. + FEATURE must be one of: devel, multiarch. + This option can be used multiple times. + + + + @@ -182,6 +214,20 @@ + + + + Remove access to the specified subset of the filesystem from + the application. This overrides to the Context section from the + application metadata. + FILESYSTEM can be one of: home, host, xdg-desktop, xdg-documents, xdg-download + xdg-music, xdg-pictures, xdg-public-share, xdg-templates, xdg-videos, + an absolute path, or a homedir-relative path like ~/dir. + This option can be used multiple times. + + + + @@ -232,7 +278,7 @@ This option can be used multiple times. -` + diff -Nru flatpak-0.8.3/doc/flatpak-remote-add.xml flatpak-0.8.4/doc/flatpak-remote-add.xml --- flatpak-0.8.3/doc/flatpak-remote-add.xml 2017-02-10 15:13:02.000000000 +0000 +++ flatpak-0.8.4/doc/flatpak-remote-add.xml 2017-03-10 09:19:52.000000000 +0000 @@ -180,7 +180,7 @@ - A default branch to for the remote, mainly for use in a UI. + A default branch for the remote, mainly for use in a UI. diff -Nru flatpak-0.8.3/doc/flatpak-remote-list.xml flatpak-0.8.4/doc/flatpak-remote-list.xml --- flatpak-0.8.3/doc/flatpak-remote-list.xml 2017-02-14 10:13:28.000000000 +0000 +++ flatpak-0.8.4/doc/flatpak-remote-list.xml 2017-03-10 09:19:52.000000000 +0000 @@ -92,6 +92,7 @@ + diff -Nru flatpak-0.8.3/doc/flatpak-run.xml flatpak-0.8.4/doc/flatpak-run.xml --- flatpak-0.8.3/doc/flatpak-run.xml 2017-02-10 15:13:02.000000000 +0000 +++ flatpak-0.8.4/doc/flatpak-run.xml 2017-03-10 09:19:52.000000000 +0000 @@ -239,7 +239,7 @@ Allow the application access to a subset of the filesystem. This overrides to the Context section from the application metadata. - FS can be one of: home, host, xdg-desktop, xdg-documents, xdg-download + FS can be one of: home, host, xdg-desktop, xdg-documents, xdg-download, xdg-music, xdg-pictures, xdg-public-share, xdg-templates, xdg-videos, xdg-run, xdg-config, xdg-cache, xdg-data, an absolute path, or a homedir-relative path like ~/dir or paths @@ -249,6 +249,20 @@ This option can be used multiple times. + + + + + + Remove access to the specified subset of the filesystem from + the application. This overrides to the Context section from the + application metadata. + FILESYSTEM can be one of: home, host, xdg-desktop, xdg-documents, xdg-download + xdg-music, xdg-pictures, xdg-public-share, xdg-templates, xdg-videos, + an absolute path, or a homedir-relative path like ~/dir. + This option can be used multiple times. + + diff -Nru flatpak-0.8.3/doc/reference/html/flatpak-Version-information.html flatpak-0.8.4/doc/reference/html/flatpak-Version-information.html --- flatpak-0.8.3/doc/reference/html/flatpak-Version-information.html 2017-02-14 10:24:24.000000000 +0000 +++ flatpak-0.8.4/doc/reference/html/flatpak-Version-information.html 2017-03-10 09:43:57.000000000 +0000 @@ -86,7 +86,7 @@

FLATPAK_MICRO_VERSION

-
#define FLATPAK_MICRO_VERSION (3)
+
#define FLATPAK_MICRO_VERSION (4)
 
diff -Nru flatpak-0.8.3/doc/reference/html/index.html flatpak-0.8.4/doc/reference/html/index.html --- flatpak-0.8.3/doc/reference/html/index.html 2017-02-14 10:24:24.000000000 +0000 +++ flatpak-0.8.4/doc/reference/html/index.html 2017-03-10 09:43:57.000000000 +0000 @@ -15,7 +15,7 @@

- For flatpak 0.8.3 + For flatpak 0.8.4

diff -Nru flatpak-0.8.3/document-portal/xdp-fuse.c flatpak-0.8.4/document-portal/xdp-fuse.c --- flatpak-0.8.3/document-portal/xdp-fuse.c 2017-02-14 10:14:44.000000000 +0000 +++ flatpak-0.8.4/document-portal/xdp-fuse.c 2017-02-27 10:44:44.000000000 +0000 @@ -2307,7 +2307,7 @@ gboolean xdp_fuse_init (GError **error) { - char *argv[] = { "xdp-fuse", "-osplice_write,splice_move,splice_read" }; + char *argv[] = { "xdp-fuse", "-osplice_write,splice_move", "-d" }; struct fuse_args args = FUSE_ARGS_INIT (G_N_ELEMENTS (argv), argv); struct stat st; const char *path; diff -Nru flatpak-0.8.3/lib/flatpak-installation.c flatpak-0.8.4/lib/flatpak-installation.c --- flatpak-0.8.3/lib/flatpak-installation.c 2017-02-14 10:14:38.000000000 +0000 +++ flatpak-0.8.4/lib/flatpak-installation.c 2017-03-10 09:20:27.000000000 +0000 @@ -182,7 +182,7 @@ * Lists the system installations according to the current configuration and current * availability (e.g. doesn't return a configured installation if not reachable). * - * Returns: (transfer full) (element-type FlatpakInstallation): an GPtrArray of + * Returns: (transfer container) (element-type FlatpakInstallation): an GPtrArray of * #FlatpakInstallation instances * * Since: 0.8 @@ -200,7 +200,7 @@ if (system_dirs == NULL) goto out; - installs = g_ptr_array_new (); + installs = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref); for (i = 0; i < system_dirs->len; i++) { g_autoptr(GError) local_error = NULL; @@ -844,7 +844,7 @@ } else { - g_debug ("Update: Failed to read remote %s: %s\n", + g_debug ("Update: Failed to read remote %s: %s", flatpak_remote_get_name (remote), local_error->message); } @@ -1097,6 +1097,30 @@ return metadata_contents; } +static inline guint +get_metadata_progress (guint metadata_fetched, + guint outstanding_metadata_fetches) +{ + guint total_metadata = metadata_fetched + outstanding_metadata_fetches; + + /* Defensive check */ + if (total_metadata == 0) + return 1; + + /* Below 5, there's still a high chance to overestimate the + * progress */ + if (total_metadata < 5) + return 1; + + return (guint) 10 * (metadata_fetched / (gdouble) total_metadata); +} + +static inline guint +get_write_progress (guint outstanding_writes) +{ + return (guint) (3 / (gdouble) outstanding_writes); +} + static void progress_cb (OstreeAsyncProgress *progress, gpointer user_data) { @@ -1122,6 +1146,17 @@ guint new_progress = 0; gboolean estimating = FALSE; + /* The heuristic here goes as follows: + * - If we have delta files, grow up to 45% + * - Else: + * - While fetching metadata, grow up to 10% + * - Then, while fetch the file objects, grow up to: + * - 45% if we have extra data to download + * - 90% otherwise + * - Writing the objects goes from 52% to 55%, or 97% to 100% + * - Extra data, if present, will go from 55% to 100% + */ + buf = g_string_new (""); status = ostree_async_progress_get_status (progress); @@ -1144,6 +1179,9 @@ if (status) { g_string_append (buf, status); + + /* The status is sent on error or when the pull is finished */ + new_progress = outstanding_extra_data ? 55 : 100; } else if (outstanding_fetches) { @@ -1168,7 +1206,12 @@ formatted_bytes_sec, formatted_bytes_transferred, formatted_total); - new_progress = (100 * bytes_transferred) / total_delta_part_size; + + /* When we have delta files, no metadata is fetched */ + if (outstanding_extra_data > 0) + new_progress = (52 * bytes_transferred) / total_delta_part_size; + else + new_progress = (97 * bytes_transferred) / total_delta_part_size; } else if (outstanding_metadata_fetches) { @@ -1176,18 +1219,25 @@ * Since its really hard to figure out early how much data there is we report 1% until * all objects are scanned. */ - new_progress = 1; estimating = TRUE; g_string_append_printf (buf, "Receiving metadata objects: %u/(estimating) %s/s %s", metadata_fetched, formatted_bytes_sec, formatted_bytes_transferred); + + /* Go up to 10% until the metadata is all fetched */ + new_progress = get_metadata_progress (metadata_fetched, outstanding_metadata_fetches); } else { - new_progress = (100 * fetched) / requested; g_string_append_printf (buf, "Receiving objects: %u%% (%u/%u) %s/s %s", (guint) ((((double) fetched) / requested) * 100), fetched, requested, formatted_bytes_sec, formatted_bytes_transferred); + + + if (outstanding_extra_data) + new_progress = 10 + (42 * (double) fetched) / requested; + else + new_progress = 10 + (87 * (double) fetched) / requested; } } else if (outstanding_extra_data) @@ -1204,14 +1254,20 @@ else formatted_bytes_sec = g_format_size (bytes_sec); - new_progress = (100 * transferred_extra_data_bytes) / total_extra_data_bytes; g_string_append_printf (buf, "Downloading extra data: %u%% (%lu/%lu) %s/s %s", (guint) ((((double) transferred_extra_data_bytes) / total_extra_data_bytes) * 100), transferred_extra_data_bytes, total_extra_data_bytes, formatted_bytes_sec, formatted_bytes_transferred); + + /* Once we reach here, at least 55% of the data was fetched */ + new_progress = 55 + (guint) (45 * ((double) transferred_extra_data_bytes) / total_extra_data_bytes); } else if (outstanding_writes) { g_string_append_printf (buf, "Writing objects: %u", outstanding_writes); + + /* Writing the objects advances 3% of progress */ + new_progress = outstanding_extra_data ? 52 : 97; + new_progress += get_write_progress (outstanding_writes); } else { @@ -1790,7 +1846,7 @@ return flatpak_remote_ref_new (ref, checksum, remote_name); g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, - "Reference %s doesn't exist in remote\n", ref); + "Reference %s doesn't exist in remote", ref); return NULL; } diff -Nru flatpak-0.8.3/lib/flatpak-version-macros.h flatpak-0.8.4/lib/flatpak-version-macros.h --- flatpak-0.8.3/lib/flatpak-version-macros.h 2017-02-14 10:16:24.000000000 +0000 +++ flatpak-0.8.4/lib/flatpak-version-macros.h 2017-03-10 09:43:54.000000000 +0000 @@ -27,7 +27,7 @@ #define FLATPAK_MAJOR_VERSION (0) #define FLATPAK_MINOR_VERSION (8) -#define FLATPAK_MICRO_VERSION (3) +#define FLATPAK_MICRO_VERSION (4) #define FLATPAK_CHECK_VERSION(major,minor,micro) \ (FLATPAK_MAJOR_VERSION > (major) || \ diff -Nru flatpak-0.8.3/NEWS flatpak-0.8.4/NEWS --- flatpak-0.8.3/NEWS 2017-02-14 10:15:18.000000000 +0000 +++ flatpak-0.8.4/NEWS 2017-03-10 09:35:30.000000000 +0000 @@ -1,3 +1,30 @@ +Major changes in 0.8.4 +====================== + +In addition to the regular list of bugfixes this stable release +include backports of one more feature required for making OpenGL work +well. Now extra-data using extensions (such as the nvidia driver) can +specify that it doesn't need a runtime to run its apply script. We use +this in the nvidia driver by making the script a static binary, which +lets us use the nvidia driver for multiple runtimes without requering +that a particular one is installed. We also support an extension point +supporting multiple versions, which will be use for sharing the +nvidia driver between different runtime versions. + +Additional fixes: + * Documentation fixes + * Crash fixes + * Fix xauth propagation in some cases + * Don't remove origin remotes on uninstall if some other app + is installed from it. + * Don't reset what locales are installed when updating a locale + extension + * Disable splice for the documentation portal as it seems + to be broken in fuse + * Append, don't override XDG_DATA_DIRS in profile script + * Fix progress reporting in libflatpak to go from 0 to + 100% once, merging the various phases. + Major changes in 0.8.3 ====================== Binary files /tmp/tmpu7qeol/Yf3MfDJ1cf/flatpak-0.8.3/po/de.gmo and /tmp/tmpu7qeol/jYLJXs2Rih/flatpak-0.8.4/po/de.gmo differ diff -Nru flatpak-0.8.3/po/de.po flatpak-0.8.4/po/de.po --- flatpak-0.8.3/po/de.po 2017-02-14 10:16:29.000000000 +0000 +++ flatpak-0.8.4/po/de.po 2017-03-10 09:43:57.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: flatpak master\n" "Report-Msgid-Bugs-To: https://github.com/flatpak/flatpak/issues\n" -"POT-Creation-Date: 2017-02-14 11:16+0100\n" +"POT-Creation-Date: 2017-03-10 10:43+0100\n" "PO-Revision-Date: 2016-09-23 01:16+0200\n" "Last-Translator: Benedikt M. Thoma \n" "Language-Team: German \n" @@ -141,7 +141,7 @@ #: app/flatpak-builtins-document-list.c:70 #: app/flatpak-builtins-document-unexport.c:67 app/flatpak-builtins-info.c:105 #: app/flatpak-builtins-install.c:251 app/flatpak-builtins-install.c:329 -#: app/flatpak-builtins-list.c:361 app/flatpak-builtins-list-remotes.c:65 +#: app/flatpak-builtins-list.c:354 app/flatpak-builtins-list-remotes.c:65 #: app/flatpak-builtins-ls-remote.c:80 app/flatpak-builtins-make-current.c:67 #: app/flatpak-builtins-override.c:66 msgid "Too many arguments" @@ -291,7 +291,7 @@ msgid "Missing '=' in bind mount option '%s'" msgstr "Fehlendes »=« in Bind-Mount-Option »%s«" -#: app/flatpak-builtins-build.c:258 common/flatpak-run.c:4321 +#: app/flatpak-builtins-build.c:258 common/flatpak-run.c:4344 msgid "Unable to start app" msgstr "Anwendung kann nicht gestartet werden" @@ -970,7 +970,7 @@ msgid "Arch to show" msgstr "Anzuzeigende Architektur" -#: app/flatpak-builtins-list.c:354 +#: app/flatpak-builtins-list.c:347 msgid " - List installed apps and/or runtimes" msgstr " - Installierte Anwendungen und/oder Laufzeiten auflisten" @@ -1171,7 +1171,7 @@ msgid "Must specify at least one REF" msgstr "" -#: app/flatpak-builtins-uninstall.c:129 app/flatpak-transaction.c:333 +#: app/flatpak-builtins-uninstall.c:129 app/flatpak-transaction.c:337 #, c-format msgid "Warning: Problem looking for related refs: %s\n" msgstr "Warnung: Problem bei der Suche nach zugehörigen Referenzen: %s\n" @@ -1434,315 +1434,315 @@ msgid "error:" msgstr "Fehler:" -#: app/flatpak-transaction.c:295 +#: app/flatpak-transaction.c:299 #, c-format msgid "Found in remote %s, do you want to install it?" msgstr "" -#: app/flatpak-transaction.c:300 +#: app/flatpak-transaction.c:304 msgid "Found in several remotes:\n" msgstr "" -#: app/flatpak-transaction.c:305 +#: app/flatpak-transaction.c:309 msgid "Which do you want to install (0 to abort)?" msgstr "" -#: app/flatpak-transaction.c:395 +#: app/flatpak-transaction.c:399 #, c-format msgid "Required runtime for %s (%s) is not installed, searching...\n" msgstr "" -#: app/flatpak-transaction.c:401 +#: app/flatpak-transaction.c:405 #, fuzzy, c-format msgid "The required runtime %s was not found in a configured remote.\n" msgstr "Eigenschaften einer konfigurierten entfernten Quelle verändern" -#: app/flatpak-transaction.c:462 common/flatpak-dir.c:979 -#: common/flatpak-dir.c:1236 common/flatpak-dir.c:1272 -#: common/flatpak-dir.c:1294 common/flatpak-dir.c:7639 -#: common/flatpak-utils.c:1116 +#: app/flatpak-transaction.c:466 common/flatpak-dir.c:978 +#: common/flatpak-dir.c:1235 common/flatpak-dir.c:1271 +#: common/flatpak-dir.c:1293 common/flatpak-dir.c:7710 +#: common/flatpak-utils.c:1114 #, c-format msgid "%s not installed" msgstr "%s ist nicht installiert" -#: app/flatpak-transaction.c:468 +#: app/flatpak-transaction.c:472 #, fuzzy, c-format msgid "Remote %s disabled, ignoring %s update" msgstr "Entfernte Quelle %s deaktiviert\n" -#: app/flatpak-transaction.c:479 +#: app/flatpak-transaction.c:483 #, fuzzy, c-format msgid "%s already installed" msgstr "%s Zweig %s wurde bereits installiert" -#: app/flatpak-transaction.c:523 +#: app/flatpak-transaction.c:527 #, c-format msgid "%s needs a later flatpak version (%s)" msgstr "" -#: app/flatpak-transaction.c:616 common/flatpak-dir.c:1999 +#: app/flatpak-transaction.c:620 common/flatpak-dir.c:2028 msgid "OCI image is not a flatpak (missing ref)" msgstr "" -#: app/flatpak-transaction.c:684 +#: app/flatpak-transaction.c:705 #, fuzzy msgid "install" msgstr "Anwendung deinstallieren" -#: app/flatpak-transaction.c:685 +#: app/flatpak-transaction.c:706 #, fuzzy, c-format msgid "Installing: %s from %s\n" msgstr "Zugehörige werden installiert: %s\n" -#: app/flatpak-transaction.c:696 +#: app/flatpak-transaction.c:717 #, fuzzy msgid "update" msgstr "Keine Aktualisierungen.\n" -#: app/flatpak-transaction.c:697 +#: app/flatpak-transaction.c:718 #, fuzzy, c-format msgid "Updating: %s from %s\n" msgstr "Zugehörige werden aktualisiert: %s\n" -#: app/flatpak-transaction.c:712 +#: app/flatpak-transaction.c:733 #, c-format msgid "Now at %s.\n" msgstr "Jetzt bei %s.\n" -#: app/flatpak-transaction.c:718 +#: app/flatpak-transaction.c:739 msgid "No updates.\n" msgstr "Keine Aktualisierungen.\n" -#: app/flatpak-transaction.c:726 +#: app/flatpak-transaction.c:747 #, fuzzy msgid "install bundle" msgstr "Aus einer lokalen Bündel-Datei installieren" -#: app/flatpak-transaction.c:727 +#: app/flatpak-transaction.c:748 #, fuzzy, c-format msgid "Installing: %s from bundle %s\n" msgstr "Zugehörige werden installiert: %s\n" -#: app/flatpak-transaction.c:739 +#: app/flatpak-transaction.c:760 #, fuzzy, c-format msgid "Warning: Failed to %s %s: %s\n" msgstr "Warnung: Installation zugehöriger Referenz fehlgeschlagen: %s\n" -#: app/flatpak-transaction.c:744 +#: app/flatpak-transaction.c:765 #, c-format msgid "Error: Failed to %s %s: %s\n" msgstr "" -#: app/flatpak-transaction.c:749 +#: app/flatpak-transaction.c:770 #, fuzzy msgid "One or more operations failed" msgstr "Eine oder mehrere Aktualisierungen sind fehlgeschlagen" -#: common/flatpak-dir.c:872 +#: common/flatpak-dir.c:871 #, c-format msgid "No overrides found for %s" msgstr "Keine Ersetzungen für %s gefunden" -#: common/flatpak-dir.c:1384 +#: common/flatpak-dir.c:1383 #, c-format msgid "While opening repository %s: " msgstr "Während des Öffnens der Quelle %s: " -#: common/flatpak-dir.c:1517 common/flatpak-dir.c:3800 +#: common/flatpak-dir.c:1516 common/flatpak-dir.c:3845 msgid "Can't create deploy directory" msgstr "Bereitstellungsordner konnte nicht erstellt werden" -#: common/flatpak-dir.c:1874 +#: common/flatpak-dir.c:1903 #, c-format msgid "Invalid sha256 for extra data uri %s" msgstr "" -#: common/flatpak-dir.c:1879 +#: common/flatpak-dir.c:1908 #, c-format msgid "Empty name for extra data uri %s" msgstr "" -#: common/flatpak-dir.c:1884 +#: common/flatpak-dir.c:1913 #, c-format msgid "Unsupported extra data uri %s" msgstr "" -#: common/flatpak-dir.c:1894 +#: common/flatpak-dir.c:1923 #, fuzzy, c-format msgid "While downloading %s: " msgstr "Während des Öffnens der Quelle %s: " -#: common/flatpak-dir.c:1899 +#: common/flatpak-dir.c:1928 #, c-format msgid "Wrong size for extra data %s" msgstr "" -#: common/flatpak-dir.c:1907 +#: common/flatpak-dir.c:1936 #, fuzzy, c-format msgid "Invalid checksum for extra data %s" msgstr "Ungültiges Umgebungsformat: %s" -#: common/flatpak-dir.c:2002 +#: common/flatpak-dir.c:2031 msgid "OCI image specifies the wrong app id" msgstr "" -#: common/flatpak-dir.c:2123 common/flatpak-dir.c:2342 +#: common/flatpak-dir.c:2161 common/flatpak-dir.c:2380 #, c-format msgid "While pulling %s from remote %s: " msgstr "Während des Holens von %s von der entfernten Quelle %s: " -#: common/flatpak-dir.c:2296 +#: common/flatpak-dir.c:2334 #, c-format msgid "Can't find %s in remote %s" msgstr "%s konnte nicht in entfernter Quelle %s gefunden werden" -#: common/flatpak-dir.c:2902 +#: common/flatpak-dir.c:2940 msgid "Not enough memory" msgstr "Nicht genug Speicher" -#: common/flatpak-dir.c:2921 +#: common/flatpak-dir.c:2959 msgid "Failed to read from exported file" msgstr "Lesen aus der exportierten Datei fehlgeschlagen" -#: common/flatpak-dir.c:3445 +#: common/flatpak-dir.c:3483 #, fuzzy msgid "While getting detached metadata: " msgstr "" "Während des Versuchs, eine Arbeitskopie des Metadaten-Unterordners zu " "erstellen: " -#: common/flatpak-dir.c:3463 +#: common/flatpak-dir.c:3501 msgid "While creating extradir: " msgstr "" -#: common/flatpak-dir.c:3484 +#: common/flatpak-dir.c:3522 msgid "Invalid sha256 for extra data" msgstr "" -#: common/flatpak-dir.c:3513 +#: common/flatpak-dir.c:3551 msgid "Wrong size for extra data" msgstr "" -#: common/flatpak-dir.c:3517 +#: common/flatpak-dir.c:3555 msgid "Invalid checksum for extra data" msgstr "" -#: common/flatpak-dir.c:3526 +#: common/flatpak-dir.c:3564 #, c-format msgid "While writing extra data file '%s': " msgstr "" -#: common/flatpak-dir.c:3694 +#: common/flatpak-dir.c:3739 msgid "apply_extra script failed" msgstr "" -#: common/flatpak-dir.c:3761 +#: common/flatpak-dir.c:3806 #, c-format msgid "While trying to resolve ref %s: " msgstr "Während des Auflösens der Referenz %s: " -#: common/flatpak-dir.c:3776 +#: common/flatpak-dir.c:3821 #, c-format msgid "%s is not available" msgstr "%s ist nicht verfügbar" -#: common/flatpak-dir.c:3789 common/flatpak-dir.c:4037 -#: common/flatpak-dir.c:4640 common/flatpak-dir.c:4660 +#: common/flatpak-dir.c:3834 common/flatpak-dir.c:4082 +#: common/flatpak-dir.c:4685 common/flatpak-dir.c:4705 #, c-format msgid "%s branch %s already installed" msgstr "%s Zweig %s wurde bereits installiert" -#: common/flatpak-dir.c:3808 +#: common/flatpak-dir.c:3853 #, c-format msgid "Failed to read commit %s: " msgstr "Commit %s konnte nicht gelesen werden: " -#: common/flatpak-dir.c:3827 +#: common/flatpak-dir.c:3872 #, c-format msgid "While trying to checkout %s into %s: " msgstr "Während des Versuchs, eine Arbeitskopie von %s nach %s zu erstellen: " -#: common/flatpak-dir.c:3852 common/flatpak-dir.c:3883 +#: common/flatpak-dir.c:3897 common/flatpak-dir.c:3928 msgid "While trying to checkout metadata subpath: " msgstr "" "Während des Versuchs, eine Arbeitskopie des Metadaten-Unterordners zu " "erstellen: " -#: common/flatpak-dir.c:3893 +#: common/flatpak-dir.c:3938 #, fuzzy msgid "While trying to remove existing extra dir: " msgstr "Während des Auflösens der Referenz %s: " -#: common/flatpak-dir.c:3904 +#: common/flatpak-dir.c:3949 #, fuzzy msgid "While trying to apply extra data: " msgstr "" "Während des Versuchs, eine Arbeitskopie des Metadaten-Unterordners zu " "erstellen: " -#: common/flatpak-dir.c:4488 +#: common/flatpak-dir.c:4533 #, fuzzy, c-format msgid "This version of %s is already installed" msgstr "Anwendung %s, Zweig %s ist bereits installiert" -#: common/flatpak-dir.c:4495 +#: common/flatpak-dir.c:4540 msgid "Can't change remote during bundle install" msgstr "" -#: common/flatpak-dir.c:4926 +#: common/flatpak-dir.c:4972 #, c-format msgid "%s branch %s is not installed" msgstr "%s Zweig %s ist nicht installiert" -#: common/flatpak-dir.c:5170 +#: common/flatpak-dir.c:5216 #, c-format msgid "%s branch %s not installed" msgstr "%s Zweig %s ist nicht installiert" -#: common/flatpak-dir.c:5941 +#: common/flatpak-dir.c:5987 #, c-format msgid "Nothing matches %s" msgstr "Kein Treffer für %s" -#: common/flatpak-dir.c:6023 +#: common/flatpak-dir.c:6069 #, fuzzy, c-format msgid "Can't find %s%s%s%s%s in remote %s" msgstr "%s konnte nicht in entfernter Quelle %s gefunden werden" -#: common/flatpak-dir.c:6140 +#: common/flatpak-dir.c:6186 #, c-format msgid "%s %s not installed" msgstr "%s %s ist nicht installiert" -#: common/flatpak-dir.c:6213 +#: common/flatpak-dir.c:6259 #, fuzzy, c-format msgid "Could not find installation %s" msgstr "Benutzerinstallationen bearbeiten" -#: common/flatpak-dir.c:6686 +#: common/flatpak-dir.c:6757 #, c-format msgid "Runtime %s, branch %s is already installed" msgstr "Laufzeitumgebung %s, Zweig %s ist bereits installiert" -#: common/flatpak-dir.c:6687 +#: common/flatpak-dir.c:6758 #, c-format msgid "App %s, branch %s is already installed" msgstr "Anwendung %s, Zweig %s ist bereits installiert" -#: common/flatpak-dir.c:7138 +#: common/flatpak-dir.c:7209 msgid "Remote title not set" msgstr "Entfernter Titel nicht festgelegt" -#: common/flatpak-dir.c:7165 +#: common/flatpak-dir.c:7236 #, fuzzy msgid "Remote default-branch not set" msgstr "Entfernter Titel nicht festgelegt" -#: common/flatpak-dir.c:7308 +#: common/flatpak-dir.c:7379 msgid "No flatpak cache in remote summary" msgstr "" -#: common/flatpak-dir.c:7317 +#: common/flatpak-dir.c:7388 #, c-format msgid "No entry for %s in remote summary flatpak cache " msgstr "" @@ -1915,42 +1915,42 @@ "Laufende Sitzung als nicht erforderlich festlegen (keine Erstellung von " "cgroups)" -#: common/flatpak-run.c:1821 +#: common/flatpak-run.c:1839 msgid "Failed to create temporary file" msgstr "Temporäre Datei konnte nicht erstellt werden" -#: common/flatpak-run.c:1828 +#: common/flatpak-run.c:1846 msgid "Failed to unlink temporary file" msgstr "Verbindung zur temporären Datei konnte nicht gelöst werden" -#: common/flatpak-run.c:1846 +#: common/flatpak-run.c:1864 msgid "Failed to write to temporary file" msgstr "In temporäre Datei konnte nicht geschrieben werden" -#: common/flatpak-run.c:3220 +#: common/flatpak-run.c:3240 #, fuzzy, c-format msgid "Failed to open flatpak-info temp file: %s" msgstr "Temporäre Datei konnte nicht geöffnet werden" -#: common/flatpak-run.c:3264 +#: common/flatpak-run.c:3284 #, fuzzy, c-format msgid "Failed to open temp file: %s" msgstr "Temporäre Datei konnte nicht geöffnet werden" -#: common/flatpak-run.c:3548 +#: common/flatpak-run.c:3568 msgid "Unable to create sync pipe" msgstr "»Sync-Pipe« konnte nicht erstellt werden" -#: common/flatpak-run.c:3573 +#: common/flatpak-run.c:3593 #, fuzzy, c-format msgid "Failed to open app info file: %s" msgstr "Temporäre Datei konnte nicht geöffnet werden" -#: common/flatpak-run.c:3603 +#: common/flatpak-run.c:3623 msgid "Failed to sync with dbus proxy" msgstr "Abgleich mit Dbus-Proxy ist fehlgeschlagen" -#: common/flatpak-utils.c:2524 +#: common/flatpak-utils.c:2523 msgid "No extra data sources" msgstr "" diff -Nru flatpak-0.8.3/po/flatpak.pot flatpak-0.8.4/po/flatpak.pot --- flatpak-0.8.3/po/flatpak.pot 2017-02-14 10:16:29.000000000 +0000 +++ flatpak-0.8.4/po/flatpak.pot 2017-03-10 09:43:57.000000000 +0000 @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: flatpak 0.8.3\n" +"Project-Id-Version: flatpak 0.8.4\n" "Report-Msgid-Bugs-To: https://github.com/flatpak/flatpak/issues\n" -"POT-Creation-Date: 2017-02-14 11:16+0100\n" +"POT-Creation-Date: 2017-03-10 10:43+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -129,7 +129,7 @@ #: app/flatpak-builtins-document-list.c:70 #: app/flatpak-builtins-document-unexport.c:67 app/flatpak-builtins-info.c:105 #: app/flatpak-builtins-install.c:251 app/flatpak-builtins-install.c:329 -#: app/flatpak-builtins-list.c:361 app/flatpak-builtins-list-remotes.c:65 +#: app/flatpak-builtins-list.c:354 app/flatpak-builtins-list-remotes.c:65 #: app/flatpak-builtins-ls-remote.c:80 app/flatpak-builtins-make-current.c:67 #: app/flatpak-builtins-override.c:66 msgid "Too many arguments" @@ -275,7 +275,7 @@ msgid "Missing '=' in bind mount option '%s'" msgstr "" -#: app/flatpak-builtins-build.c:258 common/flatpak-run.c:4321 +#: app/flatpak-builtins-build.c:258 common/flatpak-run.c:4344 msgid "Unable to start app" msgstr "" @@ -927,7 +927,7 @@ msgid "Arch to show" msgstr "" -#: app/flatpak-builtins-list.c:354 +#: app/flatpak-builtins-list.c:347 msgid " - List installed apps and/or runtimes" msgstr "" @@ -1123,7 +1123,7 @@ msgid "Must specify at least one REF" msgstr "" -#: app/flatpak-builtins-uninstall.c:129 app/flatpak-transaction.c:333 +#: app/flatpak-builtins-uninstall.c:129 app/flatpak-transaction.c:337 #, c-format msgid "Warning: Problem looking for related refs: %s\n" msgstr "" @@ -1371,301 +1371,301 @@ msgid "error:" msgstr "" -#: app/flatpak-transaction.c:295 +#: app/flatpak-transaction.c:299 #, c-format msgid "Found in remote %s, do you want to install it?" msgstr "" -#: app/flatpak-transaction.c:300 +#: app/flatpak-transaction.c:304 msgid "Found in several remotes:\n" msgstr "" -#: app/flatpak-transaction.c:305 +#: app/flatpak-transaction.c:309 msgid "Which do you want to install (0 to abort)?" msgstr "" -#: app/flatpak-transaction.c:395 +#: app/flatpak-transaction.c:399 #, c-format msgid "Required runtime for %s (%s) is not installed, searching...\n" msgstr "" -#: app/flatpak-transaction.c:401 +#: app/flatpak-transaction.c:405 #, c-format msgid "The required runtime %s was not found in a configured remote.\n" msgstr "" -#: app/flatpak-transaction.c:462 common/flatpak-dir.c:979 -#: common/flatpak-dir.c:1236 common/flatpak-dir.c:1272 -#: common/flatpak-dir.c:1294 common/flatpak-dir.c:7639 -#: common/flatpak-utils.c:1116 +#: app/flatpak-transaction.c:466 common/flatpak-dir.c:978 +#: common/flatpak-dir.c:1235 common/flatpak-dir.c:1271 +#: common/flatpak-dir.c:1293 common/flatpak-dir.c:7710 +#: common/flatpak-utils.c:1114 #, c-format msgid "%s not installed" msgstr "" -#: app/flatpak-transaction.c:468 +#: app/flatpak-transaction.c:472 #, c-format msgid "Remote %s disabled, ignoring %s update" msgstr "" -#: app/flatpak-transaction.c:479 +#: app/flatpak-transaction.c:483 #, c-format msgid "%s already installed" msgstr "" -#: app/flatpak-transaction.c:523 +#: app/flatpak-transaction.c:527 #, c-format msgid "%s needs a later flatpak version (%s)" msgstr "" -#: app/flatpak-transaction.c:616 common/flatpak-dir.c:1999 +#: app/flatpak-transaction.c:620 common/flatpak-dir.c:2028 msgid "OCI image is not a flatpak (missing ref)" msgstr "" -#: app/flatpak-transaction.c:684 +#: app/flatpak-transaction.c:705 msgid "install" msgstr "" -#: app/flatpak-transaction.c:685 +#: app/flatpak-transaction.c:706 #, c-format msgid "Installing: %s from %s\n" msgstr "" -#: app/flatpak-transaction.c:696 +#: app/flatpak-transaction.c:717 msgid "update" msgstr "" -#: app/flatpak-transaction.c:697 +#: app/flatpak-transaction.c:718 #, c-format msgid "Updating: %s from %s\n" msgstr "" -#: app/flatpak-transaction.c:712 +#: app/flatpak-transaction.c:733 #, c-format msgid "Now at %s.\n" msgstr "" -#: app/flatpak-transaction.c:718 +#: app/flatpak-transaction.c:739 msgid "No updates.\n" msgstr "" -#: app/flatpak-transaction.c:726 +#: app/flatpak-transaction.c:747 msgid "install bundle" msgstr "" -#: app/flatpak-transaction.c:727 +#: app/flatpak-transaction.c:748 #, c-format msgid "Installing: %s from bundle %s\n" msgstr "" -#: app/flatpak-transaction.c:739 +#: app/flatpak-transaction.c:760 #, c-format msgid "Warning: Failed to %s %s: %s\n" msgstr "" -#: app/flatpak-transaction.c:744 +#: app/flatpak-transaction.c:765 #, c-format msgid "Error: Failed to %s %s: %s\n" msgstr "" -#: app/flatpak-transaction.c:749 +#: app/flatpak-transaction.c:770 msgid "One or more operations failed" msgstr "" -#: common/flatpak-dir.c:872 +#: common/flatpak-dir.c:871 #, c-format msgid "No overrides found for %s" msgstr "" -#: common/flatpak-dir.c:1384 +#: common/flatpak-dir.c:1383 #, c-format msgid "While opening repository %s: " msgstr "" -#: common/flatpak-dir.c:1517 common/flatpak-dir.c:3800 +#: common/flatpak-dir.c:1516 common/flatpak-dir.c:3845 msgid "Can't create deploy directory" msgstr "" -#: common/flatpak-dir.c:1874 +#: common/flatpak-dir.c:1903 #, c-format msgid "Invalid sha256 for extra data uri %s" msgstr "" -#: common/flatpak-dir.c:1879 +#: common/flatpak-dir.c:1908 #, c-format msgid "Empty name for extra data uri %s" msgstr "" -#: common/flatpak-dir.c:1884 +#: common/flatpak-dir.c:1913 #, c-format msgid "Unsupported extra data uri %s" msgstr "" -#: common/flatpak-dir.c:1894 +#: common/flatpak-dir.c:1923 #, c-format msgid "While downloading %s: " msgstr "" -#: common/flatpak-dir.c:1899 +#: common/flatpak-dir.c:1928 #, c-format msgid "Wrong size for extra data %s" msgstr "" -#: common/flatpak-dir.c:1907 +#: common/flatpak-dir.c:1936 #, c-format msgid "Invalid checksum for extra data %s" msgstr "" -#: common/flatpak-dir.c:2002 +#: common/flatpak-dir.c:2031 msgid "OCI image specifies the wrong app id" msgstr "" -#: common/flatpak-dir.c:2123 common/flatpak-dir.c:2342 +#: common/flatpak-dir.c:2161 common/flatpak-dir.c:2380 #, c-format msgid "While pulling %s from remote %s: " msgstr "" -#: common/flatpak-dir.c:2296 +#: common/flatpak-dir.c:2334 #, c-format msgid "Can't find %s in remote %s" msgstr "" -#: common/flatpak-dir.c:2902 +#: common/flatpak-dir.c:2940 msgid "Not enough memory" msgstr "" -#: common/flatpak-dir.c:2921 +#: common/flatpak-dir.c:2959 msgid "Failed to read from exported file" msgstr "" -#: common/flatpak-dir.c:3445 +#: common/flatpak-dir.c:3483 msgid "While getting detached metadata: " msgstr "" -#: common/flatpak-dir.c:3463 +#: common/flatpak-dir.c:3501 msgid "While creating extradir: " msgstr "" -#: common/flatpak-dir.c:3484 +#: common/flatpak-dir.c:3522 msgid "Invalid sha256 for extra data" msgstr "" -#: common/flatpak-dir.c:3513 +#: common/flatpak-dir.c:3551 msgid "Wrong size for extra data" msgstr "" -#: common/flatpak-dir.c:3517 +#: common/flatpak-dir.c:3555 msgid "Invalid checksum for extra data" msgstr "" -#: common/flatpak-dir.c:3526 +#: common/flatpak-dir.c:3564 #, c-format msgid "While writing extra data file '%s': " msgstr "" -#: common/flatpak-dir.c:3694 +#: common/flatpak-dir.c:3739 msgid "apply_extra script failed" msgstr "" -#: common/flatpak-dir.c:3761 +#: common/flatpak-dir.c:3806 #, c-format msgid "While trying to resolve ref %s: " msgstr "" -#: common/flatpak-dir.c:3776 +#: common/flatpak-dir.c:3821 #, c-format msgid "%s is not available" msgstr "" -#: common/flatpak-dir.c:3789 common/flatpak-dir.c:4037 -#: common/flatpak-dir.c:4640 common/flatpak-dir.c:4660 +#: common/flatpak-dir.c:3834 common/flatpak-dir.c:4082 +#: common/flatpak-dir.c:4685 common/flatpak-dir.c:4705 #, c-format msgid "%s branch %s already installed" msgstr "" -#: common/flatpak-dir.c:3808 +#: common/flatpak-dir.c:3853 #, c-format msgid "Failed to read commit %s: " msgstr "" -#: common/flatpak-dir.c:3827 +#: common/flatpak-dir.c:3872 #, c-format msgid "While trying to checkout %s into %s: " msgstr "" -#: common/flatpak-dir.c:3852 common/flatpak-dir.c:3883 +#: common/flatpak-dir.c:3897 common/flatpak-dir.c:3928 msgid "While trying to checkout metadata subpath: " msgstr "" -#: common/flatpak-dir.c:3893 +#: common/flatpak-dir.c:3938 msgid "While trying to remove existing extra dir: " msgstr "" -#: common/flatpak-dir.c:3904 +#: common/flatpak-dir.c:3949 msgid "While trying to apply extra data: " msgstr "" -#: common/flatpak-dir.c:4488 +#: common/flatpak-dir.c:4533 #, c-format msgid "This version of %s is already installed" msgstr "" -#: common/flatpak-dir.c:4495 +#: common/flatpak-dir.c:4540 msgid "Can't change remote during bundle install" msgstr "" -#: common/flatpak-dir.c:4926 +#: common/flatpak-dir.c:4972 #, c-format msgid "%s branch %s is not installed" msgstr "" -#: common/flatpak-dir.c:5170 +#: common/flatpak-dir.c:5216 #, c-format msgid "%s branch %s not installed" msgstr "" -#: common/flatpak-dir.c:5941 +#: common/flatpak-dir.c:5987 #, c-format msgid "Nothing matches %s" msgstr "" -#: common/flatpak-dir.c:6023 +#: common/flatpak-dir.c:6069 #, c-format msgid "Can't find %s%s%s%s%s in remote %s" msgstr "" -#: common/flatpak-dir.c:6140 +#: common/flatpak-dir.c:6186 #, c-format msgid "%s %s not installed" msgstr "" -#: common/flatpak-dir.c:6213 +#: common/flatpak-dir.c:6259 #, c-format msgid "Could not find installation %s" msgstr "" -#: common/flatpak-dir.c:6686 +#: common/flatpak-dir.c:6757 #, c-format msgid "Runtime %s, branch %s is already installed" msgstr "" -#: common/flatpak-dir.c:6687 +#: common/flatpak-dir.c:6758 #, c-format msgid "App %s, branch %s is already installed" msgstr "" -#: common/flatpak-dir.c:7138 +#: common/flatpak-dir.c:7209 msgid "Remote title not set" msgstr "" -#: common/flatpak-dir.c:7165 +#: common/flatpak-dir.c:7236 msgid "Remote default-branch not set" msgstr "" -#: common/flatpak-dir.c:7308 +#: common/flatpak-dir.c:7379 msgid "No flatpak cache in remote summary" msgstr "" -#: common/flatpak-dir.c:7317 +#: common/flatpak-dir.c:7388 #, c-format msgid "No entry for %s in remote summary flatpak cache " msgstr "" @@ -1830,41 +1830,41 @@ msgid "Don't require a running session (no cgroups creation)" msgstr "" -#: common/flatpak-run.c:1821 +#: common/flatpak-run.c:1839 msgid "Failed to create temporary file" msgstr "" -#: common/flatpak-run.c:1828 +#: common/flatpak-run.c:1846 msgid "Failed to unlink temporary file" msgstr "" -#: common/flatpak-run.c:1846 +#: common/flatpak-run.c:1864 msgid "Failed to write to temporary file" msgstr "" -#: common/flatpak-run.c:3220 +#: common/flatpak-run.c:3240 #, c-format msgid "Failed to open flatpak-info temp file: %s" msgstr "" -#: common/flatpak-run.c:3264 +#: common/flatpak-run.c:3284 #, c-format msgid "Failed to open temp file: %s" msgstr "" -#: common/flatpak-run.c:3548 +#: common/flatpak-run.c:3568 msgid "Unable to create sync pipe" msgstr "" -#: common/flatpak-run.c:3573 +#: common/flatpak-run.c:3593 #, c-format msgid "Failed to open app info file: %s" msgstr "" -#: common/flatpak-run.c:3603 +#: common/flatpak-run.c:3623 msgid "Failed to sync with dbus proxy" msgstr "" -#: common/flatpak-utils.c:2524 +#: common/flatpak-utils.c:2523 msgid "No extra data sources" msgstr "" Binary files /tmp/tmpu7qeol/Yf3MfDJ1cf/flatpak-0.8.3/po/hu.gmo and /tmp/tmpu7qeol/jYLJXs2Rih/flatpak-0.8.4/po/hu.gmo differ diff -Nru flatpak-0.8.3/po/hu.po flatpak-0.8.4/po/hu.po --- flatpak-0.8.3/po/hu.po 2017-02-14 10:16:29.000000000 +0000 +++ flatpak-0.8.4/po/hu.po 2017-03-10 09:43:57.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: flatpak master\n" "Report-Msgid-Bugs-To: https://github.com/flatpak/flatpak/issues\n" -"POT-Creation-Date: 2017-02-14 11:16+0100\n" +"POT-Creation-Date: 2017-03-10 10:43+0100\n" "PO-Revision-Date: 2016-08-24 19:27+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -136,7 +136,7 @@ #: app/flatpak-builtins-document-list.c:70 #: app/flatpak-builtins-document-unexport.c:67 app/flatpak-builtins-info.c:105 #: app/flatpak-builtins-install.c:251 app/flatpak-builtins-install.c:329 -#: app/flatpak-builtins-list.c:361 app/flatpak-builtins-list-remotes.c:65 +#: app/flatpak-builtins-list.c:354 app/flatpak-builtins-list-remotes.c:65 #: app/flatpak-builtins-ls-remote.c:80 app/flatpak-builtins-make-current.c:67 #: app/flatpak-builtins-override.c:66 msgid "Too many arguments" @@ -285,7 +285,7 @@ msgid "Missing '=' in bind mount option '%s'" msgstr "Hiányzó „=” a(z) „%s” kötési csatolás kapcsolóban" -#: app/flatpak-builtins-build.c:258 common/flatpak-run.c:4321 +#: app/flatpak-builtins-build.c:258 common/flatpak-run.c:4344 msgid "Unable to start app" msgstr "Nem indítható el az alkalmazás" @@ -963,7 +963,7 @@ msgid "Arch to show" msgstr "Megjelenítendő architektúra" -#: app/flatpak-builtins-list.c:354 +#: app/flatpak-builtins-list.c:347 msgid " - List installed apps and/or runtimes" msgstr " - Telepített alkalmazások és/vagy futtatókörnyezetek felsorolása" @@ -1163,7 +1163,7 @@ msgid "Must specify at least one REF" msgstr "" -#: app/flatpak-builtins-uninstall.c:129 app/flatpak-transaction.c:333 +#: app/flatpak-builtins-uninstall.c:129 app/flatpak-transaction.c:337 #, c-format msgid "Warning: Problem looking for related refs: %s\n" msgstr "Figyelmeztetés: hiba a kapcsolódó hivatkozások keresésekor: %s\n" @@ -1425,309 +1425,309 @@ msgid "error:" msgstr "hiba:" -#: app/flatpak-transaction.c:295 +#: app/flatpak-transaction.c:299 #, c-format msgid "Found in remote %s, do you want to install it?" msgstr "" -#: app/flatpak-transaction.c:300 +#: app/flatpak-transaction.c:304 msgid "Found in several remotes:\n" msgstr "" -#: app/flatpak-transaction.c:305 +#: app/flatpak-transaction.c:309 msgid "Which do you want to install (0 to abort)?" msgstr "" -#: app/flatpak-transaction.c:395 +#: app/flatpak-transaction.c:399 #, c-format msgid "Required runtime for %s (%s) is not installed, searching...\n" msgstr "" -#: app/flatpak-transaction.c:401 +#: app/flatpak-transaction.c:405 #, fuzzy, c-format msgid "The required runtime %s was not found in a configured remote.\n" msgstr "Beállított távoli tulajdonságainak módosítása" -#: app/flatpak-transaction.c:462 common/flatpak-dir.c:979 -#: common/flatpak-dir.c:1236 common/flatpak-dir.c:1272 -#: common/flatpak-dir.c:1294 common/flatpak-dir.c:7639 -#: common/flatpak-utils.c:1116 +#: app/flatpak-transaction.c:466 common/flatpak-dir.c:978 +#: common/flatpak-dir.c:1235 common/flatpak-dir.c:1271 +#: common/flatpak-dir.c:1293 common/flatpak-dir.c:7710 +#: common/flatpak-utils.c:1114 #, c-format msgid "%s not installed" msgstr "A(z) %s nincs telepítve" -#: app/flatpak-transaction.c:468 +#: app/flatpak-transaction.c:472 #, fuzzy, c-format msgid "Remote %s disabled, ignoring %s update" msgstr "A(z) %s távoli le van tiltva\n" -#: app/flatpak-transaction.c:479 +#: app/flatpak-transaction.c:483 #, fuzzy, c-format msgid "%s already installed" msgstr "A(z) %s %s ág már telepítve van" -#: app/flatpak-transaction.c:523 +#: app/flatpak-transaction.c:527 #, c-format msgid "%s needs a later flatpak version (%s)" msgstr "" -#: app/flatpak-transaction.c:616 common/flatpak-dir.c:1999 +#: app/flatpak-transaction.c:620 common/flatpak-dir.c:2028 msgid "OCI image is not a flatpak (missing ref)" msgstr "" -#: app/flatpak-transaction.c:684 +#: app/flatpak-transaction.c:705 #, fuzzy msgid "install" msgstr "A(z) %s nincs telepítve" -#: app/flatpak-transaction.c:685 +#: app/flatpak-transaction.c:706 #, fuzzy, c-format msgid "Installing: %s from %s\n" msgstr "Kapcsolódó telepítése: %s\n" -#: app/flatpak-transaction.c:696 +#: app/flatpak-transaction.c:717 #, fuzzy msgid "update" msgstr "Nincsenek frissítések.\n" -#: app/flatpak-transaction.c:697 +#: app/flatpak-transaction.c:718 #, fuzzy, c-format msgid "Updating: %s from %s\n" msgstr "Kapcsolódó frissítése: %s\n" -#: app/flatpak-transaction.c:712 +#: app/flatpak-transaction.c:733 #, c-format msgid "Now at %s.\n" msgstr "Most: %s.\n" -#: app/flatpak-transaction.c:718 +#: app/flatpak-transaction.c:739 msgid "No updates.\n" msgstr "Nincsenek frissítések.\n" -#: app/flatpak-transaction.c:726 +#: app/flatpak-transaction.c:747 #, fuzzy msgid "install bundle" msgstr "A(z) %s nincs telepítve" -#: app/flatpak-transaction.c:727 +#: app/flatpak-transaction.c:748 #, fuzzy, c-format msgid "Installing: %s from bundle %s\n" msgstr "Kapcsolódó telepítése: %s\n" -#: app/flatpak-transaction.c:739 +#: app/flatpak-transaction.c:760 #, fuzzy, c-format msgid "Warning: Failed to %s %s: %s\n" msgstr "Figyelmeztetés: a kapcsolódó hivatkozás telepítése sikertelen: %s\n" -#: app/flatpak-transaction.c:744 +#: app/flatpak-transaction.c:765 #, c-format msgid "Error: Failed to %s %s: %s\n" msgstr "" -#: app/flatpak-transaction.c:749 +#: app/flatpak-transaction.c:770 #, fuzzy msgid "One or more operations failed" msgstr "Egy vagy több frissítés sikertelen" -#: common/flatpak-dir.c:872 +#: common/flatpak-dir.c:871 #, c-format msgid "No overrides found for %s" msgstr "Nem találhatók felülbírálások ehhez: %s" -#: common/flatpak-dir.c:1384 +#: common/flatpak-dir.c:1383 #, c-format msgid "While opening repository %s: " msgstr "A(z) %s tároló megnyitása közben: " -#: common/flatpak-dir.c:1517 common/flatpak-dir.c:3800 +#: common/flatpak-dir.c:1516 common/flatpak-dir.c:3845 msgid "Can't create deploy directory" msgstr "Nem lehet létrehozni a telepítési könyvtárat" -#: common/flatpak-dir.c:1874 +#: common/flatpak-dir.c:1903 #, c-format msgid "Invalid sha256 for extra data uri %s" msgstr "" -#: common/flatpak-dir.c:1879 +#: common/flatpak-dir.c:1908 #, c-format msgid "Empty name for extra data uri %s" msgstr "" -#: common/flatpak-dir.c:1884 +#: common/flatpak-dir.c:1913 #, c-format msgid "Unsupported extra data uri %s" msgstr "" -#: common/flatpak-dir.c:1894 +#: common/flatpak-dir.c:1923 #, fuzzy, c-format msgid "While downloading %s: " msgstr "A(z) %s tároló megnyitása közben: " -#: common/flatpak-dir.c:1899 +#: common/flatpak-dir.c:1928 #, c-format msgid "Wrong size for extra data %s" msgstr "" -#: common/flatpak-dir.c:1907 +#: common/flatpak-dir.c:1936 #, fuzzy, c-format msgid "Invalid checksum for extra data %s" msgstr "Érvénytelen %s env formátum" -#: common/flatpak-dir.c:2002 +#: common/flatpak-dir.c:2031 msgid "OCI image specifies the wrong app id" msgstr "" -#: common/flatpak-dir.c:2123 common/flatpak-dir.c:2342 +#: common/flatpak-dir.c:2161 common/flatpak-dir.c:2380 #, c-format msgid "While pulling %s from remote %s: " msgstr "A(z) %s lekérése közben a(z) %s távoliról: " -#: common/flatpak-dir.c:2296 +#: common/flatpak-dir.c:2334 #, c-format msgid "Can't find %s in remote %s" msgstr "A(z) %s nem található a(z) %s távolin" -#: common/flatpak-dir.c:2902 +#: common/flatpak-dir.c:2940 msgid "Not enough memory" msgstr "Nincs elég memória" -#: common/flatpak-dir.c:2921 +#: common/flatpak-dir.c:2959 msgid "Failed to read from exported file" msgstr "Nem sikerült olvasni az exportált fájlból" -#: common/flatpak-dir.c:3445 +#: common/flatpak-dir.c:3483 #, fuzzy msgid "While getting detached metadata: " msgstr "A metaadatok alútvonalának átváltására tett kísérlet közben: " -#: common/flatpak-dir.c:3463 +#: common/flatpak-dir.c:3501 msgid "While creating extradir: " msgstr "" -#: common/flatpak-dir.c:3484 +#: common/flatpak-dir.c:3522 msgid "Invalid sha256 for extra data" msgstr "" -#: common/flatpak-dir.c:3513 +#: common/flatpak-dir.c:3551 msgid "Wrong size for extra data" msgstr "" -#: common/flatpak-dir.c:3517 +#: common/flatpak-dir.c:3555 msgid "Invalid checksum for extra data" msgstr "" -#: common/flatpak-dir.c:3526 +#: common/flatpak-dir.c:3564 #, c-format msgid "While writing extra data file '%s': " msgstr "" -#: common/flatpak-dir.c:3694 +#: common/flatpak-dir.c:3739 msgid "apply_extra script failed" msgstr "" -#: common/flatpak-dir.c:3761 +#: common/flatpak-dir.c:3806 #, c-format msgid "While trying to resolve ref %s: " msgstr "A(z) %s hivatkozás feloldására tett kísérlet közben: " -#: common/flatpak-dir.c:3776 +#: common/flatpak-dir.c:3821 #, c-format msgid "%s is not available" msgstr "A(z) %s nem érhető el" -#: common/flatpak-dir.c:3789 common/flatpak-dir.c:4037 -#: common/flatpak-dir.c:4640 common/flatpak-dir.c:4660 +#: common/flatpak-dir.c:3834 common/flatpak-dir.c:4082 +#: common/flatpak-dir.c:4685 common/flatpak-dir.c:4705 #, c-format msgid "%s branch %s already installed" msgstr "A(z) %s %s ág már telepítve van" -#: common/flatpak-dir.c:3808 +#: common/flatpak-dir.c:3853 #, c-format msgid "Failed to read commit %s: " msgstr "Nem sikerült olvasni a(z) %s kommitot: " -#: common/flatpak-dir.c:3827 +#: common/flatpak-dir.c:3872 #, c-format msgid "While trying to checkout %s into %s: " msgstr "A(z) %s -> %s átváltására tett kísérlet közben: " -#: common/flatpak-dir.c:3852 common/flatpak-dir.c:3883 +#: common/flatpak-dir.c:3897 common/flatpak-dir.c:3928 msgid "While trying to checkout metadata subpath: " msgstr "A metaadatok alútvonalának átváltására tett kísérlet közben: " -#: common/flatpak-dir.c:3893 +#: common/flatpak-dir.c:3938 #, fuzzy msgid "While trying to remove existing extra dir: " msgstr "A(z) %s hivatkozás feloldására tett kísérlet közben: " -#: common/flatpak-dir.c:3904 +#: common/flatpak-dir.c:3949 #, fuzzy msgid "While trying to apply extra data: " msgstr "A metaadatok alútvonalának átváltására tett kísérlet közben: " -#: common/flatpak-dir.c:4488 +#: common/flatpak-dir.c:4533 #, fuzzy, c-format msgid "This version of %s is already installed" msgstr "A(z) %s alkalmazás, %s ág már telepítve van" -#: common/flatpak-dir.c:4495 +#: common/flatpak-dir.c:4540 msgid "Can't change remote during bundle install" msgstr "" -#: common/flatpak-dir.c:4926 +#: common/flatpak-dir.c:4972 #, c-format msgid "%s branch %s is not installed" msgstr "A(z) %s %s ág nincs telepítve" -#: common/flatpak-dir.c:5170 +#: common/flatpak-dir.c:5216 #, c-format msgid "%s branch %s not installed" msgstr "A(z) %s %s ág nincs telepítve" -#: common/flatpak-dir.c:5941 +#: common/flatpak-dir.c:5987 #, c-format msgid "Nothing matches %s" msgstr "Semmi sem egyezik: %s" -#: common/flatpak-dir.c:6023 +#: common/flatpak-dir.c:6069 #, fuzzy, c-format msgid "Can't find %s%s%s%s%s in remote %s" msgstr "A(z) %s nem található a(z) %s távolin" -#: common/flatpak-dir.c:6140 +#: common/flatpak-dir.c:6186 #, c-format msgid "%s %s not installed" msgstr "A(z) %s %s nincs telepítve" -#: common/flatpak-dir.c:6213 +#: common/flatpak-dir.c:6259 #, fuzzy, c-format msgid "Could not find installation %s" msgstr "Munkavégzés a felhasználói telepítéseken" -#: common/flatpak-dir.c:6686 +#: common/flatpak-dir.c:6757 #, c-format msgid "Runtime %s, branch %s is already installed" msgstr "A(z) %s futtatókörnyezet, %s ág már telepítve van" -#: common/flatpak-dir.c:6687 +#: common/flatpak-dir.c:6758 #, c-format msgid "App %s, branch %s is already installed" msgstr "A(z) %s alkalmazás, %s ág már telepítve van" -#: common/flatpak-dir.c:7138 +#: common/flatpak-dir.c:7209 msgid "Remote title not set" msgstr "A távoli cím nincs beállítva" -#: common/flatpak-dir.c:7165 +#: common/flatpak-dir.c:7236 #, fuzzy msgid "Remote default-branch not set" msgstr "A távoli cím nincs beállítva" -#: common/flatpak-dir.c:7308 +#: common/flatpak-dir.c:7379 msgid "No flatpak cache in remote summary" msgstr "" -#: common/flatpak-dir.c:7317 +#: common/flatpak-dir.c:7388 #, c-format msgid "No entry for %s in remote summary flatpak cache " msgstr "" @@ -1897,42 +1897,42 @@ msgid "Don't require a running session (no cgroups creation)" msgstr "Ne követeljen meg egy futó munkamenetet (nincs cgroups létrehozás)" -#: common/flatpak-run.c:1821 +#: common/flatpak-run.c:1839 msgid "Failed to create temporary file" msgstr "Nem sikerült létrehozni az átmeneti fájlt" -#: common/flatpak-run.c:1828 +#: common/flatpak-run.c:1846 msgid "Failed to unlink temporary file" msgstr "Nem sikerült törölni az átmeneti fájlt" -#: common/flatpak-run.c:1846 +#: common/flatpak-run.c:1864 msgid "Failed to write to temporary file" msgstr "Nem sikerült írni az átmeneti fájlba" -#: common/flatpak-run.c:3220 +#: common/flatpak-run.c:3240 #, fuzzy, c-format msgid "Failed to open flatpak-info temp file: %s" msgstr "Nem sikerült megnyitni az átmeneti fájlt" -#: common/flatpak-run.c:3264 +#: common/flatpak-run.c:3284 #, fuzzy, c-format msgid "Failed to open temp file: %s" msgstr "Nem sikerült megnyitni az átmeneti fájlt" -#: common/flatpak-run.c:3548 +#: common/flatpak-run.c:3568 msgid "Unable to create sync pipe" msgstr "Nem hozható létre szinkronizálási cső" -#: common/flatpak-run.c:3573 +#: common/flatpak-run.c:3593 #, fuzzy, c-format msgid "Failed to open app info file: %s" msgstr "Nem sikerült megnyitni az átmeneti fájlt" -#: common/flatpak-run.c:3603 +#: common/flatpak-run.c:3623 msgid "Failed to sync with dbus proxy" msgstr "Nem sikerült szinkronizálni a dbus proxyval" -#: common/flatpak-utils.c:2524 +#: common/flatpak-utils.c:2523 msgid "No extra data sources" msgstr "" Binary files /tmp/tmpu7qeol/Yf3MfDJ1cf/flatpak-0.8.3/po/pl.gmo and /tmp/tmpu7qeol/jYLJXs2Rih/flatpak-0.8.4/po/pl.gmo differ diff -Nru flatpak-0.8.3/po/pl.po flatpak-0.8.4/po/pl.po --- flatpak-0.8.3/po/pl.po 2017-02-14 10:16:29.000000000 +0000 +++ flatpak-0.8.4/po/pl.po 2017-03-10 09:43:57.000000000 +0000 @@ -1,15 +1,15 @@ # Polish translation for flatpak. -# Copyright © 2016 the flatpak authors. +# Copyright © 2016-2017 the flatpak authors. # This file is distributed under the same license as the flatpak package. -# Piotr Drąg , 2016. -# Aviary.pl , 2016. +# Piotr Drąg , 2016-2017. +# Aviary.pl , 2016-2017. # msgid "" msgstr "" "Project-Id-Version: flatpak\n" "Report-Msgid-Bugs-To: https://github.com/flatpak/flatpak/issues\n" -"POT-Creation-Date: 2017-02-14 11:16+0100\n" -"PO-Revision-Date: 2016-12-20 17:45+0100\n" +"POT-Creation-Date: 2017-03-10 10:43+0100\n" +"PO-Revision-Date: 2017-03-03 08:35+0100\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "Language: pl\n" @@ -131,7 +131,7 @@ #: app/flatpak-builtins-document-list.c:70 #: app/flatpak-builtins-document-unexport.c:67 app/flatpak-builtins-info.c:105 #: app/flatpak-builtins-install.c:251 app/flatpak-builtins-install.c:329 -#: app/flatpak-builtins-list.c:361 app/flatpak-builtins-list-remotes.c:65 +#: app/flatpak-builtins-list.c:354 app/flatpak-builtins-list-remotes.c:65 #: app/flatpak-builtins-ls-remote.c:80 app/flatpak-builtins-make-current.c:67 #: app/flatpak-builtins-override.c:66 msgid "Too many arguments" @@ -283,7 +283,7 @@ msgid "Missing '=' in bind mount option '%s'" msgstr "Brak „=” w opcji montowania dowiązania „%s”" -#: app/flatpak-builtins-build.c:258 common/flatpak-run.c:4321 +#: app/flatpak-builtins-build.c:258 common/flatpak-run.c:4344 msgid "Unable to start app" msgstr "Nie można uruchomić programu" @@ -957,7 +957,7 @@ msgid "Arch to show" msgstr "Wyświetlana architektura" -#: app/flatpak-builtins-list.c:354 +#: app/flatpak-builtins-list.c:347 msgid " - List installed apps and/or runtimes" msgstr "" " — wyświetla listę zainstalowanych programów i/lub środowisk wykonawczych" @@ -1157,7 +1157,7 @@ msgid "Must specify at least one REF" msgstr "Należy podać co najmniej jedno ODNIESIENIE" -#: app/flatpak-builtins-uninstall.c:129 app/flatpak-transaction.c:333 +#: app/flatpak-builtins-uninstall.c:129 app/flatpak-transaction.c:337 #, c-format msgid "Warning: Problem looking for related refs: %s\n" msgstr "Ostrzeżenie: problem podczas wyszukiwania powiązanych odniesień: %s\n" @@ -1382,9 +1382,8 @@ msgstr "Wyświetla obsługiwane architektury i kończy działanie" #: app/flatpak-main.c:114 -#, fuzzy msgid "Print active gl drivers and exit" -msgstr "Wyświetla obsługiwane architektury i kończy działanie" +msgstr "Wyświetla aktywne sterowniki GL i kończy działanie" #: app/flatpak-main.c:119 msgid "Work on user installations" @@ -1415,308 +1414,309 @@ msgid "error:" msgstr "błąd:" -#: app/flatpak-transaction.c:295 +#: app/flatpak-transaction.c:299 #, c-format msgid "Found in remote %s, do you want to install it?" msgstr "Odnaleziono w repozytorium %s, zainstalować?" -#: app/flatpak-transaction.c:300 +#: app/flatpak-transaction.c:304 msgid "Found in several remotes:\n" msgstr "Odnaleziono w kilku repozytoriach:\n" -#: app/flatpak-transaction.c:305 +#: app/flatpak-transaction.c:309 msgid "Which do you want to install (0 to abort)?" msgstr "Które zainstalować (0 przerwie)?" -#: app/flatpak-transaction.c:395 +#: app/flatpak-transaction.c:399 #, c-format msgid "Required runtime for %s (%s) is not installed, searching...\n" msgstr "" "Wymagane środowisko wykonawcze dla %s (%s) nie jest zainstalowane, " "wyszukiwanie…\n" -#: app/flatpak-transaction.c:401 +#: app/flatpak-transaction.c:405 #, c-format msgid "The required runtime %s was not found in a configured remote.\n" msgstr "" "Nie odnaleziono wymaganego środowiska wykonawczego %s w skonfigurowanym " "repozytorium.\n" -#: app/flatpak-transaction.c:462 common/flatpak-dir.c:979 -#: common/flatpak-dir.c:1236 common/flatpak-dir.c:1272 -#: common/flatpak-dir.c:1294 common/flatpak-dir.c:7639 -#: common/flatpak-utils.c:1116 +#: app/flatpak-transaction.c:466 common/flatpak-dir.c:978 +#: common/flatpak-dir.c:1235 common/flatpak-dir.c:1271 +#: common/flatpak-dir.c:1293 common/flatpak-dir.c:7710 +#: common/flatpak-utils.c:1114 #, c-format msgid "%s not installed" msgstr "Nie zainstalowano %s" -#: app/flatpak-transaction.c:468 +#: app/flatpak-transaction.c:472 #, c-format msgid "Remote %s disabled, ignoring %s update" msgstr "Repozytorium %s jest wyłączone, ignorowanie aktualizacji %s" -#: app/flatpak-transaction.c:479 +#: app/flatpak-transaction.c:483 #, c-format msgid "%s already installed" msgstr "Już zainstalowano %s" -#: app/flatpak-transaction.c:523 +#: app/flatpak-transaction.c:527 #, c-format msgid "%s needs a later flatpak version (%s)" msgstr "%s wymaga późniejszej wersji Flatpak (%s)" -#: app/flatpak-transaction.c:616 common/flatpak-dir.c:1999 +#: app/flatpak-transaction.c:620 common/flatpak-dir.c:2028 msgid "OCI image is not a flatpak (missing ref)" msgstr "Obraz OCI nie jest pakietem Flatpak (brak odniesienia)" -#: app/flatpak-transaction.c:684 +#: app/flatpak-transaction.c:705 msgid "install" msgstr "instalacja" -#: app/flatpak-transaction.c:685 +#: app/flatpak-transaction.c:706 #, c-format msgid "Installing: %s from %s\n" msgstr "Instalowanie: %s z %s\n" -#: app/flatpak-transaction.c:696 +#: app/flatpak-transaction.c:717 msgid "update" msgstr "aktualizacja" -#: app/flatpak-transaction.c:697 +#: app/flatpak-transaction.c:718 #, c-format msgid "Updating: %s from %s\n" msgstr "Aktualizowanie: %s z %s\n" -#: app/flatpak-transaction.c:712 +#: app/flatpak-transaction.c:733 #, c-format msgid "Now at %s.\n" msgstr "Teraz: %s.\n" -#: app/flatpak-transaction.c:718 +#: app/flatpak-transaction.c:739 msgid "No updates.\n" msgstr "Brak aktualizacji.\n" -#: app/flatpak-transaction.c:726 +#: app/flatpak-transaction.c:747 msgid "install bundle" msgstr "instalacja pakietu" -#: app/flatpak-transaction.c:727 +#: app/flatpak-transaction.c:748 #, c-format msgid "Installing: %s from bundle %s\n" msgstr "Instalowanie: %s z pakietu %s\n" -#: app/flatpak-transaction.c:739 +#: app/flatpak-transaction.c:760 #, c-format msgid "Warning: Failed to %s %s: %s\n" msgstr "Ostrzeżenie: %s %s się nie powiodła: %s\n" -#: app/flatpak-transaction.c:744 +#: app/flatpak-transaction.c:765 #, c-format msgid "Error: Failed to %s %s: %s\n" msgstr "Błąd: %s %s się nie powiodła: %s\n" -#: app/flatpak-transaction.c:749 +#: app/flatpak-transaction.c:770 msgid "One or more operations failed" msgstr "Jedno lub więcej działań się nie powiodło" -#: common/flatpak-dir.c:872 +#: common/flatpak-dir.c:871 #, c-format msgid "No overrides found for %s" msgstr "Nie odnaleziono zastępników dla %s" -#: common/flatpak-dir.c:1384 +#: common/flatpak-dir.c:1383 #, c-format msgid "While opening repository %s: " msgstr "Podczas otwierania repozytorium %s: " -#: common/flatpak-dir.c:1517 common/flatpak-dir.c:3800 +#: common/flatpak-dir.c:1516 common/flatpak-dir.c:3845 msgid "Can't create deploy directory" msgstr "Nie można utworzyć katalogu wdrażania" -#: common/flatpak-dir.c:1874 +#: common/flatpak-dir.c:1903 #, c-format msgid "Invalid sha256 for extra data uri %s" msgstr "Nieprawidłowa suma SHA256 dla adresu URI %s dodatkowych danych" -#: common/flatpak-dir.c:1879 +#: common/flatpak-dir.c:1908 #, c-format msgid "Empty name for extra data uri %s" msgstr "Pusta nazwa dla adresu URI %s dodatkowych danych" -#: common/flatpak-dir.c:1884 +#: common/flatpak-dir.c:1913 #, c-format msgid "Unsupported extra data uri %s" msgstr "Nieobsługiwany adres URI %s dodatkowych danych" -#: common/flatpak-dir.c:1894 +#: common/flatpak-dir.c:1923 #, c-format msgid "While downloading %s: " msgstr "Podczas pobierania %s: " -#: common/flatpak-dir.c:1899 +#: common/flatpak-dir.c:1928 #, c-format msgid "Wrong size for extra data %s" msgstr "Błędny rozmiar dodatkowych danych %s" -#: common/flatpak-dir.c:1907 +#: common/flatpak-dir.c:1936 #, c-format msgid "Invalid checksum for extra data %s" msgstr "Nieprawidłowa suma kontrolna dodatkowych danych %s" -#: common/flatpak-dir.c:2002 +#: common/flatpak-dir.c:2031 msgid "OCI image specifies the wrong app id" msgstr "Obraz OCI określa błędny identyfikator programu" -#: common/flatpak-dir.c:2123 common/flatpak-dir.c:2342 +#: common/flatpak-dir.c:2161 common/flatpak-dir.c:2380 #, c-format msgid "While pulling %s from remote %s: " msgstr "Podczas pobierania %s z repozytorium %s: " -#: common/flatpak-dir.c:2296 +#: common/flatpak-dir.c:2334 #, c-format msgid "Can't find %s in remote %s" msgstr "Nie można odnaleźć %s w repozytorium %s" -#: common/flatpak-dir.c:2902 +#: common/flatpak-dir.c:2940 msgid "Not enough memory" msgstr "Za mało pamięci" -#: common/flatpak-dir.c:2921 +#: common/flatpak-dir.c:2959 msgid "Failed to read from exported file" msgstr "Odczytanie z wyeksportowanego pliku się nie powiodło" -#: common/flatpak-dir.c:3445 +#: common/flatpak-dir.c:3483 msgid "While getting detached metadata: " msgstr "Podczas pobierania odłączonych metadanych: " -#: common/flatpak-dir.c:3463 +#: common/flatpak-dir.c:3501 msgid "While creating extradir: " msgstr "Podczas tworzenia dodatkowego katalogu: " -#: common/flatpak-dir.c:3484 +#: common/flatpak-dir.c:3522 msgid "Invalid sha256 for extra data" msgstr "Nieprawidłowa suma SHA256 dodatkowych danych" -#: common/flatpak-dir.c:3513 +#: common/flatpak-dir.c:3551 msgid "Wrong size for extra data" msgstr "Błędny rozmiar dodatkowych danych" -#: common/flatpak-dir.c:3517 +#: common/flatpak-dir.c:3555 msgid "Invalid checksum for extra data" msgstr "Nieprawidłowa suma kontrolna dodatkowych danych" -#: common/flatpak-dir.c:3526 +#: common/flatpak-dir.c:3564 #, c-format msgid "While writing extra data file '%s': " msgstr "Podczas zapisywania pliku dodatkowych danych „%s”: " -#: common/flatpak-dir.c:3694 +#: common/flatpak-dir.c:3739 msgid "apply_extra script failed" msgstr "Skrypt „apply_extra” się nie powiódł" -#: common/flatpak-dir.c:3761 +#: common/flatpak-dir.c:3806 #, c-format msgid "While trying to resolve ref %s: " msgstr "Podczas rozwiązywania odniesienia %s: " -#: common/flatpak-dir.c:3776 +#: common/flatpak-dir.c:3821 #, c-format msgid "%s is not available" msgstr "%s jest niedostępne" -#: common/flatpak-dir.c:3789 common/flatpak-dir.c:4037 -#: common/flatpak-dir.c:4640 common/flatpak-dir.c:4660 +#: common/flatpak-dir.c:3834 common/flatpak-dir.c:4082 +#: common/flatpak-dir.c:4685 common/flatpak-dir.c:4705 #, c-format msgid "%s branch %s already installed" msgstr "Już zainstalowano %s gałąź %s" -#: common/flatpak-dir.c:3808 +#: common/flatpak-dir.c:3853 #, c-format msgid "Failed to read commit %s: " msgstr "Odczytanie zatwierdzenia %s się nie powiodło: " -#: common/flatpak-dir.c:3827 +#: common/flatpak-dir.c:3872 #, c-format msgid "While trying to checkout %s into %s: " msgstr "Podczas wymeldowywania %s do %s: " -#: common/flatpak-dir.c:3852 common/flatpak-dir.c:3883 +#: common/flatpak-dir.c:3897 common/flatpak-dir.c:3928 msgid "While trying to checkout metadata subpath: " msgstr "Podczas wymeldowywania podścieżki metadanych: " -#: common/flatpak-dir.c:3893 +#: common/flatpak-dir.c:3938 msgid "While trying to remove existing extra dir: " msgstr "Podczas usuwania istniejącego dodatkowego katalogu: " -#: common/flatpak-dir.c:3904 +#: common/flatpak-dir.c:3949 msgid "While trying to apply extra data: " msgstr "Podczas zastosowywania dodatkowych danych: " -#: common/flatpak-dir.c:4488 +#: common/flatpak-dir.c:4533 #, c-format msgid "This version of %s is already installed" msgstr "Ta wersja programu %s jest już zainstalowana" -#: common/flatpak-dir.c:4495 +#: common/flatpak-dir.c:4540 msgid "Can't change remote during bundle install" msgstr "Nie można zmienić repozytorium podczas instalacji pakietu" -#: common/flatpak-dir.c:4926 +#: common/flatpak-dir.c:4972 #, c-format msgid "%s branch %s is not installed" msgstr "Nie zainstalowano %s gałęzi %s" -#: common/flatpak-dir.c:5170 +#: common/flatpak-dir.c:5216 #, c-format msgid "%s branch %s not installed" msgstr "Nie zainstalowano %s gałęzi %s" -#: common/flatpak-dir.c:5941 +#: common/flatpak-dir.c:5987 #, c-format msgid "Nothing matches %s" msgstr "Nic nie pasuje do %s" -#: common/flatpak-dir.c:6023 +#: common/flatpak-dir.c:6069 #, c-format msgid "Can't find %s%s%s%s%s in remote %s" msgstr "Nie można odnaleźć %s%s%s%s%s w repozytorium %s" -#: common/flatpak-dir.c:6140 +#: common/flatpak-dir.c:6186 #, c-format msgid "%s %s not installed" msgstr "Nie zainstalowano %s %s" -#: common/flatpak-dir.c:6213 +#: common/flatpak-dir.c:6259 #, c-format msgid "Could not find installation %s" msgstr "Nie można odnaleźć instalacji %s" -#: common/flatpak-dir.c:6686 +#: common/flatpak-dir.c:6757 #, c-format msgid "Runtime %s, branch %s is already installed" msgstr "Już zainstalowano środowisko wykonawcze %s, gałąź %s" -#: common/flatpak-dir.c:6687 +#: common/flatpak-dir.c:6758 #, c-format msgid "App %s, branch %s is already installed" msgstr "Już zainstalowano program %s, gałąź %s" -#: common/flatpak-dir.c:7138 +#: common/flatpak-dir.c:7209 msgid "Remote title not set" msgstr "Nie ustawiono tytułu repozytorium" -#: common/flatpak-dir.c:7165 +#: common/flatpak-dir.c:7236 msgid "Remote default-branch not set" msgstr "Nie ustawiono domyślnej gałęzi repozytorium" -#: common/flatpak-dir.c:7308 +#: common/flatpak-dir.c:7379 msgid "No flatpak cache in remote summary" -msgstr "" +msgstr "Brak pamięci podręcznej Flatpak w podsumowaniu repozytorium" -#: common/flatpak-dir.c:7317 +#: common/flatpak-dir.c:7388 #, c-format msgid "No entry for %s in remote summary flatpak cache " msgstr "" +"Brak wpisu dla %s w pamięci podręcznej Flatpak podsumowania repozytorium " #: common/flatpak-run.c:241 #, c-format @@ -1880,51 +1880,45 @@ msgid "Don't require a running session (no cgroups creation)" msgstr "Bez wymagania działającej sesji (bez tworzenia cgroups)" -#: common/flatpak-run.c:1821 +#: common/flatpak-run.c:1839 msgid "Failed to create temporary file" msgstr "Utworzenie pliku tymczasowego się nie powiodło" -#: common/flatpak-run.c:1828 +#: common/flatpak-run.c:1846 msgid "Failed to unlink temporary file" msgstr "Odwiązanie pliku tymczasowego się nie powiodło" -#: common/flatpak-run.c:1846 +#: common/flatpak-run.c:1864 msgid "Failed to write to temporary file" msgstr "Zapisanie do pliku tymczasowego się nie powiodło" -#: common/flatpak-run.c:3220 +#: common/flatpak-run.c:3240 #, c-format msgid "Failed to open flatpak-info temp file: %s" msgstr "Otwarcie pliku tymczasowego „flatpak-info” się nie powiodło: %s" -#: common/flatpak-run.c:3264 +#: common/flatpak-run.c:3284 #, c-format msgid "Failed to open temp file: %s" msgstr "Otwarcie pliku tymczasowego się nie powiodło: %s" -#: common/flatpak-run.c:3548 +#: common/flatpak-run.c:3568 msgid "Unable to create sync pipe" msgstr "Utworzenie potoku synchronizacji się nie powiodło" -#: common/flatpak-run.c:3573 +#: common/flatpak-run.c:3593 #, c-format msgid "Failed to open app info file: %s" msgstr "Otwarcie pliku informacji o programie się nie powiodło: %s" -#: common/flatpak-run.c:3603 +#: common/flatpak-run.c:3623 msgid "Failed to sync with dbus proxy" msgstr "Synchronizacja z pośrednikiem D-Bus się nie powiodła" -#: common/flatpak-utils.c:2524 +#: common/flatpak-utils.c:2523 msgid "No extra data sources" msgstr "Brak źródeł dodatkowych danych" -#~ msgid "Data not found" -#~ msgstr "Nie odnaleziono danych" - -#~ msgid "Data not found for ref %s" -#~ msgstr "Nie odnaleziono danych dla odniesienia %s" - #~ msgid "Install signed application" #~ msgstr "Instalacja podpisanego programu" Binary files /tmp/tmpu7qeol/Yf3MfDJ1cf/flatpak-0.8.3/po/pt_BR.gmo and /tmp/tmpu7qeol/jYLJXs2Rih/flatpak-0.8.4/po/pt_BR.gmo differ diff -Nru flatpak-0.8.3/po/pt_BR.po flatpak-0.8.4/po/pt_BR.po --- flatpak-0.8.3/po/pt_BR.po 2017-02-14 10:16:29.000000000 +0000 +++ flatpak-0.8.4/po/pt_BR.po 2017-03-10 09:43:58.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/flatpak/flatpak/issues\n" -"POT-Creation-Date: 2017-02-14 11:16+0100\n" +"POT-Creation-Date: 2017-03-10 10:43+0100\n" "PO-Revision-Date: 2017-01-10 14:11-0300\n" "Last-Translator: Fábio Nogueira \n" "Language-Team: \n" @@ -136,7 +136,7 @@ #: app/flatpak-builtins-document-list.c:70 #: app/flatpak-builtins-document-unexport.c:67 app/flatpak-builtins-info.c:105 #: app/flatpak-builtins-install.c:251 app/flatpak-builtins-install.c:329 -#: app/flatpak-builtins-list.c:361 app/flatpak-builtins-list-remotes.c:65 +#: app/flatpak-builtins-list.c:354 app/flatpak-builtins-list-remotes.c:65 #: app/flatpak-builtins-ls-remote.c:80 app/flatpak-builtins-make-current.c:67 #: app/flatpak-builtins-override.c:66 msgid "Too many arguments" @@ -282,7 +282,7 @@ msgid "Missing '=' in bind mount option '%s'" msgstr "" -#: app/flatpak-builtins-build.c:258 common/flatpak-run.c:4321 +#: app/flatpak-builtins-build.c:258 common/flatpak-run.c:4344 msgid "Unable to start app" msgstr "Incapaz de iniciar o app" @@ -934,7 +934,7 @@ msgid "Arch to show" msgstr "Arquitetura a exibir" -#: app/flatpak-builtins-list.c:354 +#: app/flatpak-builtins-list.c:347 msgid " - List installed apps and/or runtimes" msgstr "" @@ -1130,7 +1130,7 @@ msgid "Must specify at least one REF" msgstr "" -#: app/flatpak-builtins-uninstall.c:129 app/flatpak-transaction.c:333 +#: app/flatpak-builtins-uninstall.c:129 app/flatpak-transaction.c:337 #, c-format msgid "Warning: Problem looking for related refs: %s\n" msgstr "" @@ -1390,301 +1390,301 @@ msgid "error:" msgstr "erro:" -#: app/flatpak-transaction.c:295 +#: app/flatpak-transaction.c:299 #, c-format msgid "Found in remote %s, do you want to install it?" msgstr "" -#: app/flatpak-transaction.c:300 +#: app/flatpak-transaction.c:304 msgid "Found in several remotes:\n" msgstr "" -#: app/flatpak-transaction.c:305 +#: app/flatpak-transaction.c:309 msgid "Which do you want to install (0 to abort)?" msgstr "" -#: app/flatpak-transaction.c:395 +#: app/flatpak-transaction.c:399 #, c-format msgid "Required runtime for %s (%s) is not installed, searching...\n" msgstr "" -#: app/flatpak-transaction.c:401 +#: app/flatpak-transaction.c:405 #, c-format msgid "The required runtime %s was not found in a configured remote.\n" msgstr "" -#: app/flatpak-transaction.c:462 common/flatpak-dir.c:979 -#: common/flatpak-dir.c:1236 common/flatpak-dir.c:1272 -#: common/flatpak-dir.c:1294 common/flatpak-dir.c:7639 -#: common/flatpak-utils.c:1116 +#: app/flatpak-transaction.c:466 common/flatpak-dir.c:978 +#: common/flatpak-dir.c:1235 common/flatpak-dir.c:1271 +#: common/flatpak-dir.c:1293 common/flatpak-dir.c:7710 +#: common/flatpak-utils.c:1114 #, c-format msgid "%s not installed" msgstr "" -#: app/flatpak-transaction.c:468 +#: app/flatpak-transaction.c:472 #, c-format msgid "Remote %s disabled, ignoring %s update" msgstr "" -#: app/flatpak-transaction.c:479 +#: app/flatpak-transaction.c:483 #, c-format msgid "%s already installed" msgstr "" -#: app/flatpak-transaction.c:523 +#: app/flatpak-transaction.c:527 #, c-format msgid "%s needs a later flatpak version (%s)" msgstr "" -#: app/flatpak-transaction.c:616 common/flatpak-dir.c:1999 +#: app/flatpak-transaction.c:620 common/flatpak-dir.c:2028 msgid "OCI image is not a flatpak (missing ref)" msgstr "" -#: app/flatpak-transaction.c:684 +#: app/flatpak-transaction.c:705 msgid "install" msgstr "instalar" -#: app/flatpak-transaction.c:685 +#: app/flatpak-transaction.c:706 #, c-format msgid "Installing: %s from %s\n" msgstr "Instalando: %s de %s\n" -#: app/flatpak-transaction.c:696 +#: app/flatpak-transaction.c:717 msgid "update" msgstr "atualizar" -#: app/flatpak-transaction.c:697 +#: app/flatpak-transaction.c:718 #, c-format msgid "Updating: %s from %s\n" msgstr "Atualizando: %s de %s\n" -#: app/flatpak-transaction.c:712 +#: app/flatpak-transaction.c:733 #, c-format msgid "Now at %s.\n" msgstr "" -#: app/flatpak-transaction.c:718 +#: app/flatpak-transaction.c:739 msgid "No updates.\n" msgstr "Nenhuma atualização.\n" -#: app/flatpak-transaction.c:726 +#: app/flatpak-transaction.c:747 msgid "install bundle" msgstr "" -#: app/flatpak-transaction.c:727 +#: app/flatpak-transaction.c:748 #, c-format msgid "Installing: %s from bundle %s\n" msgstr "" -#: app/flatpak-transaction.c:739 +#: app/flatpak-transaction.c:760 #, c-format msgid "Warning: Failed to %s %s: %s\n" msgstr "" -#: app/flatpak-transaction.c:744 +#: app/flatpak-transaction.c:765 #, c-format msgid "Error: Failed to %s %s: %s\n" msgstr "" -#: app/flatpak-transaction.c:749 +#: app/flatpak-transaction.c:770 msgid "One or more operations failed" msgstr "" -#: common/flatpak-dir.c:872 +#: common/flatpak-dir.c:871 #, c-format msgid "No overrides found for %s" msgstr "" -#: common/flatpak-dir.c:1384 +#: common/flatpak-dir.c:1383 #, c-format msgid "While opening repository %s: " msgstr "" -#: common/flatpak-dir.c:1517 common/flatpak-dir.c:3800 +#: common/flatpak-dir.c:1516 common/flatpak-dir.c:3845 msgid "Can't create deploy directory" msgstr "Não foi possível criar um diretório de deploy" -#: common/flatpak-dir.c:1874 +#: common/flatpak-dir.c:1903 #, c-format msgid "Invalid sha256 for extra data uri %s" msgstr "" -#: common/flatpak-dir.c:1879 +#: common/flatpak-dir.c:1908 #, c-format msgid "Empty name for extra data uri %s" msgstr "" -#: common/flatpak-dir.c:1884 +#: common/flatpak-dir.c:1913 #, c-format msgid "Unsupported extra data uri %s" msgstr "" -#: common/flatpak-dir.c:1894 +#: common/flatpak-dir.c:1923 #, c-format msgid "While downloading %s: " msgstr "" -#: common/flatpak-dir.c:1899 +#: common/flatpak-dir.c:1928 #, c-format msgid "Wrong size for extra data %s" msgstr "" -#: common/flatpak-dir.c:1907 +#: common/flatpak-dir.c:1936 #, c-format msgid "Invalid checksum for extra data %s" msgstr "" -#: common/flatpak-dir.c:2002 +#: common/flatpak-dir.c:2031 msgid "OCI image specifies the wrong app id" msgstr "" -#: common/flatpak-dir.c:2123 common/flatpak-dir.c:2342 +#: common/flatpak-dir.c:2161 common/flatpak-dir.c:2380 #, c-format msgid "While pulling %s from remote %s: " msgstr "" -#: common/flatpak-dir.c:2296 +#: common/flatpak-dir.c:2334 #, c-format msgid "Can't find %s in remote %s" msgstr "" -#: common/flatpak-dir.c:2902 +#: common/flatpak-dir.c:2940 msgid "Not enough memory" msgstr "" -#: common/flatpak-dir.c:2921 +#: common/flatpak-dir.c:2959 msgid "Failed to read from exported file" msgstr "" -#: common/flatpak-dir.c:3445 +#: common/flatpak-dir.c:3483 msgid "While getting detached metadata: " msgstr "" -#: common/flatpak-dir.c:3463 +#: common/flatpak-dir.c:3501 msgid "While creating extradir: " msgstr "" -#: common/flatpak-dir.c:3484 +#: common/flatpak-dir.c:3522 msgid "Invalid sha256 for extra data" msgstr "" -#: common/flatpak-dir.c:3513 +#: common/flatpak-dir.c:3551 msgid "Wrong size for extra data" msgstr "" -#: common/flatpak-dir.c:3517 +#: common/flatpak-dir.c:3555 msgid "Invalid checksum for extra data" msgstr "" -#: common/flatpak-dir.c:3526 +#: common/flatpak-dir.c:3564 #, c-format msgid "While writing extra data file '%s': " msgstr "" -#: common/flatpak-dir.c:3694 +#: common/flatpak-dir.c:3739 msgid "apply_extra script failed" msgstr "" -#: common/flatpak-dir.c:3761 +#: common/flatpak-dir.c:3806 #, c-format msgid "While trying to resolve ref %s: " msgstr "" -#: common/flatpak-dir.c:3776 +#: common/flatpak-dir.c:3821 #, c-format msgid "%s is not available" msgstr "%s não está disponível" -#: common/flatpak-dir.c:3789 common/flatpak-dir.c:4037 -#: common/flatpak-dir.c:4640 common/flatpak-dir.c:4660 +#: common/flatpak-dir.c:3834 common/flatpak-dir.c:4082 +#: common/flatpak-dir.c:4685 common/flatpak-dir.c:4705 #, c-format msgid "%s branch %s already installed" msgstr "" -#: common/flatpak-dir.c:3808 +#: common/flatpak-dir.c:3853 #, c-format msgid "Failed to read commit %s: " msgstr "" -#: common/flatpak-dir.c:3827 +#: common/flatpak-dir.c:3872 #, c-format msgid "While trying to checkout %s into %s: " msgstr "" -#: common/flatpak-dir.c:3852 common/flatpak-dir.c:3883 +#: common/flatpak-dir.c:3897 common/flatpak-dir.c:3928 msgid "While trying to checkout metadata subpath: " msgstr "" -#: common/flatpak-dir.c:3893 +#: common/flatpak-dir.c:3938 msgid "While trying to remove existing extra dir: " msgstr "" -#: common/flatpak-dir.c:3904 +#: common/flatpak-dir.c:3949 msgid "While trying to apply extra data: " msgstr "" -#: common/flatpak-dir.c:4488 +#: common/flatpak-dir.c:4533 #, c-format msgid "This version of %s is already installed" msgstr "" -#: common/flatpak-dir.c:4495 +#: common/flatpak-dir.c:4540 msgid "Can't change remote during bundle install" msgstr "" -#: common/flatpak-dir.c:4926 +#: common/flatpak-dir.c:4972 #, c-format msgid "%s branch %s is not installed" msgstr "" -#: common/flatpak-dir.c:5170 +#: common/flatpak-dir.c:5216 #, c-format msgid "%s branch %s not installed" msgstr "" -#: common/flatpak-dir.c:5941 +#: common/flatpak-dir.c:5987 #, c-format msgid "Nothing matches %s" msgstr "" -#: common/flatpak-dir.c:6023 +#: common/flatpak-dir.c:6069 #, c-format msgid "Can't find %s%s%s%s%s in remote %s" msgstr "" -#: common/flatpak-dir.c:6140 +#: common/flatpak-dir.c:6186 #, c-format msgid "%s %s not installed" msgstr "%s %s não instalados" -#: common/flatpak-dir.c:6213 +#: common/flatpak-dir.c:6259 #, c-format msgid "Could not find installation %s" msgstr "" -#: common/flatpak-dir.c:6686 +#: common/flatpak-dir.c:6757 #, c-format msgid "Runtime %s, branch %s is already installed" msgstr "" -#: common/flatpak-dir.c:6687 +#: common/flatpak-dir.c:6758 #, c-format msgid "App %s, branch %s is already installed" msgstr "" -#: common/flatpak-dir.c:7138 +#: common/flatpak-dir.c:7209 msgid "Remote title not set" msgstr "" -#: common/flatpak-dir.c:7165 +#: common/flatpak-dir.c:7236 msgid "Remote default-branch not set" msgstr "" -#: common/flatpak-dir.c:7308 +#: common/flatpak-dir.c:7379 msgid "No flatpak cache in remote summary" msgstr "" -#: common/flatpak-dir.c:7317 +#: common/flatpak-dir.c:7388 #, c-format msgid "No entry for %s in remote summary flatpak cache " msgstr "" @@ -1849,41 +1849,41 @@ msgid "Don't require a running session (no cgroups creation)" msgstr "" -#: common/flatpak-run.c:1821 +#: common/flatpak-run.c:1839 msgid "Failed to create temporary file" msgstr "" -#: common/flatpak-run.c:1828 +#: common/flatpak-run.c:1846 msgid "Failed to unlink temporary file" msgstr "" -#: common/flatpak-run.c:1846 +#: common/flatpak-run.c:1864 msgid "Failed to write to temporary file" msgstr "" -#: common/flatpak-run.c:3220 +#: common/flatpak-run.c:3240 #, c-format msgid "Failed to open flatpak-info temp file: %s" msgstr "" -#: common/flatpak-run.c:3264 +#: common/flatpak-run.c:3284 #, c-format msgid "Failed to open temp file: %s" msgstr "" -#: common/flatpak-run.c:3548 +#: common/flatpak-run.c:3568 msgid "Unable to create sync pipe" msgstr "" -#: common/flatpak-run.c:3573 +#: common/flatpak-run.c:3593 #, c-format msgid "Failed to open app info file: %s" msgstr "" -#: common/flatpak-run.c:3603 +#: common/flatpak-run.c:3623 msgid "Failed to sync with dbus proxy" msgstr "" -#: common/flatpak-utils.c:2524 +#: common/flatpak-utils.c:2523 msgid "No extra data sources" msgstr "" Binary files /tmp/tmpu7qeol/Yf3MfDJ1cf/flatpak-0.8.3/po/ru.gmo and /tmp/tmpu7qeol/jYLJXs2Rih/flatpak-0.8.4/po/ru.gmo differ diff -Nru flatpak-0.8.3/po/ru.po flatpak-0.8.4/po/ru.po --- flatpak-0.8.3/po/ru.po 2017-02-14 10:16:29.000000000 +0000 +++ flatpak-0.8.4/po/ru.po 2017-03-10 09:43:58.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: flatpak 0.8.0\n" "Report-Msgid-Bugs-To: https://github.com/flatpak/flatpak/issues\n" -"POT-Creation-Date: 2017-02-14 11:16+0100\n" +"POT-Creation-Date: 2017-03-10 10:43+0100\n" "PO-Revision-Date: 2017-01-18 11:30+MSK\n" "Last-Translator: romiq , 2017\n" "Language-Team: Russian (Russia) (https://www.transifex.com/flatpak/" @@ -134,7 +134,7 @@ #: app/flatpak-builtins-document-list.c:70 #: app/flatpak-builtins-document-unexport.c:67 app/flatpak-builtins-info.c:105 #: app/flatpak-builtins-install.c:251 app/flatpak-builtins-install.c:329 -#: app/flatpak-builtins-list.c:361 app/flatpak-builtins-list-remotes.c:65 +#: app/flatpak-builtins-list.c:354 app/flatpak-builtins-list-remotes.c:65 #: app/flatpak-builtins-ls-remote.c:80 app/flatpak-builtins-make-current.c:67 #: app/flatpak-builtins-override.c:66 msgid "Too many arguments" @@ -285,7 +285,7 @@ msgid "Missing '=' in bind mount option '%s'" msgstr "" -#: app/flatpak-builtins-build.c:258 common/flatpak-run.c:4321 +#: app/flatpak-builtins-build.c:258 common/flatpak-run.c:4344 msgid "Unable to start app" msgstr "Невозможно запустить приложение" @@ -951,7 +951,7 @@ msgid "Arch to show" msgstr "Показать архитектуры" -#: app/flatpak-builtins-list.c:354 +#: app/flatpak-builtins-list.c:347 msgid " - List installed apps and/or runtimes" msgstr "- Показать список установленных приложений и/или сред исполнения" @@ -1149,7 +1149,7 @@ msgid "Must specify at least one REF" msgstr "Должна быть указана как минимум одна ССЫЛКА" -#: app/flatpak-builtins-uninstall.c:129 app/flatpak-transaction.c:333 +#: app/flatpak-builtins-uninstall.c:129 app/flatpak-transaction.c:337 #, c-format msgid "Warning: Problem looking for related refs: %s\n" msgstr "Предупреждение: Проблема при поиске связанных ссылок: %s\n" @@ -1406,303 +1406,303 @@ msgid "error:" msgstr "ошибка:" -#: app/flatpak-transaction.c:295 +#: app/flatpak-transaction.c:299 #, c-format msgid "Found in remote %s, do you want to install it?" msgstr "Обнаружен удалённый репозиторий %s, установить?" -#: app/flatpak-transaction.c:300 +#: app/flatpak-transaction.c:304 msgid "Found in several remotes:\n" msgstr "Обнаружено несколько удалённых репозиториев:\n" -#: app/flatpak-transaction.c:305 +#: app/flatpak-transaction.c:309 msgid "Which do you want to install (0 to abort)?" msgstr "Которую версию установить (0 - отмена)?" -#: app/flatpak-transaction.c:395 +#: app/flatpak-transaction.c:399 #, c-format msgid "Required runtime for %s (%s) is not installed, searching...\n" msgstr "Требуемая среда исполнения для %s (%s) не установлена, поиск...\n" -#: app/flatpak-transaction.c:401 +#: app/flatpak-transaction.c:405 #, c-format msgid "The required runtime %s was not found in a configured remote.\n" msgstr "" "Требуемая среда исполнения %s не найдена в настроенных удалённых " "репозиториях.\n" -#: app/flatpak-transaction.c:462 common/flatpak-dir.c:979 -#: common/flatpak-dir.c:1236 common/flatpak-dir.c:1272 -#: common/flatpak-dir.c:1294 common/flatpak-dir.c:7639 -#: common/flatpak-utils.c:1116 +#: app/flatpak-transaction.c:466 common/flatpak-dir.c:978 +#: common/flatpak-dir.c:1235 common/flatpak-dir.c:1271 +#: common/flatpak-dir.c:1293 common/flatpak-dir.c:7710 +#: common/flatpak-utils.c:1114 #, c-format msgid "%s not installed" msgstr "%s не установлено" -#: app/flatpak-transaction.c:468 +#: app/flatpak-transaction.c:472 #, c-format msgid "Remote %s disabled, ignoring %s update" msgstr "Удалённый репозиторий %s отключен, обновление %s пропущено" -#: app/flatpak-transaction.c:479 +#: app/flatpak-transaction.c:483 #, c-format msgid "%s already installed" msgstr "%s уже установлено" -#: app/flatpak-transaction.c:523 +#: app/flatpak-transaction.c:527 #, c-format msgid "%s needs a later flatpak version (%s)" msgstr "%s требует более новую версию flatpak (%s)" -#: app/flatpak-transaction.c:616 common/flatpak-dir.c:1999 +#: app/flatpak-transaction.c:620 common/flatpak-dir.c:2028 msgid "OCI image is not a flatpak (missing ref)" msgstr "образ OCI не предназначен для flatpak (отсутствует ссылка)" -#: app/flatpak-transaction.c:684 +#: app/flatpak-transaction.c:705 msgid "install" msgstr "установить" -#: app/flatpak-transaction.c:685 +#: app/flatpak-transaction.c:706 #, c-format msgid "Installing: %s from %s\n" msgstr "Установка: %s из %s\n" -#: app/flatpak-transaction.c:696 +#: app/flatpak-transaction.c:717 msgid "update" msgstr "обновить" -#: app/flatpak-transaction.c:697 +#: app/flatpak-transaction.c:718 #, c-format msgid "Updating: %s from %s\n" msgstr "Обновление: %s из %s\n" -#: app/flatpak-transaction.c:712 +#: app/flatpak-transaction.c:733 #, c-format msgid "Now at %s.\n" msgstr "В настоящее время на %s.\n" -#: app/flatpak-transaction.c:718 +#: app/flatpak-transaction.c:739 msgid "No updates.\n" msgstr "Нет обновлений\n" -#: app/flatpak-transaction.c:726 +#: app/flatpak-transaction.c:747 msgid "install bundle" msgstr "установить пакет" -#: app/flatpak-transaction.c:727 +#: app/flatpak-transaction.c:748 #, c-format msgid "Installing: %s from bundle %s\n" msgstr "Установка: %s из пакета %s\n" -#: app/flatpak-transaction.c:739 +#: app/flatpak-transaction.c:760 #, c-format msgid "Warning: Failed to %s %s: %s\n" msgstr "Предупреждение: Не удалось %s %s: %s\n" -#: app/flatpak-transaction.c:744 +#: app/flatpak-transaction.c:765 #, c-format msgid "Error: Failed to %s %s: %s\n" msgstr "Ошибка: Не удалось %s %s: %s\n" -#: app/flatpak-transaction.c:749 +#: app/flatpak-transaction.c:770 msgid "One or more operations failed" msgstr "Одна или более операций закончилась с ошибкой" -#: common/flatpak-dir.c:872 +#: common/flatpak-dir.c:871 #, c-format msgid "No overrides found for %s" msgstr "" -#: common/flatpak-dir.c:1384 +#: common/flatpak-dir.c:1383 #, c-format msgid "While opening repository %s: " msgstr "Во время открытия репозитория %s:" -#: common/flatpak-dir.c:1517 common/flatpak-dir.c:3800 +#: common/flatpak-dir.c:1516 common/flatpak-dir.c:3845 msgid "Can't create deploy directory" msgstr "Невозможно создать каталог для развёртывания" -#: common/flatpak-dir.c:1874 +#: common/flatpak-dir.c:1903 #, c-format msgid "Invalid sha256 for extra data uri %s" msgstr "Некорректная сумма sha256 для расширенных данных по адресу %s" -#: common/flatpak-dir.c:1879 +#: common/flatpak-dir.c:1908 #, c-format msgid "Empty name for extra data uri %s" msgstr "Пустое имя для расширенных данных по адресу %s" -#: common/flatpak-dir.c:1884 +#: common/flatpak-dir.c:1913 #, c-format msgid "Unsupported extra data uri %s" msgstr "Неподдерживаемые расширенные данные по адресу %s" -#: common/flatpak-dir.c:1894 +#: common/flatpak-dir.c:1923 #, c-format msgid "While downloading %s: " msgstr "Во время загрузки %s: " -#: common/flatpak-dir.c:1899 +#: common/flatpak-dir.c:1928 #, c-format msgid "Wrong size for extra data %s" msgstr "Неправильный размер расширенных данных по адресу %s" -#: common/flatpak-dir.c:1907 +#: common/flatpak-dir.c:1936 #, c-format msgid "Invalid checksum for extra data %s" msgstr "Некорректная контрольная сумма расширенных данных по адресу %s" -#: common/flatpak-dir.c:2002 +#: common/flatpak-dir.c:2031 msgid "OCI image specifies the wrong app id" msgstr "В образ OCI указан некорректное id приложения" -#: common/flatpak-dir.c:2123 common/flatpak-dir.c:2342 +#: common/flatpak-dir.c:2161 common/flatpak-dir.c:2380 #, c-format msgid "While pulling %s from remote %s: " msgstr "Во время получения %s из удалённого репозитория %s: " -#: common/flatpak-dir.c:2296 +#: common/flatpak-dir.c:2334 #, c-format msgid "Can't find %s in remote %s" msgstr "Не найден %s в удалённом репозитории %s" -#: common/flatpak-dir.c:2902 +#: common/flatpak-dir.c:2940 msgid "Not enough memory" msgstr "Не достаточно памяти" -#: common/flatpak-dir.c:2921 +#: common/flatpak-dir.c:2959 msgid "Failed to read from exported file" msgstr "Ошибка чтения из экспортированного файла" -#: common/flatpak-dir.c:3445 +#: common/flatpak-dir.c:3483 msgid "While getting detached metadata: " msgstr "Во время получения отсоединённых метаданных:" -#: common/flatpak-dir.c:3463 +#: common/flatpak-dir.c:3501 msgid "While creating extradir: " msgstr "Во время создания каталога с расширенными данными:" -#: common/flatpak-dir.c:3484 +#: common/flatpak-dir.c:3522 msgid "Invalid sha256 for extra data" msgstr "Некорректная контрольная сумма sha256 для расширенных данных" -#: common/flatpak-dir.c:3513 +#: common/flatpak-dir.c:3551 msgid "Wrong size for extra data" msgstr "Некорректный размер расширенных данных" -#: common/flatpak-dir.c:3517 +#: common/flatpak-dir.c:3555 msgid "Invalid checksum for extra data" msgstr "Некорректная контрольная сумма для расширенных данных" -#: common/flatpak-dir.c:3526 +#: common/flatpak-dir.c:3564 #, c-format msgid "While writing extra data file '%s': " msgstr "Во время записи в файл расширенных данных '%s': " -#: common/flatpak-dir.c:3694 +#: common/flatpak-dir.c:3739 msgid "apply_extra script failed" msgstr "скрипт apply_extra закончился с ошибкой" -#: common/flatpak-dir.c:3761 +#: common/flatpak-dir.c:3806 #, c-format msgid "While trying to resolve ref %s: " msgstr "Во время поиска назначения ссылки %s: " -#: common/flatpak-dir.c:3776 +#: common/flatpak-dir.c:3821 #, c-format msgid "%s is not available" msgstr "%s не доступно" -#: common/flatpak-dir.c:3789 common/flatpak-dir.c:4037 -#: common/flatpak-dir.c:4640 common/flatpak-dir.c:4660 +#: common/flatpak-dir.c:3834 common/flatpak-dir.c:4082 +#: common/flatpak-dir.c:4685 common/flatpak-dir.c:4705 #, c-format msgid "%s branch %s already installed" msgstr "%s ветка %s уже установлено" -#: common/flatpak-dir.c:3808 +#: common/flatpak-dir.c:3853 #, c-format msgid "Failed to read commit %s: " msgstr "Ошибка чтения зафиксированного изменения %s: " -#: common/flatpak-dir.c:3827 +#: common/flatpak-dir.c:3872 #, c-format msgid "While trying to checkout %s into %s: " msgstr "Во время получения %s в %s: " -#: common/flatpak-dir.c:3852 common/flatpak-dir.c:3883 +#: common/flatpak-dir.c:3897 common/flatpak-dir.c:3928 msgid "While trying to checkout metadata subpath: " msgstr "Во время получения метаданных подкаталога " -#: common/flatpak-dir.c:3893 +#: common/flatpak-dir.c:3938 msgid "While trying to remove existing extra dir: " msgstr "Во время удаления существующего каталога с расширенными данными: " -#: common/flatpak-dir.c:3904 +#: common/flatpak-dir.c:3949 msgid "While trying to apply extra data: " msgstr "Во время применения расширенных данных: " -#: common/flatpak-dir.c:4488 +#: common/flatpak-dir.c:4533 #, c-format msgid "This version of %s is already installed" msgstr "Указанная версия %s уже установлена" -#: common/flatpak-dir.c:4495 +#: common/flatpak-dir.c:4540 msgid "Can't change remote during bundle install" msgstr "Невозможно изменить удалённый репозиторий во время установки пакета" -#: common/flatpak-dir.c:4926 +#: common/flatpak-dir.c:4972 #, c-format msgid "%s branch %s is not installed" msgstr "%s ветка %s не установлено" -#: common/flatpak-dir.c:5170 +#: common/flatpak-dir.c:5216 #, c-format msgid "%s branch %s not installed" msgstr "%s ветка %s не установлено" -#: common/flatpak-dir.c:5941 +#: common/flatpak-dir.c:5987 #, c-format msgid "Nothing matches %s" msgstr "Совпадений не обнаружено %s" -#: common/flatpak-dir.c:6023 +#: common/flatpak-dir.c:6069 #, c-format msgid "Can't find %s%s%s%s%s in remote %s" msgstr "Невозможно найти %s%s%s%s%s в удалённом репозитории %s" -#: common/flatpak-dir.c:6140 +#: common/flatpak-dir.c:6186 #, c-format msgid "%s %s not installed" msgstr "%s %s не установлено" -#: common/flatpak-dir.c:6213 +#: common/flatpak-dir.c:6259 #, c-format msgid "Could not find installation %s" msgstr "Не возможно найти %s в установленных" -#: common/flatpak-dir.c:6686 +#: common/flatpak-dir.c:6757 #, c-format msgid "Runtime %s, branch %s is already installed" msgstr "Среда исполнения %s, ветка %s уже установлено" -#: common/flatpak-dir.c:6687 +#: common/flatpak-dir.c:6758 #, c-format msgid "App %s, branch %s is already installed" msgstr "Приложение %s, ветка %s уже установлено" -#: common/flatpak-dir.c:7138 +#: common/flatpak-dir.c:7209 msgid "Remote title not set" msgstr "Заголовок удаленного репозитория не установлен" -#: common/flatpak-dir.c:7165 +#: common/flatpak-dir.c:7236 msgid "Remote default-branch not set" msgstr "Ветка по умолчанию в удалённом репозитории не устаноавлена" -#: common/flatpak-dir.c:7308 +#: common/flatpak-dir.c:7379 msgid "No flatpak cache in remote summary" msgstr "No flatpak cache in remote summary" -#: common/flatpak-dir.c:7317 +#: common/flatpak-dir.c:7388 #, c-format msgid "No entry for %s in remote summary flatpak cache " msgstr "" @@ -1867,41 +1867,41 @@ msgid "Don't require a running session (no cgroups creation)" msgstr "" -#: common/flatpak-run.c:1821 +#: common/flatpak-run.c:1839 msgid "Failed to create temporary file" msgstr "Ошибка при создании временного файла" -#: common/flatpak-run.c:1828 +#: common/flatpak-run.c:1846 msgid "Failed to unlink temporary file" msgstr "" -#: common/flatpak-run.c:1846 +#: common/flatpak-run.c:1864 msgid "Failed to write to temporary file" msgstr "" -#: common/flatpak-run.c:3220 +#: common/flatpak-run.c:3240 #, c-format msgid "Failed to open flatpak-info temp file: %s" msgstr "" -#: common/flatpak-run.c:3264 +#: common/flatpak-run.c:3284 #, c-format msgid "Failed to open temp file: %s" msgstr "" -#: common/flatpak-run.c:3548 +#: common/flatpak-run.c:3568 msgid "Unable to create sync pipe" msgstr "" -#: common/flatpak-run.c:3573 +#: common/flatpak-run.c:3593 #, c-format msgid "Failed to open app info file: %s" msgstr "" -#: common/flatpak-run.c:3603 +#: common/flatpak-run.c:3623 msgid "Failed to sync with dbus proxy" msgstr "" -#: common/flatpak-utils.c:2524 +#: common/flatpak-utils.c:2523 msgid "No extra data sources" msgstr "" Binary files /tmp/tmpu7qeol/Yf3MfDJ1cf/flatpak-0.8.3/po/sk.gmo and /tmp/tmpu7qeol/jYLJXs2Rih/flatpak-0.8.4/po/sk.gmo differ diff -Nru flatpak-0.8.3/po/sk.po flatpak-0.8.4/po/sk.po --- flatpak-0.8.3/po/sk.po 2017-02-14 10:16:29.000000000 +0000 +++ flatpak-0.8.4/po/sk.po 2017-03-10 09:43:57.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: flatpak master\n" "Report-Msgid-Bugs-To: https://github.com/flatpak/flatpak/issues\n" -"POT-Creation-Date: 2017-02-14 11:16+0100\n" +"POT-Creation-Date: 2017-03-10 10:43+0100\n" "PO-Revision-Date: 2017-01-23 18:19+0100\n" "Last-Translator: Dušan Kazik \n" "Language-Team: Slovak \n" @@ -133,7 +133,7 @@ #: app/flatpak-builtins-document-list.c:70 #: app/flatpak-builtins-document-unexport.c:67 app/flatpak-builtins-info.c:105 #: app/flatpak-builtins-install.c:251 app/flatpak-builtins-install.c:329 -#: app/flatpak-builtins-list.c:361 app/flatpak-builtins-list-remotes.c:65 +#: app/flatpak-builtins-list.c:354 app/flatpak-builtins-list-remotes.c:65 #: app/flatpak-builtins-ls-remote.c:80 app/flatpak-builtins-make-current.c:67 #: app/flatpak-builtins-override.c:66 msgid "Too many arguments" @@ -281,7 +281,7 @@ msgid "Missing '=' in bind mount option '%s'" msgstr "" -#: app/flatpak-builtins-build.c:258 common/flatpak-run.c:4321 +#: app/flatpak-builtins-build.c:258 common/flatpak-run.c:4344 msgid "Unable to start app" msgstr "Nie je možné spustiť aplikáciu" @@ -944,7 +944,7 @@ msgid "Arch to show" msgstr "Architektúra. ktorá sa má zobraziť" -#: app/flatpak-builtins-list.c:354 +#: app/flatpak-builtins-list.c:347 msgid " - List installed apps and/or runtimes" msgstr "" @@ -1141,7 +1141,7 @@ msgid "Must specify at least one REF" msgstr "" -#: app/flatpak-builtins-uninstall.c:129 app/flatpak-transaction.c:333 +#: app/flatpak-builtins-uninstall.c:129 app/flatpak-transaction.c:337 #, c-format msgid "Warning: Problem looking for related refs: %s\n" msgstr "" @@ -1401,305 +1401,305 @@ msgid "error:" msgstr "chyba:" -#: app/flatpak-transaction.c:295 +#: app/flatpak-transaction.c:299 #, c-format msgid "Found in remote %s, do you want to install it?" msgstr "Nájdené vo vzdialenom repozitári %s. Chcete vykonať inštaláciu?" -#: app/flatpak-transaction.c:300 +#: app/flatpak-transaction.c:304 msgid "Found in several remotes:\n" msgstr "Nájdené v niekoľkých vzdialených repozitároch:\n" -#: app/flatpak-transaction.c:305 +#: app/flatpak-transaction.c:309 msgid "Which do you want to install (0 to abort)?" msgstr "" -#: app/flatpak-transaction.c:395 +#: app/flatpak-transaction.c:399 #, c-format msgid "Required runtime for %s (%s) is not installed, searching...\n" msgstr "" "Požadované prostredie pre %s (%s) nie je nainštalované. Vyhľadáva sa...\n" -#: app/flatpak-transaction.c:401 +#: app/flatpak-transaction.c:405 #, c-format msgid "The required runtime %s was not found in a configured remote.\n" msgstr "" -#: app/flatpak-transaction.c:462 common/flatpak-dir.c:979 -#: common/flatpak-dir.c:1236 common/flatpak-dir.c:1272 -#: common/flatpak-dir.c:1294 common/flatpak-dir.c:7639 -#: common/flatpak-utils.c:1116 +#: app/flatpak-transaction.c:466 common/flatpak-dir.c:978 +#: common/flatpak-dir.c:1235 common/flatpak-dir.c:1271 +#: common/flatpak-dir.c:1293 common/flatpak-dir.c:7710 +#: common/flatpak-utils.c:1114 #, c-format msgid "%s not installed" msgstr "" -#: app/flatpak-transaction.c:468 +#: app/flatpak-transaction.c:472 #, c-format msgid "Remote %s disabled, ignoring %s update" msgstr "" -#: app/flatpak-transaction.c:479 +#: app/flatpak-transaction.c:483 #, fuzzy, c-format msgid "%s already installed" msgstr "Aplikácia %s vetva %s je už nainštalovaná" -#: app/flatpak-transaction.c:523 +#: app/flatpak-transaction.c:527 #, c-format msgid "%s needs a later flatpak version (%s)" msgstr "" -#: app/flatpak-transaction.c:616 common/flatpak-dir.c:1999 +#: app/flatpak-transaction.c:620 common/flatpak-dir.c:2028 msgid "OCI image is not a flatpak (missing ref)" msgstr "" -#: app/flatpak-transaction.c:684 +#: app/flatpak-transaction.c:705 msgid "install" msgstr "" -#: app/flatpak-transaction.c:685 +#: app/flatpak-transaction.c:706 #, c-format msgid "Installing: %s from %s\n" msgstr "Inštalovanie: %s z %s\n" -#: app/flatpak-transaction.c:696 +#: app/flatpak-transaction.c:717 #, fuzzy msgid "update" msgstr "Žiadne aktualizácie.\n" -#: app/flatpak-transaction.c:697 +#: app/flatpak-transaction.c:718 #, c-format msgid "Updating: %s from %s\n" msgstr "Aktualizovanie: %s z %s\n" -#: app/flatpak-transaction.c:712 +#: app/flatpak-transaction.c:733 #, c-format msgid "Now at %s.\n" msgstr "Teraz na začlenení %s.\n" -#: app/flatpak-transaction.c:718 +#: app/flatpak-transaction.c:739 msgid "No updates.\n" msgstr "Žiadne aktualizácie.\n" -#: app/flatpak-transaction.c:726 +#: app/flatpak-transaction.c:747 msgid "install bundle" msgstr "" -#: app/flatpak-transaction.c:727 +#: app/flatpak-transaction.c:748 #, c-format msgid "Installing: %s from bundle %s\n" msgstr "Inštalovanie: %s z balíka %s\n" -#: app/flatpak-transaction.c:739 +#: app/flatpak-transaction.c:760 #, c-format msgid "Warning: Failed to %s %s: %s\n" msgstr "" -#: app/flatpak-transaction.c:744 +#: app/flatpak-transaction.c:765 #, c-format msgid "Error: Failed to %s %s: %s\n" msgstr "" -#: app/flatpak-transaction.c:749 +#: app/flatpak-transaction.c:770 #, fuzzy msgid "One or more operations failed" msgstr "Jedna alebo viacero aktualizácií zlyhali" -#: common/flatpak-dir.c:872 +#: common/flatpak-dir.c:871 #, c-format msgid "No overrides found for %s" msgstr "" -#: common/flatpak-dir.c:1384 +#: common/flatpak-dir.c:1383 #, c-format msgid "While opening repository %s: " msgstr "Počas otvárania repozitára %s: " -#: common/flatpak-dir.c:1517 common/flatpak-dir.c:3800 +#: common/flatpak-dir.c:1516 common/flatpak-dir.c:3845 msgid "Can't create deploy directory" msgstr "" -#: common/flatpak-dir.c:1874 +#: common/flatpak-dir.c:1903 #, c-format msgid "Invalid sha256 for extra data uri %s" msgstr "" -#: common/flatpak-dir.c:1879 +#: common/flatpak-dir.c:1908 #, c-format msgid "Empty name for extra data uri %s" msgstr "" -#: common/flatpak-dir.c:1884 +#: common/flatpak-dir.c:1913 #, c-format msgid "Unsupported extra data uri %s" msgstr "" -#: common/flatpak-dir.c:1894 +#: common/flatpak-dir.c:1923 #, fuzzy, c-format msgid "While downloading %s: " msgstr "Počas otvárania repozitára %s: " -#: common/flatpak-dir.c:1899 +#: common/flatpak-dir.c:1928 #, c-format msgid "Wrong size for extra data %s" msgstr "Nesprávna veľkosť pre údaje navyše %s" -#: common/flatpak-dir.c:1907 +#: common/flatpak-dir.c:1936 #, c-format msgid "Invalid checksum for extra data %s" msgstr "" -#: common/flatpak-dir.c:2002 +#: common/flatpak-dir.c:2031 msgid "OCI image specifies the wrong app id" msgstr "" -#: common/flatpak-dir.c:2123 common/flatpak-dir.c:2342 +#: common/flatpak-dir.c:2161 common/flatpak-dir.c:2380 #, c-format msgid "While pulling %s from remote %s: " msgstr "" -#: common/flatpak-dir.c:2296 +#: common/flatpak-dir.c:2334 #, c-format msgid "Can't find %s in remote %s" msgstr "Nedá sa nájsť %s vo vzdialenom repozitári %s" -#: common/flatpak-dir.c:2902 +#: common/flatpak-dir.c:2940 msgid "Not enough memory" msgstr "Nedostatok pamäte" -#: common/flatpak-dir.c:2921 +#: common/flatpak-dir.c:2959 msgid "Failed to read from exported file" msgstr "Zlyhalo čítanie z exportovaného súboru" -#: common/flatpak-dir.c:3445 +#: common/flatpak-dir.c:3483 msgid "While getting detached metadata: " msgstr "" -#: common/flatpak-dir.c:3463 +#: common/flatpak-dir.c:3501 msgid "While creating extradir: " msgstr "" -#: common/flatpak-dir.c:3484 +#: common/flatpak-dir.c:3522 msgid "Invalid sha256 for extra data" msgstr "" -#: common/flatpak-dir.c:3513 +#: common/flatpak-dir.c:3551 msgid "Wrong size for extra data" msgstr "" -#: common/flatpak-dir.c:3517 +#: common/flatpak-dir.c:3555 msgid "Invalid checksum for extra data" msgstr "" -#: common/flatpak-dir.c:3526 +#: common/flatpak-dir.c:3564 #, c-format msgid "While writing extra data file '%s': " msgstr "" -#: common/flatpak-dir.c:3694 +#: common/flatpak-dir.c:3739 msgid "apply_extra script failed" msgstr "" -#: common/flatpak-dir.c:3761 +#: common/flatpak-dir.c:3806 #, c-format msgid "While trying to resolve ref %s: " msgstr "" -#: common/flatpak-dir.c:3776 +#: common/flatpak-dir.c:3821 #, c-format msgid "%s is not available" msgstr "Aplikácia %s nie je dostupná" -#: common/flatpak-dir.c:3789 common/flatpak-dir.c:4037 -#: common/flatpak-dir.c:4640 common/flatpak-dir.c:4660 +#: common/flatpak-dir.c:3834 common/flatpak-dir.c:4082 +#: common/flatpak-dir.c:4685 common/flatpak-dir.c:4705 #, c-format msgid "%s branch %s already installed" msgstr "Aplikácia %s vetva %s je už nainštalovaná" -#: common/flatpak-dir.c:3808 +#: common/flatpak-dir.c:3853 #, c-format msgid "Failed to read commit %s: " msgstr "Zlyhalo čítanie začlenenia %s: " -#: common/flatpak-dir.c:3827 +#: common/flatpak-dir.c:3872 #, c-format msgid "While trying to checkout %s into %s: " msgstr "" -#: common/flatpak-dir.c:3852 common/flatpak-dir.c:3883 +#: common/flatpak-dir.c:3897 common/flatpak-dir.c:3928 msgid "While trying to checkout metadata subpath: " msgstr "" -#: common/flatpak-dir.c:3893 +#: common/flatpak-dir.c:3938 msgid "While trying to remove existing extra dir: " msgstr "Počas pokusu o odstránenie existujúceho adresára navyše: " -#: common/flatpak-dir.c:3904 +#: common/flatpak-dir.c:3949 msgid "While trying to apply extra data: " msgstr "Počas pokusu o aplikáciu údajov navyše: " -#: common/flatpak-dir.c:4488 +#: common/flatpak-dir.c:4533 #, c-format msgid "This version of %s is already installed" msgstr "Táto verzia aplikácie %s je už nainštalovaná" -#: common/flatpak-dir.c:4495 +#: common/flatpak-dir.c:4540 msgid "Can't change remote during bundle install" msgstr "" -#: common/flatpak-dir.c:4926 +#: common/flatpak-dir.c:4972 #, c-format msgid "%s branch %s is not installed" msgstr "Aplikácia %s vetva %s nie je nainštalovaná" -#: common/flatpak-dir.c:5170 +#: common/flatpak-dir.c:5216 #, c-format msgid "%s branch %s not installed" msgstr "Aplikácia %s vetva %s nie je nainštalovaná" -#: common/flatpak-dir.c:5941 +#: common/flatpak-dir.c:5987 #, c-format msgid "Nothing matches %s" msgstr "Nič nevyhovuje názvu %s" -#: common/flatpak-dir.c:6023 +#: common/flatpak-dir.c:6069 #, c-format msgid "Can't find %s%s%s%s%s in remote %s" msgstr "Nedá sa nájsť %s%s%s%s%s vo vzdialenom repozitári %s" -#: common/flatpak-dir.c:6140 +#: common/flatpak-dir.c:6186 #, c-format msgid "%s %s not installed" msgstr "Aplikácia %s %s nie je nainštalovaná" -#: common/flatpak-dir.c:6213 +#: common/flatpak-dir.c:6259 #, c-format msgid "Could not find installation %s" msgstr "Nepodarilo sa nájsť inštaláciu %s" -#: common/flatpak-dir.c:6686 +#: common/flatpak-dir.c:6757 #, c-format msgid "Runtime %s, branch %s is already installed" msgstr "Prostredie %s, vetva %s je už nainštalovaná" -#: common/flatpak-dir.c:6687 +#: common/flatpak-dir.c:6758 #, c-format msgid "App %s, branch %s is already installed" msgstr "Aplikácia %s, vetva %s je už nainštalovaná" -#: common/flatpak-dir.c:7138 +#: common/flatpak-dir.c:7209 msgid "Remote title not set" msgstr "" -#: common/flatpak-dir.c:7165 +#: common/flatpak-dir.c:7236 #, fuzzy msgid "Remote default-branch not set" msgstr "Vypíše predvolenú architektúru a skončí" -#: common/flatpak-dir.c:7308 +#: common/flatpak-dir.c:7379 msgid "No flatpak cache in remote summary" msgstr "" -#: common/flatpak-dir.c:7317 +#: common/flatpak-dir.c:7388 #, c-format msgid "No entry for %s in remote summary flatpak cache " msgstr "" @@ -1864,42 +1864,42 @@ msgid "Don't require a running session (no cgroups creation)" msgstr "" -#: common/flatpak-run.c:1821 +#: common/flatpak-run.c:1839 msgid "Failed to create temporary file" msgstr "Zlyhalo vytvorenie dočasného súboru" -#: common/flatpak-run.c:1828 +#: common/flatpak-run.c:1846 msgid "Failed to unlink temporary file" msgstr "" -#: common/flatpak-run.c:1846 +#: common/flatpak-run.c:1864 msgid "Failed to write to temporary file" msgstr "Zlyhal zápis dočasného súboru" -#: common/flatpak-run.c:3220 +#: common/flatpak-run.c:3240 #, fuzzy, c-format msgid "Failed to open flatpak-info temp file: %s" msgstr "Zlyhalo otvorenie dočasného súboru flatpak-info" -#: common/flatpak-run.c:3264 +#: common/flatpak-run.c:3284 #, fuzzy, c-format msgid "Failed to open temp file: %s" msgstr "Zlyhalo otvorenie súboru temp" -#: common/flatpak-run.c:3548 +#: common/flatpak-run.c:3568 msgid "Unable to create sync pipe" msgstr "" -#: common/flatpak-run.c:3573 +#: common/flatpak-run.c:3593 #, c-format msgid "Failed to open app info file: %s" msgstr "Zlyhalo otvorenie súboru s informáciami o aplikácii: %s" -#: common/flatpak-run.c:3603 +#: common/flatpak-run.c:3623 msgid "Failed to sync with dbus proxy" msgstr "" -#: common/flatpak-utils.c:2524 +#: common/flatpak-utils.c:2523 msgid "No extra data sources" msgstr "Žiadne zdroje údajov navyše" Binary files /tmp/tmpu7qeol/Yf3MfDJ1cf/flatpak-0.8.3/po/sv.gmo and /tmp/tmpu7qeol/jYLJXs2Rih/flatpak-0.8.4/po/sv.gmo differ diff -Nru flatpak-0.8.3/po/sv.po flatpak-0.8.4/po/sv.po --- flatpak-0.8.3/po/sv.po 2017-02-14 10:16:29.000000000 +0000 +++ flatpak-0.8.4/po/sv.po 2017-03-10 09:43:57.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: flatpak master\n" "Report-Msgid-Bugs-To: https://github.com/flatpak/flatpak/issues\n" -"POT-Creation-Date: 2017-02-14 11:16+0100\n" +"POT-Creation-Date: 2017-03-10 10:43+0100\n" "PO-Revision-Date: 2016-09-15 00:32+0800\n" "Last-Translator: Sebastian Rasmussen \n" "Language-Team: Swedish \n" @@ -134,7 +134,7 @@ #: app/flatpak-builtins-document-list.c:70 #: app/flatpak-builtins-document-unexport.c:67 app/flatpak-builtins-info.c:105 #: app/flatpak-builtins-install.c:251 app/flatpak-builtins-install.c:329 -#: app/flatpak-builtins-list.c:361 app/flatpak-builtins-list-remotes.c:65 +#: app/flatpak-builtins-list.c:354 app/flatpak-builtins-list-remotes.c:65 #: app/flatpak-builtins-ls-remote.c:80 app/flatpak-builtins-make-current.c:67 #: app/flatpak-builtins-override.c:66 msgid "Too many arguments" @@ -285,7 +285,7 @@ msgid "Missing '=' in bind mount option '%s'" msgstr "Saknar ”=” i bindningsmonteringsargument ”%s”" -#: app/flatpak-builtins-build.c:258 common/flatpak-run.c:4321 +#: app/flatpak-builtins-build.c:258 common/flatpak-run.c:4344 msgid "Unable to start app" msgstr "Kunde inte starta program" @@ -965,7 +965,7 @@ msgid "Arch to show" msgstr "Ark att visa" -#: app/flatpak-builtins-list.c:354 +#: app/flatpak-builtins-list.c:347 msgid " - List installed apps and/or runtimes" msgstr " - Lista installerade program och/eller exekveringsmiljöer" @@ -1166,7 +1166,7 @@ msgid "Must specify at least one REF" msgstr "" -#: app/flatpak-builtins-uninstall.c:129 app/flatpak-transaction.c:333 +#: app/flatpak-builtins-uninstall.c:129 app/flatpak-transaction.c:337 #, c-format msgid "Warning: Problem looking for related refs: %s\n" msgstr "Varning: Problem vid sökning efter relaterade ref:ar: %s\n" @@ -1427,311 +1427,311 @@ msgid "error:" msgstr "fel:" -#: app/flatpak-transaction.c:295 +#: app/flatpak-transaction.c:299 #, c-format msgid "Found in remote %s, do you want to install it?" msgstr "" -#: app/flatpak-transaction.c:300 +#: app/flatpak-transaction.c:304 msgid "Found in several remotes:\n" msgstr "" -#: app/flatpak-transaction.c:305 +#: app/flatpak-transaction.c:309 msgid "Which do you want to install (0 to abort)?" msgstr "" -#: app/flatpak-transaction.c:395 +#: app/flatpak-transaction.c:399 #, c-format msgid "Required runtime for %s (%s) is not installed, searching...\n" msgstr "" -#: app/flatpak-transaction.c:401 +#: app/flatpak-transaction.c:405 #, fuzzy, c-format msgid "The required runtime %s was not found in a configured remote.\n" msgstr "Modifiera egenskaper för en konfigurerad fjärr" -#: app/flatpak-transaction.c:462 common/flatpak-dir.c:979 -#: common/flatpak-dir.c:1236 common/flatpak-dir.c:1272 -#: common/flatpak-dir.c:1294 common/flatpak-dir.c:7639 -#: common/flatpak-utils.c:1116 +#: app/flatpak-transaction.c:466 common/flatpak-dir.c:978 +#: common/flatpak-dir.c:1235 common/flatpak-dir.c:1271 +#: common/flatpak-dir.c:1293 common/flatpak-dir.c:7710 +#: common/flatpak-utils.c:1114 #, c-format msgid "%s not installed" msgstr "%s inte installerad" -#: app/flatpak-transaction.c:468 +#: app/flatpak-transaction.c:472 #, fuzzy, c-format msgid "Remote %s disabled, ignoring %s update" msgstr "Fjärr %s inaktiverad\n" -#: app/flatpak-transaction.c:479 +#: app/flatpak-transaction.c:483 #, fuzzy, c-format msgid "%s already installed" msgstr "%s gren %s redan installerat" -#: app/flatpak-transaction.c:523 +#: app/flatpak-transaction.c:527 #, c-format msgid "%s needs a later flatpak version (%s)" msgstr "" -#: app/flatpak-transaction.c:616 common/flatpak-dir.c:1999 +#: app/flatpak-transaction.c:620 common/flatpak-dir.c:2028 msgid "OCI image is not a flatpak (missing ref)" msgstr "" -#: app/flatpak-transaction.c:684 +#: app/flatpak-transaction.c:705 #, fuzzy msgid "install" msgstr "Avinstallera program" -#: app/flatpak-transaction.c:685 +#: app/flatpak-transaction.c:706 #, fuzzy, c-format msgid "Installing: %s from %s\n" msgstr "Installerar: %s\n" -#: app/flatpak-transaction.c:696 +#: app/flatpak-transaction.c:717 #, fuzzy msgid "update" msgstr "Inga uppdateringar.\n" -#: app/flatpak-transaction.c:697 +#: app/flatpak-transaction.c:718 #, fuzzy, c-format msgid "Updating: %s from %s\n" msgstr "Uppdaterar relaterade: %s\n" -#: app/flatpak-transaction.c:712 +#: app/flatpak-transaction.c:733 #, c-format msgid "Now at %s.\n" msgstr "Nu på %s.\n" -#: app/flatpak-transaction.c:718 +#: app/flatpak-transaction.c:739 msgid "No updates.\n" msgstr "Inga uppdateringar.\n" -#: app/flatpak-transaction.c:726 +#: app/flatpak-transaction.c:747 #, fuzzy msgid "install bundle" msgstr "Installera paket" -#: app/flatpak-transaction.c:727 +#: app/flatpak-transaction.c:748 #, fuzzy, c-format msgid "Installing: %s from bundle %s\n" msgstr "Installerar: %s\n" -#: app/flatpak-transaction.c:739 +#: app/flatpak-transaction.c:760 #, fuzzy, c-format msgid "Warning: Failed to %s %s: %s\n" msgstr "Varning: Misslyckades med att installera relaterad ref: %s\n" -#: app/flatpak-transaction.c:744 +#: app/flatpak-transaction.c:765 #, c-format msgid "Error: Failed to %s %s: %s\n" msgstr "" -#: app/flatpak-transaction.c:749 +#: app/flatpak-transaction.c:770 #, fuzzy msgid "One or more operations failed" msgstr "En eller flera uppdateringar misslyckades" -#: common/flatpak-dir.c:872 +#: common/flatpak-dir.c:871 #, c-format msgid "No overrides found for %s" msgstr "Inga åsidosättningar funna för %s" -#: common/flatpak-dir.c:1384 +#: common/flatpak-dir.c:1383 #, c-format msgid "While opening repository %s: " msgstr "Medan arkiv %s öppnas: " -#: common/flatpak-dir.c:1517 common/flatpak-dir.c:3800 +#: common/flatpak-dir.c:1516 common/flatpak-dir.c:3845 msgid "Can't create deploy directory" msgstr "Kan inte skapa distributionskatalog" -#: common/flatpak-dir.c:1874 +#: common/flatpak-dir.c:1903 #, c-format msgid "Invalid sha256 for extra data uri %s" msgstr "" -#: common/flatpak-dir.c:1879 +#: common/flatpak-dir.c:1908 #, c-format msgid "Empty name for extra data uri %s" msgstr "" -#: common/flatpak-dir.c:1884 +#: common/flatpak-dir.c:1913 #, c-format msgid "Unsupported extra data uri %s" msgstr "" -#: common/flatpak-dir.c:1894 +#: common/flatpak-dir.c:1923 #, fuzzy, c-format msgid "While downloading %s: " msgstr "Medan arkiv %s öppnas: " -#: common/flatpak-dir.c:1899 +#: common/flatpak-dir.c:1928 #, c-format msgid "Wrong size for extra data %s" msgstr "" -#: common/flatpak-dir.c:1907 +#: common/flatpak-dir.c:1936 #, fuzzy, c-format msgid "Invalid checksum for extra data %s" msgstr "Ogiltigt miljöformat %s" -#: common/flatpak-dir.c:2002 +#: common/flatpak-dir.c:2031 msgid "OCI image specifies the wrong app id" msgstr "" -#: common/flatpak-dir.c:2123 common/flatpak-dir.c:2342 +#: common/flatpak-dir.c:2161 common/flatpak-dir.c:2380 #, c-format msgid "While pulling %s from remote %s: " msgstr "Medan %s hämtas från fjärr %s: " # sebras: how to translate in here? -#: common/flatpak-dir.c:2296 +#: common/flatpak-dir.c:2334 #, c-format msgid "Can't find %s in remote %s" msgstr "Kan inte hitta %s hos fjärr %s" -#: common/flatpak-dir.c:2902 +#: common/flatpak-dir.c:2940 msgid "Not enough memory" msgstr "Inte tillräckligt med minne" -#: common/flatpak-dir.c:2921 +#: common/flatpak-dir.c:2959 msgid "Failed to read from exported file" msgstr "Misslyckades med att läsa från exporterad fil" -#: common/flatpak-dir.c:3445 +#: common/flatpak-dir.c:3483 #, fuzzy msgid "While getting detached metadata: " msgstr "Under utcheckningsförsök av metadataundersökväg: " -#: common/flatpak-dir.c:3463 +#: common/flatpak-dir.c:3501 msgid "While creating extradir: " msgstr "" -#: common/flatpak-dir.c:3484 +#: common/flatpak-dir.c:3522 msgid "Invalid sha256 for extra data" msgstr "" -#: common/flatpak-dir.c:3513 +#: common/flatpak-dir.c:3551 msgid "Wrong size for extra data" msgstr "" -#: common/flatpak-dir.c:3517 +#: common/flatpak-dir.c:3555 msgid "Invalid checksum for extra data" msgstr "" -#: common/flatpak-dir.c:3526 +#: common/flatpak-dir.c:3564 #, c-format msgid "While writing extra data file '%s': " msgstr "" -#: common/flatpak-dir.c:3694 +#: common/flatpak-dir.c:3739 msgid "apply_extra script failed" msgstr "" -#: common/flatpak-dir.c:3761 +#: common/flatpak-dir.c:3806 #, c-format msgid "While trying to resolve ref %s: " msgstr "Under upplösningsförsök för ref %s: " -#: common/flatpak-dir.c:3776 +#: common/flatpak-dir.c:3821 #, c-format msgid "%s is not available" msgstr "%s är inte tillgängligt" -#: common/flatpak-dir.c:3789 common/flatpak-dir.c:4037 -#: common/flatpak-dir.c:4640 common/flatpak-dir.c:4660 +#: common/flatpak-dir.c:3834 common/flatpak-dir.c:4082 +#: common/flatpak-dir.c:4685 common/flatpak-dir.c:4705 #, c-format msgid "%s branch %s already installed" msgstr "%s gren %s redan installerat" -#: common/flatpak-dir.c:3808 +#: common/flatpak-dir.c:3853 #, c-format msgid "Failed to read commit %s: " msgstr "Misslyckades läsa incheckning %s: " -#: common/flatpak-dir.c:3827 +#: common/flatpak-dir.c:3872 #, c-format msgid "While trying to checkout %s into %s: " msgstr "Medan utcheckningsförsök av %s i %s: " -#: common/flatpak-dir.c:3852 common/flatpak-dir.c:3883 +#: common/flatpak-dir.c:3897 common/flatpak-dir.c:3928 msgid "While trying to checkout metadata subpath: " msgstr "Under utcheckningsförsök av metadataundersökväg: " -#: common/flatpak-dir.c:3893 +#: common/flatpak-dir.c:3938 #, fuzzy msgid "While trying to remove existing extra dir: " msgstr "Under upplösningsförsök för ref %s: " -#: common/flatpak-dir.c:3904 +#: common/flatpak-dir.c:3949 #, fuzzy msgid "While trying to apply extra data: " msgstr "Under utcheckningsförsök av metadataundersökväg: " -#: common/flatpak-dir.c:4488 +#: common/flatpak-dir.c:4533 #, c-format msgid "This version of %s is already installed" msgstr "Denna version av %s är redan installerad" -#: common/flatpak-dir.c:4495 +#: common/flatpak-dir.c:4540 msgid "Can't change remote during bundle install" msgstr "" -#: common/flatpak-dir.c:4926 +#: common/flatpak-dir.c:4972 #, c-format msgid "%s branch %s is not installed" msgstr "%s gren %s är inte installerad" -#: common/flatpak-dir.c:5170 +#: common/flatpak-dir.c:5216 #, c-format msgid "%s branch %s not installed" msgstr "%s gren %s inte installerad" -#: common/flatpak-dir.c:5941 +#: common/flatpak-dir.c:5987 #, c-format msgid "Nothing matches %s" msgstr "Ingenting matchar %s" # sebras: how to translate in here? -#: common/flatpak-dir.c:6023 +#: common/flatpak-dir.c:6069 #, fuzzy, c-format msgid "Can't find %s%s%s%s%s in remote %s" msgstr "Kan inte hitta %s hos fjärr %s" -#: common/flatpak-dir.c:6140 +#: common/flatpak-dir.c:6186 #, c-format msgid "%s %s not installed" msgstr "%s %s inte installerad" -#: common/flatpak-dir.c:6213 +#: common/flatpak-dir.c:6259 #, fuzzy, c-format msgid "Could not find installation %s" msgstr "Arbeta på användarinstallationer" -#: common/flatpak-dir.c:6686 +#: common/flatpak-dir.c:6757 #, c-format msgid "Runtime %s, branch %s is already installed" msgstr "Exekveringsmiljö %s, gren %s är redan installerad" -#: common/flatpak-dir.c:6687 +#: common/flatpak-dir.c:6758 #, c-format msgid "App %s, branch %s is already installed" msgstr "Program %s, gren %s är redan installerad" -#: common/flatpak-dir.c:7138 +#: common/flatpak-dir.c:7209 msgid "Remote title not set" msgstr "Fjärrtitel inte inställd" -#: common/flatpak-dir.c:7165 +#: common/flatpak-dir.c:7236 #, fuzzy msgid "Remote default-branch not set" msgstr "Fjärrtitel inte inställd" -#: common/flatpak-dir.c:7308 +#: common/flatpak-dir.c:7379 msgid "No flatpak cache in remote summary" msgstr "" -#: common/flatpak-dir.c:7317 +#: common/flatpak-dir.c:7388 #, c-format msgid "No entry for %s in remote summary flatpak cache " msgstr "" @@ -1902,43 +1902,43 @@ msgid "Don't require a running session (no cgroups creation)" msgstr "Kräv inte en körande session (inget cgroups-skapande)" -#: common/flatpak-run.c:1821 +#: common/flatpak-run.c:1839 msgid "Failed to create temporary file" msgstr "Misslyckades med att skapa temporärfil" -#: common/flatpak-run.c:1828 +#: common/flatpak-run.c:1846 msgid "Failed to unlink temporary file" msgstr "Misslyckades med att avlänka temporärfil" -#: common/flatpak-run.c:1846 +#: common/flatpak-run.c:1864 msgid "Failed to write to temporary file" msgstr "Misslyckades med att skriva till temporärfil" -#: common/flatpak-run.c:3220 +#: common/flatpak-run.c:3240 #, fuzzy, c-format msgid "Failed to open flatpak-info temp file: %s" msgstr "Misslyckades med att öppna temporär flatpak-info-fil: %s" -#: common/flatpak-run.c:3264 +#: common/flatpak-run.c:3284 #, fuzzy, c-format msgid "Failed to open temp file: %s" msgstr "Misslyckades med att öppna temporärfil: %s" # sebras: sync? -#: common/flatpak-run.c:3548 +#: common/flatpak-run.c:3568 msgid "Unable to create sync pipe" msgstr "Kan inte skapa sync-rör" -#: common/flatpak-run.c:3573 +#: common/flatpak-run.c:3593 #, c-format msgid "Failed to open app info file: %s" msgstr "Misslyckades med att öppna prog-info-fil: %s" -#: common/flatpak-run.c:3603 +#: common/flatpak-run.c:3623 msgid "Failed to sync with dbus proxy" msgstr "Misslyckades med att synkronisera med dbus-proxy" -#: common/flatpak-utils.c:2524 +#: common/flatpak-utils.c:2523 msgid "No extra data sources" msgstr "" Binary files /tmp/tmpu7qeol/Yf3MfDJ1cf/flatpak-0.8.3/po/uk.gmo and /tmp/tmpu7qeol/jYLJXs2Rih/flatpak-0.8.4/po/uk.gmo differ diff -Nru flatpak-0.8.3/po/uk.po flatpak-0.8.4/po/uk.po --- flatpak-0.8.3/po/uk.po 2017-02-14 10:16:29.000000000 +0000 +++ flatpak-0.8.4/po/uk.po 2017-03-10 09:43:57.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: flatpak master\n" "Report-Msgid-Bugs-To: https://github.com/flatpak/flatpak/issues\n" -"POT-Creation-Date: 2017-02-14 11:16+0100\n" +"POT-Creation-Date: 2017-03-10 10:43+0100\n" "PO-Revision-Date: 2016-10-26 19:02+0300\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" @@ -135,7 +135,7 @@ #: app/flatpak-builtins-document-list.c:70 #: app/flatpak-builtins-document-unexport.c:67 app/flatpak-builtins-info.c:105 #: app/flatpak-builtins-install.c:251 app/flatpak-builtins-install.c:329 -#: app/flatpak-builtins-list.c:361 app/flatpak-builtins-list-remotes.c:65 +#: app/flatpak-builtins-list.c:354 app/flatpak-builtins-list-remotes.c:65 #: app/flatpak-builtins-ls-remote.c:80 app/flatpak-builtins-make-current.c:67 #: app/flatpak-builtins-override.c:66 msgid "Too many arguments" @@ -286,7 +286,7 @@ msgid "Missing '=' in bind mount option '%s'" msgstr "Пропущено «=» у параметрі монтування прив’язки «%s»" -#: app/flatpak-builtins-build.c:258 common/flatpak-run.c:4321 +#: app/flatpak-builtins-build.c:258 common/flatpak-run.c:4344 msgid "Unable to start app" msgstr "Не вдалося запустити програму" @@ -958,7 +958,7 @@ msgid "Arch to show" msgstr "Архітектура для показу" -#: app/flatpak-builtins-list.c:354 +#: app/flatpak-builtins-list.c:347 msgid " - List installed apps and/or runtimes" msgstr " - Вивести список встановлених програм і/або середовищ виконання" @@ -1156,7 +1156,7 @@ msgid "Must specify at least one REF" msgstr "Слід вказати принаймні одне посилання" -#: app/flatpak-builtins-uninstall.c:129 app/flatpak-transaction.c:333 +#: app/flatpak-builtins-uninstall.c:129 app/flatpak-transaction.c:337 #, c-format msgid "Warning: Problem looking for related refs: %s\n" msgstr "Попередження: проблема під час пошуку пов’язаних посилань: %s\n" @@ -1416,303 +1416,303 @@ msgid "error:" msgstr "помилка:" -#: app/flatpak-transaction.c:295 +#: app/flatpak-transaction.c:299 #, c-format msgid "Found in remote %s, do you want to install it?" msgstr "" -#: app/flatpak-transaction.c:300 +#: app/flatpak-transaction.c:304 msgid "Found in several remotes:\n" msgstr "" -#: app/flatpak-transaction.c:305 +#: app/flatpak-transaction.c:309 msgid "Which do you want to install (0 to abort)?" msgstr "" -#: app/flatpak-transaction.c:395 +#: app/flatpak-transaction.c:399 #, c-format msgid "Required runtime for %s (%s) is not installed, searching...\n" msgstr "" -#: app/flatpak-transaction.c:401 +#: app/flatpak-transaction.c:405 #, fuzzy, c-format msgid "The required runtime %s was not found in a configured remote.\n" msgstr "Змінити властивості налаштованого віддаленого сховища" -#: app/flatpak-transaction.c:462 common/flatpak-dir.c:979 -#: common/flatpak-dir.c:1236 common/flatpak-dir.c:1272 -#: common/flatpak-dir.c:1294 common/flatpak-dir.c:7639 -#: common/flatpak-utils.c:1116 +#: app/flatpak-transaction.c:466 common/flatpak-dir.c:978 +#: common/flatpak-dir.c:1235 common/flatpak-dir.c:1271 +#: common/flatpak-dir.c:1293 common/flatpak-dir.c:7710 +#: common/flatpak-utils.c:1114 #, c-format msgid "%s not installed" msgstr "%s не встановлено" -#: app/flatpak-transaction.c:468 +#: app/flatpak-transaction.c:472 #, c-format msgid "Remote %s disabled, ignoring %s update" msgstr "" -#: app/flatpak-transaction.c:479 +#: app/flatpak-transaction.c:483 #, fuzzy, c-format msgid "%s already installed" msgstr "Гілку %s %s вже встановлено" -#: app/flatpak-transaction.c:523 +#: app/flatpak-transaction.c:527 #, c-format msgid "%s needs a later flatpak version (%s)" msgstr "" -#: app/flatpak-transaction.c:616 common/flatpak-dir.c:1999 +#: app/flatpak-transaction.c:620 common/flatpak-dir.c:2028 msgid "OCI image is not a flatpak (missing ref)" msgstr "" -#: app/flatpak-transaction.c:684 +#: app/flatpak-transaction.c:705 #, fuzzy msgid "install" msgstr "Вилучення програми" -#: app/flatpak-transaction.c:685 +#: app/flatpak-transaction.c:706 #, fuzzy, c-format msgid "Installing: %s from %s\n" msgstr "Встановлюємо: %s\n" -#: app/flatpak-transaction.c:696 +#: app/flatpak-transaction.c:717 msgid "update" msgstr "" -#: app/flatpak-transaction.c:697 +#: app/flatpak-transaction.c:718 #, fuzzy, c-format msgid "Updating: %s from %s\n" msgstr "Оновлюємо appstream для віддаленого сховища %s\n" -#: app/flatpak-transaction.c:712 +#: app/flatpak-transaction.c:733 #, c-format msgid "Now at %s.\n" msgstr "" -#: app/flatpak-transaction.c:718 +#: app/flatpak-transaction.c:739 msgid "No updates.\n" msgstr "" -#: app/flatpak-transaction.c:726 +#: app/flatpak-transaction.c:747 #, fuzzy msgid "install bundle" msgstr "Встановлення пакунка" -#: app/flatpak-transaction.c:727 +#: app/flatpak-transaction.c:748 #, fuzzy, c-format msgid "Installing: %s from bundle %s\n" msgstr "Встановлюємо: %s\n" -#: app/flatpak-transaction.c:739 +#: app/flatpak-transaction.c:760 #, c-format msgid "Warning: Failed to %s %s: %s\n" msgstr "" -#: app/flatpak-transaction.c:744 +#: app/flatpak-transaction.c:765 #, c-format msgid "Error: Failed to %s %s: %s\n" msgstr "" -#: app/flatpak-transaction.c:749 +#: app/flatpak-transaction.c:770 msgid "One or more operations failed" msgstr "" -#: common/flatpak-dir.c:872 +#: common/flatpak-dir.c:871 #, c-format msgid "No overrides found for %s" msgstr "Не знайдено перевизначень для %s" -#: common/flatpak-dir.c:1384 +#: common/flatpak-dir.c:1383 #, c-format msgid "While opening repository %s: " msgstr "Під час спроби відкрити сховище %s: " -#: common/flatpak-dir.c:1517 common/flatpak-dir.c:3800 +#: common/flatpak-dir.c:1516 common/flatpak-dir.c:3845 msgid "Can't create deploy directory" msgstr "Не вдалося створити каталог розгортання" -#: common/flatpak-dir.c:1874 +#: common/flatpak-dir.c:1903 #, c-format msgid "Invalid sha256 for extra data uri %s" msgstr "Некоректна сума sha256 для адреси додаткових даних %s" -#: common/flatpak-dir.c:1879 +#: common/flatpak-dir.c:1908 #, c-format msgid "Empty name for extra data uri %s" msgstr "Порожня назва для адреси додаткових даних %s" -#: common/flatpak-dir.c:1884 +#: common/flatpak-dir.c:1913 #, c-format msgid "Unsupported extra data uri %s" msgstr "Непідтримувана адреса додаткових даних %s" -#: common/flatpak-dir.c:1894 +#: common/flatpak-dir.c:1923 #, c-format msgid "While downloading %s: " msgstr "Під час спроби отримання %s: " -#: common/flatpak-dir.c:1899 +#: common/flatpak-dir.c:1928 #, c-format msgid "Wrong size for extra data %s" msgstr "Помилковий розмір додаткових даних %s" -#: common/flatpak-dir.c:1907 +#: common/flatpak-dir.c:1936 #, c-format msgid "Invalid checksum for extra data %s" msgstr "Некоректна контрольна сума додаткових даних, %s" -#: common/flatpak-dir.c:2002 +#: common/flatpak-dir.c:2031 msgid "OCI image specifies the wrong app id" msgstr "" -#: common/flatpak-dir.c:2123 common/flatpak-dir.c:2342 +#: common/flatpak-dir.c:2161 common/flatpak-dir.c:2380 #, c-format msgid "While pulling %s from remote %s: " msgstr "Під час отримання %s з віддаленого сховища %s: " -#: common/flatpak-dir.c:2296 +#: common/flatpak-dir.c:2334 #, c-format msgid "Can't find %s in remote %s" msgstr "Не вдалося знайти %s у віддаленому сховищі %s" -#: common/flatpak-dir.c:2902 +#: common/flatpak-dir.c:2940 msgid "Not enough memory" msgstr "Не вистачає пам'яті" -#: common/flatpak-dir.c:2921 +#: common/flatpak-dir.c:2959 msgid "Failed to read from exported file" msgstr "Не вдалося виконати читання з експортованого файла" -#: common/flatpak-dir.c:3445 +#: common/flatpak-dir.c:3483 msgid "While getting detached metadata: " msgstr "Під час спроби отримання від’єднаних метаданих: " -#: common/flatpak-dir.c:3463 +#: common/flatpak-dir.c:3501 msgid "While creating extradir: " msgstr "Під час створення каталогу додаткових даних: " -#: common/flatpak-dir.c:3484 +#: common/flatpak-dir.c:3522 msgid "Invalid sha256 for extra data" msgstr "Некоректна контрольна сума sha256 для додаткових даних" -#: common/flatpak-dir.c:3513 +#: common/flatpak-dir.c:3551 msgid "Wrong size for extra data" msgstr "Помилковий розмір додаткових даних" -#: common/flatpak-dir.c:3517 +#: common/flatpak-dir.c:3555 msgid "Invalid checksum for extra data" msgstr "Некоректна контрольна сума додаткових даних" -#: common/flatpak-dir.c:3526 +#: common/flatpak-dir.c:3564 #, c-format msgid "While writing extra data file '%s': " msgstr "Під час записування файла додаткових даних «%s»: " -#: common/flatpak-dir.c:3694 +#: common/flatpak-dir.c:3739 msgid "apply_extra script failed" msgstr "Помилка скрипту apply_extra" -#: common/flatpak-dir.c:3761 +#: common/flatpak-dir.c:3806 #, c-format msgid "While trying to resolve ref %s: " msgstr "Під час спроби визначити посилання %s: " -#: common/flatpak-dir.c:3776 +#: common/flatpak-dir.c:3821 #, c-format msgid "%s is not available" msgstr "%s недоступний" -#: common/flatpak-dir.c:3789 common/flatpak-dir.c:4037 -#: common/flatpak-dir.c:4640 common/flatpak-dir.c:4660 +#: common/flatpak-dir.c:3834 common/flatpak-dir.c:4082 +#: common/flatpak-dir.c:4685 common/flatpak-dir.c:4705 #, c-format msgid "%s branch %s already installed" msgstr "Гілку %s %s вже встановлено" -#: common/flatpak-dir.c:3808 +#: common/flatpak-dir.c:3853 #, c-format msgid "Failed to read commit %s: " msgstr "Не вдалося прочитати внесок %s: " -#: common/flatpak-dir.c:3827 +#: common/flatpak-dir.c:3872 #, c-format msgid "While trying to checkout %s into %s: " msgstr "Під час спроби вивантаження %s до %s: " -#: common/flatpak-dir.c:3852 common/flatpak-dir.c:3883 +#: common/flatpak-dir.c:3897 common/flatpak-dir.c:3928 msgid "While trying to checkout metadata subpath: " msgstr "Під час спроби вивантаження підшляху метаданих: " -#: common/flatpak-dir.c:3893 +#: common/flatpak-dir.c:3938 msgid "While trying to remove existing extra dir: " msgstr "Під час спроби вилучення наявного додаткового каталогу: " -#: common/flatpak-dir.c:3904 +#: common/flatpak-dir.c:3949 msgid "While trying to apply extra data: " msgstr "Під час спроби застосування додаткових даних: " -#: common/flatpak-dir.c:4488 +#: common/flatpak-dir.c:4533 #, c-format msgid "This version of %s is already installed" msgstr "Цю версію %s вже встановлено" -#: common/flatpak-dir.c:4495 +#: common/flatpak-dir.c:4540 msgid "Can't change remote during bundle install" msgstr "" -#: common/flatpak-dir.c:4926 +#: common/flatpak-dir.c:4972 #, c-format msgid "%s branch %s is not installed" msgstr "%s, гілка %s не встановлено" -#: common/flatpak-dir.c:5170 +#: common/flatpak-dir.c:5216 #, c-format msgid "%s branch %s not installed" msgstr "%s, гілка %s не встановлено" -#: common/flatpak-dir.c:5941 +#: common/flatpak-dir.c:5987 #, c-format msgid "Nothing matches %s" msgstr "Немає відповідників %s" -#: common/flatpak-dir.c:6023 +#: common/flatpak-dir.c:6069 #, c-format msgid "Can't find %s%s%s%s%s in remote %s" msgstr "Не вдалося знайти %s%s%s%s%s у віддаленому сховищі %s" -#: common/flatpak-dir.c:6140 +#: common/flatpak-dir.c:6186 #, c-format msgid "%s %s not installed" msgstr "Не встановлено %s %s" -#: common/flatpak-dir.c:6213 +#: common/flatpak-dir.c:6259 #, fuzzy, c-format msgid "Could not find installation %s" msgstr "Працювати над встановленим користувачем" -#: common/flatpak-dir.c:6686 +#: common/flatpak-dir.c:6757 #, c-format msgid "Runtime %s, branch %s is already installed" msgstr "Середовище виконання %s, гілка %s вже встановлено" -#: common/flatpak-dir.c:6687 +#: common/flatpak-dir.c:6758 #, c-format msgid "App %s, branch %s is already installed" msgstr "Програму %s, гілка %s вже встановлено" -#: common/flatpak-dir.c:7138 +#: common/flatpak-dir.c:7209 msgid "Remote title not set" msgstr "Заголовок віддаленого сховища не встановлено" -#: common/flatpak-dir.c:7165 +#: common/flatpak-dir.c:7236 msgid "Remote default-branch not set" msgstr "Не встановлено типову гілку віддаленого сховища" -#: common/flatpak-dir.c:7308 +#: common/flatpak-dir.c:7379 msgid "No flatpak cache in remote summary" msgstr "" -#: common/flatpak-dir.c:7317 +#: common/flatpak-dir.c:7388 #, c-format msgid "No entry for %s in remote summary flatpak cache " msgstr "" @@ -1879,42 +1879,42 @@ msgid "Don't require a running session (no cgroups creation)" msgstr "Не вимагати запущеного сеансу (без створення cgroup)" -#: common/flatpak-run.c:1821 +#: common/flatpak-run.c:1839 msgid "Failed to create temporary file" msgstr "Не вдалося створити тимчасовий файл" -#: common/flatpak-run.c:1828 +#: common/flatpak-run.c:1846 msgid "Failed to unlink temporary file" msgstr "Не вдалося відв’язати тимчасовий файл" -#: common/flatpak-run.c:1846 +#: common/flatpak-run.c:1864 msgid "Failed to write to temporary file" msgstr "Не вдалося виконати запис до тимчасового файла" -#: common/flatpak-run.c:3220 +#: common/flatpak-run.c:3240 #, c-format msgid "Failed to open flatpak-info temp file: %s" msgstr "Не вдалося відкрити тимчасовий файл flatpak-info: %s" -#: common/flatpak-run.c:3264 +#: common/flatpak-run.c:3284 #, c-format msgid "Failed to open temp file: %s" msgstr "Не вдалося відкрити тимчасовий файл: %s" -#: common/flatpak-run.c:3548 +#: common/flatpak-run.c:3568 msgid "Unable to create sync pipe" msgstr "Не вдалося створити канал синхронізації" -#: common/flatpak-run.c:3573 +#: common/flatpak-run.c:3593 #, c-format msgid "Failed to open app info file: %s" msgstr "Не вдалося відкрити файл інформації щодо програми: %s" -#: common/flatpak-run.c:3603 +#: common/flatpak-run.c:3623 msgid "Failed to sync with dbus proxy" msgstr "Не вдалося виконати синхронізацію із проміжним D-Bus" -#: common/flatpak-utils.c:2524 +#: common/flatpak-utils.c:2523 msgid "No extra data sources" msgstr "Немає джерел додаткових даних" diff -Nru flatpak-0.8.3/profile/flatpak.sh.in flatpak-0.8.4/profile/flatpak.sh.in --- flatpak-0.8.3/profile/flatpak.sh.in 2016-10-28 08:41:14.000000000 +0000 +++ flatpak-0.8.4/profile/flatpak.sh.in 2017-03-10 09:40:57.000000000 +0000 @@ -1,4 +1,11 @@ # @sysconfdir@/profile.d/flatpak.sh - set XDG_DATA_DIRS -XDG_DATA_DIRS="${XDG_DATA_DIRS:-$HOME/.local/share/flatpak/exports/share:@localstatedir@/lib/flatpak/exports/share/:/usr/local/share/:/usr/share/}" +flatpak_dirs=$HOME/.local/share/flatpak/exports/share/:@localstatedir@/lib/flatpak/exports/share/ + +if [ -z "${XDG_DATA_DIRS}" ]; then + XDG_DATA_DIRS="$flatpak_dirs:/usr/local/share/:/usr/share/" +elif [ "${XDG_DATA_DIRS#*flatpak}" == ${XDG_DATA_DIRS} ]; then + XDG_DATA_DIRS="$XDG_DATA_DIRS:$flatpak_dirs" +fi + export XDG_DATA_DIRS diff -Nru flatpak-0.8.3/tests/package_version.txt flatpak-0.8.4/tests/package_version.txt --- flatpak-0.8.3/tests/package_version.txt 2017-02-14 10:16:26.000000000 +0000 +++ flatpak-0.8.4/tests/package_version.txt 2017-03-10 09:43:54.000000000 +0000 @@ -1 +1 @@ -0.8.3 +0.8.4