diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..edf7b1f --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/nautilus-3.22.3.tar.xz diff --git a/.nautilus.metadata b/.nautilus.metadata new file mode 100644 index 0000000..0204667 --- /dev/null +++ b/.nautilus.metadata @@ -0,0 +1 @@ +b3ba6c79d90ca6c875503a33b635f598ff7790e4 SOURCES/nautilus-3.22.3.tar.xz diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/0001-general-remove-gnome-autoar.patch b/SOURCES/0001-general-remove-gnome-autoar.patch new file mode 100644 index 0000000..625c31e --- /dev/null +++ b/SOURCES/0001-general-remove-gnome-autoar.patch @@ -0,0 +1,2603 @@ +From 889ca37501afaca5945f41fcd67bd9f0a4b6c19d Mon Sep 17 00:00:00 2001 +From: Carlos Soriano +Date: Fri, 3 Mar 2017 19:52:06 +0100 +Subject: [PATCH] general: remove gnome-autoar + +--- + configure.ac | 2 - + po/POTFILES.in | 2 - + src/Makefile.am | 2 - + src/nautilus-compress-dialog-controller.c | 339 -------------- + src/nautilus-compress-dialog-controller.h | 36 -- + src/nautilus-file-operations.c | 753 ------------------------------ + src/nautilus-file-operations.h | 16 - + src/nautilus-file-undo-operations.c | 319 ------------- + src/nautilus-file-undo-operations.h | 58 --- + src/nautilus-file.c | 38 +- + src/nautilus-files-view.c | 616 +----------------------- + src/nautilus-mime-actions.c | 23 +- + 12 files changed, 36 insertions(+), 2168 deletions(-) + delete mode 100644 src/nautilus-compress-dialog-controller.c + delete mode 100644 src/nautilus-compress-dialog-controller.h + +diff --git a/configure.ac b/configure.ac +index 83c7c7d84..acd095bb9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -11,7 +11,6 @@ m4_define(exif_minver, 0.6.20) + m4_define(exempi_minver, 2.1.0) + m4_define(notify_minver, 0.7.0) + m4_define(schemas_minver, 3.8.0) +-m4_define(autoar_minver, 0.1) + + dnl 1. If the library code has changed at all since last release, then increment revision. + dnl 2. If any interfaces have been added, then increment current and set revision to 0. +@@ -269,7 +268,6 @@ dnl base libs + PKG_CHECK_MODULES(BASE, [ + gtk+-3.0 >= gtk_minver + glib-2.0 >= glib_minver +- gnome-autoar-0 >= autoar_minver + ]) + + dnl common libs (eel, nautilus) +diff --git a/po/POTFILES.in b/po/POTFILES.in +index 8647562f0..6530f6ed4 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -32,7 +32,6 @@ src/nautilus-canvas-view-container.c + src/nautilus-clipboard.c + src/nautilus-column-chooser.c + src/nautilus-column-utilities.c +-src/nautilus-compress-dialog-controller.c + src/nautilus-desktop-item-properties.c + src/nautilus-directory.c + src/nautilus-dnd.c +@@ -81,7 +80,6 @@ src/nautilus-x-content-bar.c + src/resources/gtk/help-overlay.ui + src/resources/gtk/menus.ui + src/resources/ui/nautilus-batch-rename-dialog.ui +-src/resources/ui/nautilus-compress-dialog.ui + src/resources/ui/nautilus-create-folder-dialog.ui + src/resources/ui/nautilus-files-view-context-menus.ui + src/resources/ui/nautilus-folder-is-empty.ui +diff --git a/src/Makefile.am b/src/Makefile.am +index 562af23f8..2ece291bd 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -257,8 +257,6 @@ nautilus_no_main_sources = \ + nautilus-rename-file-popover-controller.h \ + nautilus-new-folder-dialog-controller.c \ + nautilus-new-folder-dialog-controller.h \ +- nautilus-compress-dialog-controller.c \ +- nautilus-compress-dialog-controller.h \ + nautilus-operations-ui-manager.c \ + nautilus-operations-ui-manager.h \ + nautilus-file-operations.c \ +diff --git a/src/nautilus-compress-dialog-controller.c b/src/nautilus-compress-dialog-controller.c +deleted file mode 100644 +index 3937181a8..000000000 +--- a/src/nautilus-compress-dialog-controller.c ++++ /dev/null +@@ -1,339 +0,0 @@ +-/* nautilus-compress-dialog-controller.h +- * +- * Copyright (C) 2016 the Nautilus developers +- * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public License as +- * published by the Free Software Foundation; either version 2 of the +- * License, or (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * General Public License for more details. +- * +- * You should have received a copy of the GNU General Public +- * License along with this program; if not, see . +- * +- */ +- +-#include +-#include +- +-#include +- +-#include "nautilus-compress-dialog-controller.h" +- +-#include "nautilus-global-preferences.h" +- +-struct _NautilusCompressDialogController +-{ +- NautilusFileNameWidgetController parent_instance; +- +- GtkWidget *compress_dialog; +- GtkWidget *description_stack; +- GtkWidget *name_entry; +- GtkWidget *zip_radio_button; +- GtkWidget *tar_xz_radio_button; +- GtkWidget *seven_zip_radio_button; +- +- const char *extension; +- +- gint response_handler_id; +-}; +- +-G_DEFINE_TYPE (NautilusCompressDialogController, nautilus_compress_dialog_controller, NAUTILUS_TYPE_FILE_NAME_WIDGET_CONTROLLER); +- +-static gboolean +-nautilus_compress_dialog_controller_name_is_valid (NautilusFileNameWidgetController *self, +- gchar *name, +- gchar **error_message) +-{ +- if (strlen (name) == 0) +- { +- return FALSE; +- } +- +- if (strstr (name, "/") != NULL) +- { +- *error_message = _("Archive names cannot contain “/”."); +- } +- else if (strcmp (name, ".") == 0) +- { +- *error_message = _("An archive cannot be called “.”."); +- } +- else if (strcmp (name, "..") == 0) +- { +- *error_message = _("An archive cannot be called “..”."); +- } +- +- return *error_message == NULL; +-} +- +-static gchar * +-nautilus_compress_dialog_controller_get_new_name (NautilusFileNameWidgetController *controller) +-{ +- NautilusCompressDialogController *self; +- g_autofree gchar *basename = NULL; +- gchar *error_message = NULL; +- gboolean valid_name; +- +- self = NAUTILUS_COMPRESS_DIALOG_CONTROLLER (controller); +- +- basename = NAUTILUS_FILE_NAME_WIDGET_CONTROLLER_CLASS (nautilus_compress_dialog_controller_parent_class)->get_new_name (controller); +- /* Do not check or add the extension if the name is invalid */ +- valid_name = nautilus_compress_dialog_controller_name_is_valid (controller, +- basename, +- &error_message); +- +- if (!valid_name) +- { +- return g_strdup (basename); +- } +- +- if (g_str_has_suffix (basename, self->extension)) +- { +- return g_strdup (basename); +- } +- +- return g_strconcat (basename, self->extension, NULL); +-} +- +-static void +-compress_dialog_controller_on_response (GtkDialog *dialog, +- gint response_id, +- gpointer user_data) +-{ +- NautilusCompressDialogController *controller; +- +- controller = NAUTILUS_COMPRESS_DIALOG_CONTROLLER (user_data); +- +- if (response_id != GTK_RESPONSE_OK) +- { +- g_signal_emit_by_name (controller, "cancelled"); +- } +-} +- +-static void +-update_selected_format (NautilusCompressDialogController *self, +- NautilusCompressionFormat format) +-{ +- const char *extension; +- const char *description_label_name; +- GtkWidget *active_button; +- +- switch (format) +- { +- case NAUTILUS_COMPRESSION_ZIP: +- { +- extension = ".zip"; +- description_label_name = "zip-description-label"; +- active_button = self->zip_radio_button; +- } +- break; +- +- case NAUTILUS_COMPRESSION_TAR_XZ: +- { +- extension = ".tar.xz"; +- description_label_name = "tar-xz-description-label"; +- active_button = self->tar_xz_radio_button; +- } +- break; +- +- case NAUTILUS_COMPRESSION_7ZIP: +- { +- extension = ".7z"; +- description_label_name = "seven-zip-description-label"; +- active_button = self->seven_zip_radio_button; +- } +- break; +- +- default: +- { +- g_assert_not_reached (); +- } +- break; +- } +- +- self->extension = extension; +- +- gtk_stack_set_visible_child_name (GTK_STACK (self->description_stack), +- description_label_name); +- +- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (active_button), +- TRUE); +- +- g_settings_set_enum (nautilus_compression_preferences, +- NAUTILUS_PREFERENCES_DEFAULT_COMPRESSION_FORMAT, +- format); +- /* Since the extension changes when the button is toggled, force a +- * verification of the new file name by simulating an entry change +- */ +- g_signal_emit_by_name (self->name_entry, "changed"); +-} +- +-static void +-zip_radio_button_on_toggled (GtkToggleButton *toggle_button, +- gpointer user_data) +-{ +- NautilusCompressDialogController *controller; +- +- controller = NAUTILUS_COMPRESS_DIALOG_CONTROLLER (user_data); +- +- if (!gtk_toggle_button_get_active (toggle_button)) +- { +- return; +- } +- +- update_selected_format (controller, +- NAUTILUS_COMPRESSION_ZIP); +-} +- +-static void +-tar_xz_radio_button_on_toggled (GtkToggleButton *toggle_button, +- gpointer user_data) +-{ +- NautilusCompressDialogController *controller; +- +- controller = NAUTILUS_COMPRESS_DIALOG_CONTROLLER (user_data); +- +- if (!gtk_toggle_button_get_active (toggle_button)) +- { +- return; +- } +- +- update_selected_format (controller, +- NAUTILUS_COMPRESSION_TAR_XZ); +-} +- +-static void +-seven_zip_radio_button_on_toggled (GtkToggleButton *toggle_button, +- gpointer user_data) +-{ +- NautilusCompressDialogController *controller; +- +- controller = NAUTILUS_COMPRESS_DIALOG_CONTROLLER (user_data); +- +- if (!gtk_toggle_button_get_active (toggle_button)) +- { +- return; +- } +- +- update_selected_format (controller, +- NAUTILUS_COMPRESSION_7ZIP); +-} +- +-NautilusCompressDialogController * +-nautilus_compress_dialog_controller_new (GtkWindow *parent_window, +- NautilusDirectory *destination_directory, +- gchar *initial_name) +-{ +- NautilusCompressDialogController *self; +- g_autoptr (GtkBuilder) builder = NULL; +- GtkWidget *compress_dialog; +- GtkWidget *error_revealer; +- GtkWidget *error_label; +- GtkWidget *name_entry; +- GtkWidget *activate_button; +- GtkWidget *description_stack; +- GtkWidget *zip_radio_button; +- GtkWidget *tar_xz_radio_button; +- GtkWidget *seven_zip_radio_button; +- NautilusCompressionFormat format; +- +- builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/ui/nautilus-compress-dialog.ui"); +- compress_dialog = GTK_WIDGET (gtk_builder_get_object (builder, "compress_dialog")); +- error_revealer = GTK_WIDGET (gtk_builder_get_object (builder, "error_revealer")); +- error_label = GTK_WIDGET (gtk_builder_get_object (builder, "error_label")); +- name_entry = GTK_WIDGET (gtk_builder_get_object (builder, "name_entry")); +- activate_button = GTK_WIDGET (gtk_builder_get_object (builder, "activate_button")); +- zip_radio_button = GTK_WIDGET (gtk_builder_get_object (builder, "zip_radio_button")); +- tar_xz_radio_button = GTK_WIDGET (gtk_builder_get_object (builder, "tar_xz_radio_button")); +- seven_zip_radio_button = GTK_WIDGET (gtk_builder_get_object (builder, "seven_zip_radio_button")); +- description_stack = GTK_WIDGET (gtk_builder_get_object (builder, "description_stack")); +- +- gtk_window_set_transient_for (GTK_WINDOW (compress_dialog), +- parent_window); +- +- self = g_object_new (NAUTILUS_TYPE_COMPRESS_DIALOG_CONTROLLER, +- "error-revealer", error_revealer, +- "error-label", error_label, +- "name-entry", name_entry, +- "activate-button", activate_button, +- "containing-directory", destination_directory, NULL); +- +- self->compress_dialog = compress_dialog; +- self->zip_radio_button = zip_radio_button; +- self->tar_xz_radio_button = tar_xz_radio_button; +- self->seven_zip_radio_button = seven_zip_radio_button; +- self->description_stack = description_stack; +- self->name_entry = name_entry; +- +- self->response_handler_id = g_signal_connect (compress_dialog, +- "response", +- (GCallback) compress_dialog_controller_on_response, +- self); +- +- gtk_builder_add_callback_symbols (builder, +- "zip_radio_button_on_toggled", +- G_CALLBACK (zip_radio_button_on_toggled), +- "tar_xz_radio_button_on_toggled", +- G_CALLBACK (tar_xz_radio_button_on_toggled), +- "seven_zip_radio_button_on_toggled", +- G_CALLBACK (seven_zip_radio_button_on_toggled), +- NULL); +- gtk_builder_connect_signals (builder, self); +- +- format = g_settings_get_enum (nautilus_compression_preferences, +- NAUTILUS_PREFERENCES_DEFAULT_COMPRESSION_FORMAT); +- +- update_selected_format (self, format); +- +- if (initial_name != NULL) +- { +- gtk_entry_set_text (GTK_ENTRY (name_entry), initial_name); +- } +- +- gtk_widget_show_all (compress_dialog); +- +- return self; +-} +- +-static void +-nautilus_compress_dialog_controller_init (NautilusCompressDialogController *self) +-{ +-} +- +-static void +-nautilus_compress_dialog_controller_finalize (GObject *object) +-{ +- NautilusCompressDialogController *self; +- +- self = NAUTILUS_COMPRESS_DIALOG_CONTROLLER (object); +- +- if (self->compress_dialog != NULL) +- { +- if (self->response_handler_id > 0) +- { +- g_signal_handler_disconnect (self->compress_dialog, +- self->response_handler_id); +- self->response_handler_id = 0; +- } +- gtk_widget_destroy (self->compress_dialog); +- self->compress_dialog = NULL; +- } +- +- G_OBJECT_CLASS (nautilus_compress_dialog_controller_parent_class)->finalize (object); +-} +- +-static void +-nautilus_compress_dialog_controller_class_init (NautilusCompressDialogControllerClass *klass) +-{ +- GObjectClass *object_class = G_OBJECT_CLASS (klass); +- NautilusFileNameWidgetControllerClass *parent_class = NAUTILUS_FILE_NAME_WIDGET_CONTROLLER_CLASS (klass); +- +- object_class->finalize = nautilus_compress_dialog_controller_finalize; +- +- parent_class->get_new_name = nautilus_compress_dialog_controller_get_new_name; +- parent_class->name_is_valid = nautilus_compress_dialog_controller_name_is_valid; +-} +diff --git a/src/nautilus-compress-dialog-controller.h b/src/nautilus-compress-dialog-controller.h +deleted file mode 100644 +index bb89413f1..000000000 +--- a/src/nautilus-compress-dialog-controller.h ++++ /dev/null +@@ -1,36 +0,0 @@ +-/* nautilus-compress-dialog-controller.h +- * +- * Copyright (C) 2016 the Nautilus developers +- * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public License as +- * published by the Free Software Foundation; either version 2 of the +- * License, or (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * General Public License for more details. +- * +- * You should have received a copy of the GNU General Public +- * License along with this program; if not, see . +- * +- */ +- +-#ifndef NAUTILUS_COMPRESS_DIALOG_CONTROLLER_H +-#define NAUTILUS_COMPRESS_DIALOG_CONTROLLER_H +- +-#include +-#include +- +-#include "nautilus-file-name-widget-controller.h" +-#include "nautilus-directory.h" +- +-#define NAUTILUS_TYPE_COMPRESS_DIALOG_CONTROLLER nautilus_compress_dialog_controller_get_type () +-G_DECLARE_FINAL_TYPE (NautilusCompressDialogController, nautilus_compress_dialog_controller, NAUTILUS, COMPRESS_DIALOG_CONTROLLER, NautilusFileNameWidgetController) +- +-NautilusCompressDialogController * nautilus_compress_dialog_controller_new (GtkWindow *parent_window, +- NautilusDirectory *destination_directory, +- gchar *initial_name); +- +-#endif /* NAUTILUS_COMPRESS_DIALOG_CONTROLLER_H */ +diff --git a/src/nautilus-file-operations.c b/src/nautilus-file-operations.c +index fd35faf3f..728a80df8 100644 +--- a/src/nautilus-file-operations.c ++++ b/src/nautilus-file-operations.c +@@ -160,7 +160,6 @@ typedef enum + OP_KIND_MOVE, + OP_KIND_DELETE, + OP_KIND_TRASH, +- OP_KIND_COMPRESS + } OpKind; + + typedef struct +@@ -180,40 +179,6 @@ typedef struct + int last_reported_files_left; + } TransferInfo; + +-typedef struct +-{ +- CommonJob common; +- GList *source_files; +- GFile *destination_directory; +- GList *output_files; +- +- gdouble base_progress; +- +- guint64 archive_compressed_size; +- guint64 total_compressed_size; +- +- NautilusExtractCallback done_callback; +- gpointer done_callback_data; +-} ExtractJob; +- +-typedef struct +-{ +- CommonJob common; +- GList *source_files; +- GFile *output_file; +- +- AutoarFormat format; +- AutoarFilter filter; +- +- guint64 total_size; +- guint total_files; +- +- gboolean success; +- +- NautilusCreateCallback done_callback; +- gpointer done_callback_data; +-} CompressJob; +- + #define SECONDS_NEEDED_FOR_RELIABLE_TRANSFER_RATE 8 + #define NSEC_PER_MICROSEC 1000 + #define PROGRESS_NOTIFY_INTERVAL 100 * NSEC_PER_MICROSEC +@@ -3083,12 +3048,6 @@ report_preparing_count_progress (CommonJob *job, + source_info->num_files); + } + break; +- +- case OP_KIND_COMPRESS: +- s = f (ngettext ("Preparing to compress %'d file", +- "Preparing to compress %'d files", +- source_info->num_files), +- source_info->num_files); + } + + nautilus_progress_info_take_details (job->progress, s); +@@ -3135,9 +3094,6 @@ get_scan_primary (OpKind kind) + { + return f (_("Error while moving files to trash.")); + } +- +- case OP_KIND_COMPRESS: +- return f (_("Error while compressing files.")); + } + } + +@@ -8141,715 +8097,6 @@ nautilus_file_mark_desktop_file_trusted (GFile *file, + g_object_unref (task); + } + +-static void +-extract_task_done (GObject *source_object, +- GAsyncResult *res, +- gpointer user_data) +-{ +- ExtractJob *extract_job; +- +- extract_job = user_data; +- +- if (extract_job->done_callback) +- { +- extract_job->done_callback (extract_job->output_files, +- extract_job->done_callback_data); +- } +- +- g_list_free_full (extract_job->source_files, g_object_unref); +- g_list_free_full (extract_job->output_files, g_object_unref); +- g_object_unref (extract_job->destination_directory); +- +- finalize_common ((CommonJob *) extract_job); +- +- nautilus_file_changes_consume_changes (TRUE); +-} +- +-static GFile * +-extract_job_on_decide_destination (AutoarExtractor *extractor, +- GFile *destination, +- GList *files, +- gpointer user_data) +-{ +- ExtractJob *extract_job = user_data; +- GFile *decided_destination; +- g_autofree char *basename = NULL; +- +- nautilus_progress_info_set_details (extract_job->common.progress, +- _("Verifying destination")); +- +- basename = g_file_get_basename (destination); +- decided_destination = nautilus_generate_unique_file_in_directory (extract_job->destination_directory, +- basename); +- +- if (job_aborted ((CommonJob *) extract_job)) +- { +- g_object_unref (decided_destination); +- return NULL; +- } +- +- extract_job->output_files = g_list_prepend (extract_job->output_files, +- decided_destination); +- +- return g_object_ref (decided_destination); +-} +- +-static void +-extract_job_on_progress (AutoarExtractor *extractor, +- guint64 archive_current_decompressed_size, +- guint archive_current_decompressed_files, +- gpointer user_data) +-{ +- ExtractJob *extract_job = user_data; +- CommonJob *common = user_data; +- GFile *source_file; +- char *details; +- double elapsed; +- double transfer_rate; +- int remaining_time; +- guint64 archive_total_decompressed_size; +- gdouble archive_weight; +- gdouble archive_decompress_progress; +- guint64 job_completed_size; +- gdouble job_progress; +- +- source_file = autoar_extractor_get_source_file (extractor); +- +- nautilus_progress_info_take_status (common->progress, +- f (_("Extracting “%B”"), source_file)); +- +- archive_total_decompressed_size = autoar_extractor_get_total_size (extractor); +- +- archive_decompress_progress = (gdouble) archive_current_decompressed_size / +- (gdouble) archive_total_decompressed_size; +- +- archive_weight = 0; +- if (extract_job->total_compressed_size) +- { +- archive_weight = (gdouble) extract_job->archive_compressed_size / +- (gdouble) extract_job->total_compressed_size; +- } +- +- job_progress = archive_decompress_progress * archive_weight + extract_job->base_progress; +- +- elapsed = g_timer_elapsed (common->time, NULL); +- +- transfer_rate = 0; +- remaining_time = -1; +- +- job_completed_size = job_progress * extract_job->total_compressed_size; +- +- if (elapsed > 0) +- { +- transfer_rate = job_completed_size / elapsed; +- } +- if (transfer_rate > 0) +- { +- remaining_time = (extract_job->total_compressed_size - job_completed_size) / +- transfer_rate; +- } +- +- if (elapsed < SECONDS_NEEDED_FOR_RELIABLE_TRANSFER_RATE || +- transfer_rate == 0) +- { +- /* To translators: %S will expand to a size like "2 bytes" or +- * "3 MB", so something like "4 kb / 4 MB" +- */ +- details = f (_("%S / %S"), job_completed_size, extract_job->total_compressed_size); +- } +- else +- { +- /* To translators: %S will expand to a size like "2 bytes" or +- * "3 MB", %T to a time duration like "2 minutes". So the whole +- * thing will be something like +- * "2 kb / 4 MB -- 2 hours left (4kb/sec)" +- * +- * The singular/plural form will be used depending on the +- * remaining time (i.e. the %T argument). +- */ +- details = f (ngettext ("%S / %S \xE2\x80\x94 %T left (%S/sec)", +- "%S / %S \xE2\x80\x94 %T left (%S/sec)", +- seconds_count_format_time_units (remaining_time)), +- job_completed_size, extract_job->total_compressed_size, +- remaining_time, +- (goffset) transfer_rate); +- } +- +- nautilus_progress_info_take_details (common->progress, details); +- +- if (elapsed > SECONDS_NEEDED_FOR_APROXIMATE_TRANSFER_RATE) +- { +- nautilus_progress_info_set_remaining_time (common->progress, +- remaining_time); +- nautilus_progress_info_set_elapsed_time (common->progress, +- elapsed); +- } +- +- nautilus_progress_info_set_progress (common->progress, job_progress, 1); +-} +- +-static void +-extract_job_on_error (AutoarExtractor *extractor, +- GError *error, +- gpointer user_data) +-{ +- ExtractJob *extract_job = user_data; +- GFile *source_file; +- gint response_id; +- +- source_file = autoar_extractor_get_source_file (extractor); +- +- if (IS_IO_ERROR (error, NOT_SUPPORTED)) +- { +- handle_unsupported_compressed_file (extract_job->common.parent_window, +- source_file); +- +- return; +- } +- +- nautilus_progress_info_take_status (extract_job->common.progress, +- f (_("Error extracting “%B”"), +- source_file)); +- +- response_id = run_warning ((CommonJob *) extract_job, +- f (_("There was an error while extracting “%B”."), +- source_file), +- g_strdup (error->message), +- NULL, +- FALSE, +- CANCEL, +- SKIP, +- NULL); +- +- if (response_id == 0 || response_id == GTK_RESPONSE_DELETE_EVENT) +- { +- abort_job ((CommonJob *) extract_job); +- } +-} +- +-static void +-extract_job_on_completed (AutoarExtractor *extractor, +- gpointer user_data) +-{ +- ExtractJob *extract_job = user_data; +- GFile *output_file; +- +- output_file = G_FILE (extract_job->output_files->data); +- +- nautilus_file_changes_queue_file_added (output_file); +-} +- +-static void +-report_extract_final_progress (ExtractJob *extract_job, +- gint total_files) +-{ +- char *status; +- +- nautilus_progress_info_set_destination (extract_job->common.progress, +- extract_job->destination_directory); +- +- if (total_files == 1) +- { +- GFile *source_file; +- +- source_file = G_FILE (extract_job->source_files->data); +- status = f (_("Extracted “%B” to “%B”"), +- source_file, +- extract_job->destination_directory); +- } +- else +- { +- status = f (ngettext ("Extracted %'d file to “%B”", +- "Extracted %'d files to “%B”", +- total_files), +- total_files, +- extract_job->destination_directory); +- } +- +- nautilus_progress_info_take_status (extract_job->common.progress, +- status); +- nautilus_progress_info_take_details (extract_job->common.progress, +- f (_("%S / %S"), +- extract_job->total_compressed_size, +- extract_job->total_compressed_size)); +-} +- +-static void +-extract_task_thread_func (GTask *task, +- gpointer source_object, +- gpointer task_data, +- GCancellable *cancellable) +-{ +- ExtractJob *extract_job = task_data; +- GList *l; +- GList *existing_output_files = NULL; +- gint total_files; +- g_autofree guint64 *archive_compressed_sizes = NULL; +- gint i; +- +- g_timer_start (extract_job->common.time); +- +- nautilus_progress_info_start (extract_job->common.progress); +- +- nautilus_progress_info_set_details (extract_job->common.progress, +- _("Preparing to extract")); +- +- total_files = g_list_length (extract_job->source_files); +- +- archive_compressed_sizes = g_malloc0_n (total_files, sizeof (guint64)); +- extract_job->total_compressed_size = 0; +- +- for (l = extract_job->source_files, i = 0; +- l != NULL && !job_aborted ((CommonJob *) extract_job); +- l = l->next, i++) +- { +- GFile *source_file; +- g_autoptr (GFileInfo) info = NULL; +- +- source_file = G_FILE (l->data); +- info = g_file_query_info (source_file, +- G_FILE_ATTRIBUTE_STANDARD_SIZE, +- G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, +- extract_job->common.cancellable, +- NULL); +- +- if (info) +- { +- archive_compressed_sizes[i] = g_file_info_get_size (info); +- extract_job->total_compressed_size += archive_compressed_sizes[i]; +- } +- } +- +- extract_job->base_progress = 0; +- +- for (l = extract_job->source_files, i = 0; +- l != NULL && !job_aborted ((CommonJob *) extract_job); +- l = l->next, i++) +- { +- g_autoptr (AutoarExtractor) extractor = NULL; +- +- extractor = autoar_extractor_new (G_FILE (l->data), +- extract_job->destination_directory); +- +- autoar_extractor_set_notify_interval (extractor, +- PROGRESS_NOTIFY_INTERVAL); +- +- g_signal_connect (extractor, "error", +- G_CALLBACK (extract_job_on_error), +- extract_job); +- g_signal_connect (extractor, "decide-destination", +- G_CALLBACK (extract_job_on_decide_destination), +- extract_job); +- g_signal_connect (extractor, "progress", +- G_CALLBACK (extract_job_on_progress), +- extract_job); +- g_signal_connect (extractor, "completed", +- G_CALLBACK (extract_job_on_completed), +- extract_job); +- +- extract_job->archive_compressed_size = archive_compressed_sizes[i]; +- +- autoar_extractor_start (extractor, +- extract_job->common.cancellable); +- +- g_signal_handlers_disconnect_by_data (extractor, +- extract_job); +- +- extract_job->base_progress += (gdouble) extract_job->archive_compressed_size / +- (gdouble) extract_job->total_compressed_size; +- } +- +- if (!job_aborted ((CommonJob *) extract_job)) +- { +- report_extract_final_progress (extract_job, total_files); +- } +- +- for (l = extract_job->output_files; l != NULL; l = l->next) +- { +- GFile *output_file; +- +- output_file = G_FILE (l->data); +- +- if (g_file_query_exists (output_file, NULL)) +- { +- existing_output_files = g_list_prepend (existing_output_files, +- g_object_ref (output_file)); +- } +- } +- +- g_list_free_full (extract_job->output_files, g_object_unref); +- +- extract_job->output_files = existing_output_files; +- +- if (extract_job->common.undo_info) +- { +- if (extract_job->output_files) +- { +- NautilusFileUndoInfoExtract *undo_info; +- +- undo_info = NAUTILUS_FILE_UNDO_INFO_EXTRACT (extract_job->common.undo_info); +- +- nautilus_file_undo_info_extract_set_outputs (undo_info, +- extract_job->output_files); +- } +- else +- { +- /* There is nothing to undo if there is no output */ +- g_clear_object (&extract_job->common.undo_info); +- } +- } +-} +- +-void +-nautilus_file_operations_extract_files (GList *files, +- GFile *destination_directory, +- GtkWindow *parent_window, +- NautilusExtractCallback done_callback, +- gpointer done_callback_data) +-{ +- ExtractJob *extract_job; +- g_autoptr (GTask) task = NULL; +- +- extract_job = op_job_new (ExtractJob, parent_window); +- extract_job->source_files = g_list_copy_deep (files, +- (GCopyFunc) g_object_ref, +- NULL); +- extract_job->destination_directory = g_object_ref (destination_directory); +- extract_job->done_callback = done_callback; +- extract_job->done_callback_data = done_callback_data; +- +- inhibit_power_manager ((CommonJob *) extract_job, _("Extracting Files")); +- +- if (!nautilus_file_undo_manager_is_operating ()) +- { +- extract_job->common.undo_info = nautilus_file_undo_info_extract_new (files, +- destination_directory); +- } +- +- task = g_task_new (NULL, extract_job->common.cancellable, +- extract_task_done, extract_job); +- g_task_set_task_data (task, extract_job, NULL); +- g_task_run_in_thread (task, extract_task_thread_func); +-} +- +-static void +-compress_task_done (GObject *source_object, +- GAsyncResult *res, +- gpointer user_data) +-{ +- CompressJob *compress_job = user_data; +- +- if (compress_job->done_callback) +- { +- compress_job->done_callback (compress_job->output_file, +- compress_job->success, +- compress_job->done_callback_data); +- } +- +- g_object_unref (compress_job->output_file); +- g_list_free_full (compress_job->source_files, g_object_unref); +- +- finalize_common ((CommonJob *) compress_job); +- +- nautilus_file_changes_consume_changes (TRUE); +-} +- +-static void +-compress_job_on_progress (AutoarCompressor *compressor, +- guint64 completed_size, +- guint completed_files, +- gpointer user_data) +-{ +- CompressJob *compress_job = user_data; +- CommonJob *common = user_data; +- char *status; +- char *details; +- int files_left; +- double elapsed; +- double transfer_rate; +- int remaining_time; +- +- files_left = compress_job->total_files - completed_files; +- +- if (compress_job->total_files == 1) +- { +- status = f (_("Compressing “%B” into “%B”"), +- G_FILE (compress_job->source_files->data), +- compress_job->output_file); +- } +- else +- { +- status = f (ngettext ("Compressing %'d file into “%B”", +- "Compressing %'d files into “%B”", +- compress_job->total_files), +- compress_job->total_files, +- compress_job->output_file); +- } +- +- nautilus_progress_info_take_status (common->progress, status); +- +- elapsed = g_timer_elapsed (common->time, NULL); +- +- transfer_rate = 0; +- remaining_time = -1; +- +- if (elapsed > 0) +- { +- if (completed_size > 0) +- { +- transfer_rate = completed_size / elapsed; +- remaining_time = (compress_job->total_size - completed_size) / transfer_rate; +- } +- else if (completed_files > 0) +- { +- transfer_rate = completed_files / elapsed; +- remaining_time = (compress_job->total_files - completed_files) / transfer_rate; +- } +- } +- +- if (elapsed < SECONDS_NEEDED_FOR_RELIABLE_TRANSFER_RATE || +- transfer_rate == 0) +- { +- if (compress_job->total_files == 1) +- { +- /* To translators: %S will expand to a size like "2 bytes" or "3 MB", so something like "4 kb / 4 MB" */ +- details = f (_("%S / %S"), completed_size, compress_job->total_size); +- } +- else +- { +- details = f (_("%'d / %'d"), +- files_left > 0 ? completed_files + 1 : completed_files, +- compress_job->total_files); +- } +- } +- else +- { +- if (compress_job->total_files == 1) +- { +- if (files_left > 0) +- { +- /* To translators: %S will expand to a size like "2 bytes" or "3 MB", %T to a time duration like +- * "2 minutes". So the whole thing will be something like "2 kb / 4 MB -- 2 hours left (4kb/sec)" +- * +- * The singular/plural form will be used depending on the remaining time (i.e. the %T argument). +- */ +- details = f (ngettext ("%S / %S \xE2\x80\x94 %T left (%S/sec)", +- "%S / %S \xE2\x80\x94 %T left (%S/sec)", +- seconds_count_format_time_units (remaining_time)), +- completed_size, compress_job->total_size, +- remaining_time, +- (goffset) transfer_rate); +- } +- else +- { +- /* To translators: %S will expand to a size like "2 bytes" or "3 MB". */ +- details = f (_("%S / %S"), +- completed_size, +- compress_job->total_size); +- } +- } +- else +- { +- if (files_left > 0) +- { +- /* To translators: %T will expand to a time duration like "2 minutes". +- * So the whole thing will be something like "1 / 5 -- 2 hours left (4kb/sec)" +- * +- * The singular/plural form will be used depending on the remaining time (i.e. the %T argument). +- */ +- details = f (ngettext ("%'d / %'d \xE2\x80\x94 %T left (%S/sec)", +- "%'d / %'d \xE2\x80\x94 %T left (%S/sec)", +- seconds_count_format_time_units (remaining_time)), +- completed_files + 1, compress_job->total_files, +- remaining_time, +- (goffset) transfer_rate); +- } +- else +- { +- /* To translators: %'d is the number of files completed for the operation, +- * so it will be something like 2/14. */ +- details = f (_("%'d / %'d"), +- completed_files, +- compress_job->total_files); +- } +- } +- } +- +- nautilus_progress_info_take_details (common->progress, details); +- +- if (elapsed > SECONDS_NEEDED_FOR_APROXIMATE_TRANSFER_RATE) +- { +- nautilus_progress_info_set_remaining_time (common->progress, +- remaining_time); +- nautilus_progress_info_set_elapsed_time (common->progress, +- elapsed); +- } +- +- nautilus_progress_info_set_progress (common->progress, +- completed_size, +- compress_job->total_size); +-} +- +-static void +-compress_job_on_error (AutoarCompressor *compressor, +- GError *error, +- gpointer user_data) +-{ +- CompressJob *compress_job = user_data; +- char *status; +- +- if (compress_job->total_files == 1) +- { +- status = f (_("Error compressing “%B” into “%B”"), +- G_FILE (compress_job->source_files->data), +- compress_job->output_file); +- } +- else +- { +- status = f (ngettext ("Error compressing %'d file into “%B”", +- "Error compressing %'d files into “%B”", +- compress_job->total_files), +- compress_job->total_files, +- compress_job->output_file); +- } +- +- nautilus_progress_info_take_status (compress_job->common.progress, +- status); +- +- run_error ((CommonJob *) compress_job, +- g_strdup (_("There was an error while compressing files.")), +- g_strdup (error->message), +- NULL, +- FALSE, +- CANCEL, +- NULL); +- +- abort_job ((CommonJob *) compress_job); +-} +- +-static void +-compress_job_on_completed (AutoarCompressor *compressor, +- gpointer user_data) +-{ +- CompressJob *compress_job = user_data; +- g_autoptr (GFile) destination_directory = NULL; +- char *status; +- +- if (compress_job->total_files == 1) +- { +- status = f (_("Compressed “%B” into “%B”"), +- G_FILE (compress_job->source_files->data), +- compress_job->output_file); +- } +- else +- { +- status = f (ngettext ("Compressed %'d file into “%B”", +- "Compressed %'d files into “%B”", +- compress_job->total_files), +- compress_job->total_files, +- compress_job->output_file); +- } +- +- nautilus_progress_info_take_status (compress_job->common.progress, +- status); +- +- nautilus_file_changes_queue_file_added (compress_job->output_file); +- +- destination_directory = g_file_get_parent (compress_job->output_file); +- nautilus_progress_info_set_destination (compress_job->common.progress, +- destination_directory); +-} +- +-static void +-compress_task_thread_func (GTask *task, +- gpointer source_object, +- gpointer task_data, +- GCancellable *cancellable) +-{ +- CompressJob *compress_job = task_data; +- SourceInfo source_info; +- g_autoptr (AutoarCompressor) compressor = NULL; +- +- g_timer_start (compress_job->common.time); +- +- nautilus_progress_info_start (compress_job->common.progress); +- +- scan_sources (compress_job->source_files, +- &source_info, +- (CommonJob *) compress_job, +- OP_KIND_COMPRESS); +- +- compress_job->total_files = source_info.num_files; +- compress_job->total_size = source_info.num_bytes; +- +- compressor = autoar_compressor_new (compress_job->source_files, +- compress_job->output_file, +- compress_job->format, +- compress_job->filter, +- FALSE); +- +- autoar_compressor_set_output_is_dest (compressor, TRUE); +- +- autoar_compressor_set_notify_interval (compressor, +- PROGRESS_NOTIFY_INTERVAL); +- +- g_signal_connect (compressor, "progress", +- G_CALLBACK (compress_job_on_progress), compress_job); +- g_signal_connect (compressor, "error", +- G_CALLBACK (compress_job_on_error), compress_job); +- g_signal_connect (compressor, "completed", +- G_CALLBACK (compress_job_on_completed), compress_job); +- autoar_compressor_start (compressor, +- compress_job->common.cancellable); +- +- compress_job->success = g_file_query_exists (compress_job->output_file, +- NULL); +- +- /* There is nothing to undo if the output was not created */ +- if (compress_job->common.undo_info != NULL && !compress_job->success) +- { +- g_clear_object (&compress_job->common.undo_info); +- } +-} +- +-void +-nautilus_file_operations_compress (GList *files, +- GFile *output, +- AutoarFormat format, +- AutoarFilter filter, +- GtkWindow *parent_window, +- NautilusCreateCallback done_callback, +- gpointer done_callback_data) +-{ +- g_autoptr (GTask) task = NULL; +- CompressJob *compress_job; +- +- compress_job = op_job_new (CompressJob, parent_window); +- compress_job->source_files = g_list_copy_deep (files, +- (GCopyFunc) g_object_ref, +- NULL); +- compress_job->output_file = g_object_ref (output); +- compress_job->format = format; +- compress_job->filter = filter; +- compress_job->done_callback = done_callback; +- compress_job->done_callback_data = done_callback_data; +- +- inhibit_power_manager ((CommonJob *) compress_job, _("Compressing Files")); +- +- if (!nautilus_file_undo_manager_is_operating ()) +- { +- compress_job->common.undo_info = nautilus_file_undo_info_compress_new (files, +- output, +- format, +- filter); +- } +- +- task = g_task_new (NULL, compress_job->common.cancellable, +- compress_task_done, compress_job); +- g_task_set_task_data (task, compress_job, NULL); +- g_task_run_in_thread (task, compress_task_thread_func); +-} +- + #if !defined (NAUTILUS_OMIT_SELF_CHECK) + + void +diff --git a/src/nautilus-file-operations.h b/src/nautilus-file-operations.h +index 31b782dba..7b8e7ad68 100644 +--- a/src/nautilus-file-operations.h ++++ b/src/nautilus-file-operations.h +@@ -26,7 +26,6 @@ + + #include + #include +-#include + + + #define SECONDS_NEEDED_FOR_APROXIMATE_TRANSFER_RATE 1 +@@ -46,8 +45,6 @@ typedef void (* NautilusMountCallback) (GVolume *volume, + gboolean success, + GObject *callback_data_object); + typedef void (* NautilusUnmountCallback) (gpointer callback_data); +-typedef void (* NautilusExtractCallback) (GList *outputs, +- gpointer callback_data); + + /* FIXME: int copy_action should be an enum */ + +@@ -151,18 +148,5 @@ void nautilus_file_mark_desktop_file_trusted (GFile *file, + gboolean interactive, + NautilusOpCallback done_callback, + gpointer done_callback_data); +-void nautilus_file_operations_extract_files (GList *files, +- GFile *destination_directory, +- GtkWindow *parent_window, +- NautilusExtractCallback done_callback, +- gpointer done_callback_data); +-void nautilus_file_operations_compress (GList *files, +- GFile *output, +- AutoarFormat format, +- AutoarFilter filter, +- GtkWindow *parent_window, +- NautilusCreateCallback done_callback, +- gpointer done_callback_data); +- + + #endif /* NAUTILUS_FILE_OPERATIONS_H */ +diff --git a/src/nautilus-file-undo-operations.c b/src/nautilus-file-undo-operations.c +index 8005b92b6..2223d91f5 100644 +--- a/src/nautilus-file-undo-operations.c ++++ b/src/nautilus-file-undo-operations.c +@@ -2037,322 +2037,3 @@ nautilus_file_undo_info_ownership_new (NautilusFileUndoOp op_type, + return NAUTILUS_FILE_UNDO_INFO (retval); + } + +-/* extract */ +-G_DEFINE_TYPE (NautilusFileUndoInfoExtract, nautilus_file_undo_info_extract, NAUTILUS_TYPE_FILE_UNDO_INFO) +- +-struct _NautilusFileUndoInfoExtractDetails +-{ +- GList *sources; +- GFile *destination_directory; +- GList *outputs; +-}; +- +-static void +-extract_callback (GList *outputs, +- gpointer callback_data) +-{ +- NautilusFileUndoInfoExtract *self = NAUTILUS_FILE_UNDO_INFO_EXTRACT (callback_data); +- gboolean success; +- +- nautilus_file_undo_info_extract_set_outputs (self, outputs); +- +- success = self->priv->outputs != NULL; +- +- file_undo_info_transfer_callback (NULL, success, self); +-} +- +-static void +-extract_strings_func (NautilusFileUndoInfo *info, +- gchar **undo_label, +- gchar **undo_description, +- gchar **redo_label, +- gchar **redo_description) +-{ +- NautilusFileUndoInfoExtract *self = NAUTILUS_FILE_UNDO_INFO_EXTRACT (info); +- gint total_sources; +- gint total_outputs; +- +- *undo_label = g_strdup (_("_Undo Extract")); +- *redo_label = g_strdup (_("_Redo Extract")); +- +- total_sources = g_list_length (self->priv->sources); +- total_outputs = g_list_length (self->priv->outputs); +- +- if (total_outputs == 1) +- { +- GFile *output; +- g_autofree gchar *name = NULL; +- +- output = self->priv->outputs->data; +- name = g_file_get_parse_name (output); +- +- *undo_description = g_strdup_printf (_("Delete '%s'"), name); +- } +- else +- { +- *undo_description = g_strdup_printf (ngettext ("Delete %d extracted file", +- "Delete %d extracted files", +- total_outputs), +- total_outputs); +- } +- +- if (total_sources == 1) +- { +- GFile *source; +- g_autofree gchar *name = NULL; +- +- source = self->priv->sources->data; +- name = g_file_get_parse_name (source); +- +- *redo_description = g_strdup_printf (_("Extract '%s'"), name); +- } +- else +- { +- *redo_description = g_strdup_printf (ngettext ("Extract %d file", +- "Extract %d files", +- total_sources), +- total_sources); +- } +-} +- +-static void +-extract_redo_func (NautilusFileUndoInfo *info, +- GtkWindow *parent_window) +-{ +- NautilusFileUndoInfoExtract *self = NAUTILUS_FILE_UNDO_INFO_EXTRACT (info); +- +- nautilus_file_operations_extract_files (self->priv->sources, +- self->priv->destination_directory, +- parent_window, +- extract_callback, +- self); +-} +- +-static void +-extract_undo_func (NautilusFileUndoInfo *info, +- GtkWindow *parent_window) +-{ +- NautilusFileUndoInfoExtract *self = NAUTILUS_FILE_UNDO_INFO_EXTRACT (info); +- +- nautilus_file_operations_delete (self->priv->outputs, parent_window, +- file_undo_info_delete_callback, self); +-} +- +-static void +-nautilus_file_undo_info_extract_init (NautilusFileUndoInfoExtract *self) +-{ +- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, nautilus_file_undo_info_extract_get_type (), +- NautilusFileUndoInfoExtractDetails); +-} +- +-static void +-nautilus_file_undo_info_extract_finalize (GObject *obj) +-{ +- NautilusFileUndoInfoExtract *self = NAUTILUS_FILE_UNDO_INFO_EXTRACT (obj); +- +- g_object_unref (self->priv->destination_directory); +- g_list_free_full (self->priv->sources, g_object_unref); +- if (self->priv->outputs) +- { +- g_list_free_full (self->priv->outputs, g_object_unref); +- } +- +- G_OBJECT_CLASS (nautilus_file_undo_info_extract_parent_class)->finalize (obj); +-} +- +-static void +-nautilus_file_undo_info_extract_class_init (NautilusFileUndoInfoExtractClass *klass) +-{ +- GObjectClass *oclass = G_OBJECT_CLASS (klass); +- NautilusFileUndoInfoClass *iclass = NAUTILUS_FILE_UNDO_INFO_CLASS (klass); +- +- oclass->finalize = nautilus_file_undo_info_extract_finalize; +- +- iclass->undo_func = extract_undo_func; +- iclass->redo_func = extract_redo_func; +- iclass->strings_func = extract_strings_func; +- +- g_type_class_add_private (klass, sizeof (NautilusFileUndoInfoExtractDetails)); +-} +- +-void +-nautilus_file_undo_info_extract_set_outputs (NautilusFileUndoInfoExtract *self, +- GList *outputs) +-{ +- if (self->priv->outputs) +- { +- g_list_free_full (self->priv->outputs, g_object_unref); +- } +- self->priv->outputs = g_list_copy_deep (outputs, +- (GCopyFunc) g_object_ref, +- NULL); +-} +- +-NautilusFileUndoInfo * +-nautilus_file_undo_info_extract_new (GList *sources, +- GFile *destination_directory) +-{ +- NautilusFileUndoInfoExtract *self; +- +- self = g_object_new (NAUTILUS_TYPE_FILE_UNDO_INFO_EXTRACT, +- "item-count", 1, +- "op-type", NAUTILUS_FILE_UNDO_OP_EXTRACT, +- NULL); +- +- self->priv->sources = g_list_copy_deep (sources, +- (GCopyFunc) g_object_ref, +- NULL); +- self->priv->destination_directory = g_object_ref (destination_directory); +- +- return NAUTILUS_FILE_UNDO_INFO (self); +-} +- +- +-/* compress */ +-G_DEFINE_TYPE (NautilusFileUndoInfoCompress, nautilus_file_undo_info_compress, NAUTILUS_TYPE_FILE_UNDO_INFO) +- +-struct _NautilusFileUndoInfoCompressDetails +-{ +- GList *sources; +- GFile *output; +- AutoarFormat format; +- AutoarFilter filter; +-}; +- +-static void +-compress_callback (GFile *new_file, +- gboolean success, +- gpointer callback_data) +-{ +- NautilusFileUndoInfoCompress *self = NAUTILUS_FILE_UNDO_INFO_COMPRESS (callback_data); +- +- if (success) +- { +- g_object_unref (self->priv->output); +- +- self->priv->output = g_object_ref (new_file); +- } +- +- file_undo_info_transfer_callback (NULL, success, self); +-} +- +-static void +-compress_strings_func (NautilusFileUndoInfo *info, +- gchar **undo_label, +- gchar **undo_description, +- gchar **redo_label, +- gchar **redo_description) +-{ +- NautilusFileUndoInfoCompress *self = NAUTILUS_FILE_UNDO_INFO_COMPRESS (info); +- g_autofree gchar *output_name = NULL; +- gint sources_count; +- +- output_name = g_file_get_parse_name (self->priv->output); +- *undo_description = g_strdup_printf (_("Delete '%s'"), output_name); +- +- sources_count = g_list_length (self->priv->sources); +- if (sources_count == 1) +- { +- GFile *source; +- g_autofree gchar *source_name = NULL; +- +- source = self->priv->sources->data; +- source_name = g_file_get_parse_name (source); +- +- *redo_description = g_strdup_printf (_("Compress '%s'"), source_name); +- } +- else +- { +- *redo_description = g_strdup_printf (ngettext ("Compress %d file", +- "Compress %d files", +- sources_count), +- sources_count); +- } +- +- *undo_label = g_strdup (_("_Undo Compress")); +- *redo_label = g_strdup (_("_Redo Compress")); +-} +- +-static void +-compress_redo_func (NautilusFileUndoInfo *info, +- GtkWindow *parent_window) +-{ +- NautilusFileUndoInfoCompress *self = NAUTILUS_FILE_UNDO_INFO_COMPRESS (info); +- +- nautilus_file_operations_compress (self->priv->sources, +- self->priv->output, +- self->priv->format, +- self->priv->filter, +- parent_window, +- compress_callback, +- self); +-} +- +-static void +-compress_undo_func (NautilusFileUndoInfo *info, +- GtkWindow *parent_window) +-{ +- NautilusFileUndoInfoCompress *self = NAUTILUS_FILE_UNDO_INFO_COMPRESS (info); +- GList *files = NULL; +- +- files = g_list_prepend (files, self->priv->output); +- +- nautilus_file_operations_delete (files, parent_window, +- file_undo_info_delete_callback, self); +- +- g_list_free (files); +-} +- +-static void +-nautilus_file_undo_info_compress_init (NautilusFileUndoInfoCompress *self) +-{ +- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, nautilus_file_undo_info_compress_get_type (), +- NautilusFileUndoInfoCompressDetails); +-} +- +-static void +-nautilus_file_undo_info_compress_finalize (GObject *obj) +-{ +- NautilusFileUndoInfoCompress *self = NAUTILUS_FILE_UNDO_INFO_COMPRESS (obj); +- +- g_list_free_full (self->priv->sources, g_object_unref); +- g_clear_object (&self->priv->output); +- +- G_OBJECT_CLASS (nautilus_file_undo_info_compress_parent_class)->finalize (obj); +-} +- +-static void +-nautilus_file_undo_info_compress_class_init (NautilusFileUndoInfoCompressClass *klass) +-{ +- GObjectClass *oclass = G_OBJECT_CLASS (klass); +- NautilusFileUndoInfoClass *iclass = NAUTILUS_FILE_UNDO_INFO_CLASS (klass); +- +- oclass->finalize = nautilus_file_undo_info_compress_finalize; +- +- iclass->undo_func = compress_undo_func; +- iclass->redo_func = compress_redo_func; +- iclass->strings_func = compress_strings_func; +- +- g_type_class_add_private (klass, sizeof (NautilusFileUndoInfoCompressDetails)); +-} +- +-NautilusFileUndoInfo * +-nautilus_file_undo_info_compress_new (GList *sources, +- GFile *output, +- AutoarFormat format, +- AutoarFilter filter) +-{ +- NautilusFileUndoInfoCompress *self; +- +- self = g_object_new (NAUTILUS_TYPE_FILE_UNDO_INFO_COMPRESS, +- "item-count", 1, +- "op-type", NAUTILUS_FILE_UNDO_OP_COMPRESS, +- NULL); +- +- self->priv->sources = g_list_copy_deep (sources, (GCopyFunc) g_object_ref, NULL); +- self->priv->output = g_object_ref (output); +- self->priv->format = format; +- self->priv->filter = filter; +- +- return NAUTILUS_FILE_UNDO_INFO (self); +-} +diff --git a/src/nautilus-file-undo-operations.h b/src/nautilus-file-undo-operations.h +index 630443f10..8a153c32d 100644 +--- a/src/nautilus-file-undo-operations.h ++++ b/src/nautilus-file-undo-operations.h +@@ -27,7 +27,6 @@ + + #include + #include +-#include + + typedef enum { + NAUTILUS_FILE_UNDO_OP_COPY, +@@ -38,8 +37,6 @@ typedef enum { + NAUTILUS_FILE_UNDO_OP_CREATE_EMPTY_FILE, + NAUTILUS_FILE_UNDO_OP_CREATE_FILE_FROM_TEMPLATE, + NAUTILUS_FILE_UNDO_OP_CREATE_FOLDER, +- NAUTILUS_FILE_UNDO_OP_EXTRACT, +- NAUTILUS_FILE_UNDO_OP_COMPRESS, + NAUTILUS_FILE_UNDO_OP_MOVE_TO_TRASH, + NAUTILUS_FILE_UNDO_OP_RESTORE_FROM_TRASH, + NAUTILUS_FILE_UNDO_OP_CREATE_LINK, +@@ -328,59 +325,4 @@ NautilusFileUndoInfo *nautilus_file_undo_info_ownership_new (NautilusFileUndoOp + const char *current_data, + const char *new_data); + +-/* extract */ +-#define NAUTILUS_TYPE_FILE_UNDO_INFO_EXTRACT (nautilus_file_undo_info_extract_get_type ()) +-#define NAUTILUS_FILE_UNDO_INFO_EXTRACT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), NAUTILUS_TYPE_FILE_UNDO_INFO_EXTRACT, NautilusFileUndoInfoExtract)) +-#define NAUTILUS_FILE_UNDO_INFO_EXTRACT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), NAUTILUS_TYPE_FILE_UNDO_INFO_EXTRACT, NautilusFileUndoInfoExtractClass)) +-#define NAUTILUS_IS_FILE_UNDO_INFO_EXTRACT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), NAUTILUS_TYPE_FILE_UNDO_INFO_EXTRACT)) +-#define NAUTILUS_IS_FILE_UNDO_INFO_EXTRACT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), NAUTILUS_TYPE_FILE_UNDO_INFO_EXTRACT)) +-#define NAUTILUS_FILE_UNDO_INFO_EXTRACT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NAUTILUS_TYPE_FILE_UNDO_INFO_EXTRACT, NautilusFileUndoInfoExtractClass)) +- +-typedef struct _NautilusFileUndoInfoExtract NautilusFileUndoInfoExtract; +-typedef struct _NautilusFileUndoInfoExtractClass NautilusFileUndoInfoExtractClass; +-typedef struct _NautilusFileUndoInfoExtractDetails NautilusFileUndoInfoExtractDetails; +- +-struct _NautilusFileUndoInfoExtract { +- NautilusFileUndoInfo parent; +- NautilusFileUndoInfoExtractDetails *priv; +-}; +- +-struct _NautilusFileUndoInfoExtractClass { +- NautilusFileUndoInfoClass parent_class; +-}; +- +-GType nautilus_file_undo_info_extract_get_type (void) G_GNUC_CONST; +-NautilusFileUndoInfo * nautilus_file_undo_info_extract_new (GList *sources, +- GFile *destination_directory); +-void nautilus_file_undo_info_extract_set_outputs (NautilusFileUndoInfoExtract *self, +- GList *outputs); +- +-/* compress */ +-#define NAUTILUS_TYPE_FILE_UNDO_INFO_COMPRESS (nautilus_file_undo_info_compress_get_type ()) +-#define NAUTILUS_FILE_UNDO_INFO_COMPRESS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), NAUTILUS_TYPE_FILE_UNDO_INFO_COMPRESS, NautilusFileUndoInfoCompress)) +-#define NAUTILUS_FILE_UNDO_INFO_COMPRESS_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), NAUTILUS_TYPE_FILE_UNDO_INFO_COMPRESS, NautilusFileUndoInfoCompressClass)) +-#define NAUTILUS_IS_FILE_UNDO_INFO_COMPRESS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), NAUTILUS_TYPE_FILE_UNDO_INFO_COMPRESS)) +-#define NAUTILUS_IS_FILE_UNDO_INFO_COMPRESS_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), NAUTILUS_TYPE_FILE_UNDO_INFO_COMPRESS)) +-#define NAUTILUS_FILE_UNDO_INFO_COMPRESS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NAUTILUS_TYPE_FILE_UNDO_INFO_COMPRESS, NautilusFileUndoInfoCompressClass)) +- +-typedef struct _NautilusFileUndoInfoCompress NautilusFileUndoInfoCompress; +-typedef struct _NautilusFileUndoInfoCompressClass NautilusFileUndoInfoCompressClass; +-typedef struct _NautilusFileUndoInfoCompressDetails NautilusFileUndoInfoCompressDetails; +- +-struct _NautilusFileUndoInfoCompress { +- NautilusFileUndoInfo parent; +- NautilusFileUndoInfoCompressDetails *priv; +-}; +- +-struct _NautilusFileUndoInfoCompressClass { +- NautilusFileUndoInfoClass parent_class; +-}; +- +-GType nautilus_file_undo_info_compress_get_type (void) G_GNUC_CONST; +-NautilusFileUndoInfo * nautilus_file_undo_info_compress_new (GList *sources, +- GFile *output, +- AutoarFormat format, +- AutoarFilter filter); +- +- + #endif /* __NAUTILUS_FILE_UNDO_OPERATIONS_H__ */ +diff --git a/src/nautilus-file.c b/src/nautilus-file.c +index bb7948da0..d7df1d9fc 100644 +--- a/src/nautilus-file.c ++++ b/src/nautilus-file.c +@@ -51,7 +51,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -8169,11 +8168,38 @@ real_is_special_link (NautilusFile *file) + gboolean + nautilus_file_is_archive (NautilusFile *file) + { +- g_autofree char *mime_type = NULL; +- +- mime_type = nautilus_file_get_mime_type (file); +- +- return autoar_check_mime_type_supported (mime_type); ++ char *mime_type; ++ int i; ++ static const char * archive_mime_types[] = { "application/x-gtar", ++ "application/x-zip", ++ "application/x-zip-compressed", ++ "application/zip", ++ "application/x-zip", ++ "application/x-tar", ++ "application/x-7z-compressed", ++ "application/x-rar", ++ "application/x-rar-compressed", ++ "application/x-jar", ++ "application/x-java-archive", ++ "application/x-war", ++ "application/x-ear", ++ "application/x-arj", ++ "application/x-gzip", ++ "application/x-bzip-compressed-tar", ++ "application/x-compressed-tar" }; ++ ++ g_return_val_if_fail (file != NULL, FALSE); ++ ++ mime_type = nautilus_file_get_mime_type (file); ++ for (i = 0; i < G_N_ELEMENTS (archive_mime_types); i++) { ++ if (!strcmp (mime_type, archive_mime_types[i])) { ++ g_free (mime_type); ++ return TRUE; ++ } ++ } ++ g_free (mime_type); ++ ++ return FALSE; + } + + +diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c +index 721682f4b..7caee9b5b 100644 +--- a/src/nautilus-files-view.c ++++ b/src/nautilus-files-view.c +@@ -58,7 +58,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -85,7 +84,6 @@ + #include "nautilus-file-name-widget-controller.h" + #include "nautilus-rename-file-popover-controller.h" + #include "nautilus-new-folder-dialog-controller.h" +-#include "nautilus-compress-dialog-controller.h" + #include "nautilus-global-preferences.h" + #include "nautilus-link.h" + #include "nautilus-metadata.h" +@@ -182,7 +180,6 @@ struct NautilusFilesViewDetails + + NautilusRenameFilePopoverController *rename_file_controller; + NautilusNewFolderDialogController *new_folder_controller; +- NautilusCompressDialogController *compress_controller; + + gboolean supports_zooming; + +@@ -319,12 +316,6 @@ static void nautilus_files_view_select_file (NautilusFilesView *view, + + static void update_templates_directory (NautilusFilesView *view); + +-static void extract_files (NautilusFilesView *view, +- GList *files, +- GFile *destination_directory); +-static void extract_files_to_chosen_location (NautilusFilesView *view, +- GList *files); +- + static void nautilus_files_view_check_empty_states (NautilusFilesView *view); + + static gboolean nautilus_files_view_is_searching (NautilusView *view); +@@ -697,16 +688,6 @@ nautilus_files_view_supports_creating_files (NautilusFilesView *view) + } + + static gboolean +-nautilus_files_view_supports_extract_here (NautilusFilesView *view) +-{ +- g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), FALSE); +- +- return nautilus_files_view_supports_creating_files (view) +- && !nautilus_directory_is_remote (view->details->model) +- && !nautilus_view_is_searching (NAUTILUS_VIEW (view)); +-} +- +-static gboolean + nautilus_files_view_is_empty (NautilusFilesView *view) + { + g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), FALSE); +@@ -1143,44 +1124,17 @@ nautilus_files_view_activate_files (NautilusFilesView *view, + NautilusWindowOpenFlags flags, + gboolean confirm_multiple) + { +- GList *files_to_extract; +- GList *files_to_activate; + char *path; + +- files_to_extract = nautilus_file_list_filter (files, +- &files_to_activate, +- (NautilusFileFilterFunc) nautilus_mime_file_extracts, +- NULL); +- +- if (nautilus_files_view_supports_extract_here (view)) +- { +- g_autoptr (GFile) location = NULL; +- g_autoptr (GFile) parent = NULL; +- +- location = nautilus_file_get_location (NAUTILUS_FILE (g_list_first (files)->data)); +- /* Get a parent from a random file. We assume all files has a common parent. +- * But don't assume the parent is the view location, since that's not the +- * case in list view when expand-folder setting is set +- */ +- parent = g_file_get_parent (location); +- extract_files (view, files_to_extract, parent); +- } +- else +- { +- extract_files_to_chosen_location (view, files_to_extract); +- } +- + path = get_view_directory (view); + nautilus_mime_activate_files (nautilus_files_view_get_containing_window (view), + view->details->slot, +- files_to_activate, ++ files, + path, + flags, + confirm_multiple); + + g_free (path); +- g_list_free (files_to_extract); +- g_list_free (files_to_activate); + } + + static void +@@ -1190,35 +1144,6 @@ nautilus_files_view_activate_file (NautilusFilesView *view, + { + char *path; + +- if (nautilus_mime_file_extracts (file)) +- { +- GList *files = NULL; +- +- files = g_list_prepend (files, file); +- +- if (nautilus_files_view_supports_extract_here (view)) +- { +- g_autoptr (GFile) location = NULL; +- g_autoptr (GFile) parent = NULL; +- +- location = nautilus_file_get_location (file); +- /* Get a parent from a random file. We assume all files has a common parent. +- * But don't assume the parent is the view location, since that's not the +- * case in list view when expand-folder setting is set +- */ +- parent = g_file_get_parent (location); +- extract_files (view, files, parent); +- } +- else +- { +- extract_files_to_chosen_location (view, files); +- } +- +- g_list_free (files); +- +- return; +- } +- + path = get_view_directory (view); + nautilus_mime_activate_file (nautilus_files_view_get_containing_window (view), + view->details->slot, +@@ -1990,215 +1915,6 @@ nautilus_files_view_new_folder_dialog_new (NautilusFilesView *view, + nautilus_directory_unref (containing_directory); + } + +-typedef struct +-{ +- NautilusFilesView *view; +- GHashTable *added_locations; +-} CompressData; +- +-static void +-compress_done (GFile *new_file, +- gboolean success, +- gpointer user_data) +-{ +- CompressData *data; +- NautilusFilesView *view; +- NautilusFile *file; +- +- data = user_data; +- view = data->view; +- +- if (view == NULL) +- { +- goto out; +- } +- +- g_signal_handlers_disconnect_by_func (view, +- G_CALLBACK (track_newly_added_locations), +- data->added_locations); +- +- if (!success) +- { +- goto out; +- } +- +- file = nautilus_file_get (new_file); +- +- if (g_hash_table_contains (data->added_locations, new_file)) +- { +- /* The file was already added */ +- nautilus_files_view_select_file (view, file); +- nautilus_files_view_reveal_selection (view); +- } +- else +- { +- g_hash_table_insert (view->details->pending_reveal, +- file, +- GUINT_TO_POINTER (TRUE)); +- } +- +- nautilus_file_unref (file); +-out: +- g_hash_table_destroy (data->added_locations); +- +- if (data->view != NULL) +- { +- g_object_remove_weak_pointer (G_OBJECT (data->view), +- (gpointer *) &data->view); +- } +- +- g_free (data); +-} +- +-static void +-compress_dialog_controller_on_name_accepted (NautilusFileNameWidgetController *controller, +- gpointer user_data) +-{ +- NautilusFilesView *view; +- g_autofree gchar *name = NULL; +- GList *selection; +- GList *source_files = NULL; +- GList *l; +- CompressData *data; +- g_autoptr (GFile) output = NULL; +- g_autoptr (GFile) parent = NULL; +- NautilusCompressionFormat compression_format; +- AutoarFormat format; +- AutoarFilter filter; +- +- view = NAUTILUS_FILES_VIEW (user_data); +- +- selection = nautilus_files_view_get_selection_for_file_transfer (view); +- +- for (l = selection; l != NULL; l = l->next) +- { +- source_files = g_list_prepend (source_files, +- nautilus_file_get_location (l->data)); +- } +- source_files = g_list_reverse (source_files); +- +- name = nautilus_file_name_widget_controller_get_new_name (controller); +- /* Get a parent from a random file. We assume all files has a common parent. +- * But don't assume the parent is the view location, since that's not the +- * case in list view when expand-folder setting is set +- */ +- parent = g_file_get_parent (G_FILE (g_list_first (source_files)->data)); +- output = g_file_get_child (parent, name); +- +- data = g_new (CompressData, 1); +- data->view = view; +- data->added_locations = g_hash_table_new_full (g_file_hash, (GEqualFunc) g_file_equal, +- g_object_unref, NULL); +- g_object_add_weak_pointer (G_OBJECT (data->view), +- (gpointer *) &data->view); +- +- g_signal_connect_data (view, +- "add-file", +- G_CALLBACK (track_newly_added_locations), +- data->added_locations, +- NULL, +- G_CONNECT_AFTER); +- +- compression_format = g_settings_get_enum (nautilus_compression_preferences, +- NAUTILUS_PREFERENCES_DEFAULT_COMPRESSION_FORMAT); +- +- switch (compression_format) +- { +- case NAUTILUS_COMPRESSION_ZIP: +- { +- format = AUTOAR_FORMAT_ZIP; +- filter = AUTOAR_FILTER_NONE; +- } +- break; +- +- case NAUTILUS_COMPRESSION_TAR_XZ: +- { +- format = AUTOAR_FORMAT_TAR; +- filter = AUTOAR_FILTER_XZ; +- } +- break; +- +- case NAUTILUS_COMPRESSION_7ZIP: +- { +- format = AUTOAR_FORMAT_7ZIP; +- filter = AUTOAR_FILTER_NONE; +- } +- break; +- +- default: +- g_assert_not_reached (); +- } +- +- nautilus_file_operations_compress (source_files, output, +- format, +- filter, +- nautilus_files_view_get_containing_window (view), +- compress_done, +- data); +- +- nautilus_file_list_free (selection); +- g_list_free_full (source_files, g_object_unref); +- g_clear_object (&view->details->compress_controller); +-} +- +-static void +-compress_dialog_controller_on_cancelled (NautilusNewFolderDialogController *controller, +- gpointer user_data) +-{ +- NautilusFilesView *view; +- +- view = NAUTILUS_FILES_VIEW (user_data); +- +- g_clear_object (&view->details->compress_controller); +-} +- +- +-static void +-nautilus_files_view_compress_dialog_new (NautilusFilesView *view) +-{ +- NautilusDirectory *containing_directory; +- GList *selection; +- g_autofree char *common_prefix = NULL; +- +- if (view->details->compress_controller != NULL) +- { +- return; +- } +- +- containing_directory = nautilus_directory_get_by_uri (nautilus_files_view_get_backing_uri (view)); +- +- selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); +- +- if (g_list_length (selection) == 1) +- { +- g_autofree char *display_name = NULL; +- +- display_name = nautilus_file_get_display_name (selection->data); +- +- common_prefix = eel_filename_strip_extension (display_name); +- } +- else +- { +- common_prefix = nautilus_get_common_filename_prefix (selection, +- MIN_COMMON_FILENAME_PREFIX_LENGTH); +- } +- +- view->details->compress_controller = nautilus_compress_dialog_controller_new (nautilus_files_view_get_containing_window (view), +- containing_directory, +- common_prefix); +- +- g_signal_connect (view->details->compress_controller, +- "name-accepted", +- (GCallback) compress_dialog_controller_on_name_accepted, +- view); +- g_signal_connect (view->details->compress_controller, +- "cancelled", +- (GCallback) compress_dialog_controller_on_cancelled, +- view); +- +- nautilus_file_list_free (selection); +-} +- + static void + nautilus_files_view_new_folder (NautilusFilesView *directory_view, + gboolean with_selection) +@@ -3061,7 +2777,6 @@ nautilus_files_view_finalize (GObject *object) + g_clear_object (&view->details->toolbar_menu_sections->extended_section); + g_clear_object (&view->details->rename_file_controller); + g_clear_object (&view->details->new_folder_controller); +- g_clear_object (&view->details->compress_controller); + g_free (view->details->toolbar_menu_sections); + + g_hash_table_destroy (view->details->non_ready_files); +@@ -5964,273 +5679,6 @@ action_rename (GSimpleAction *action, + real_action_rename (NAUTILUS_FILES_VIEW (user_data)); + } + +-typedef struct +-{ +- NautilusFilesView *view; +- GHashTable *added_locations; +-} ExtractData; +- +-static void +-extract_done (GList *outputs, +- gpointer user_data) +-{ +- ExtractData *data; +- GList *l; +- gboolean all_files_acknowledged; +- +- data = user_data; +- +- if (data->view == NULL) +- { +- goto out; +- } +- +- g_signal_handlers_disconnect_by_func (data->view, +- G_CALLBACK (track_newly_added_locations), +- data->added_locations); +- +- if (outputs == NULL) +- { +- goto out; +- } +- +- all_files_acknowledged = TRUE; +- for (l = outputs; l && all_files_acknowledged; l = l->next) +- { +- all_files_acknowledged = g_hash_table_contains (data->added_locations, +- l->data); +- } +- +- if (all_files_acknowledged) +- { +- GList *selection = NULL; +- +- for (l = outputs; l != NULL; l = l->next) +- { +- selection = g_list_prepend (selection, +- nautilus_file_get (l->data)); +- } +- +- nautilus_files_view_set_selection (NAUTILUS_VIEW (data->view), +- selection); +- nautilus_files_view_reveal_selection (data->view); +- +- nautilus_file_list_free (selection); +- } +- else +- { +- for (l = outputs; l != NULL; l = l->next) +- { +- gboolean acknowledged; +- +- acknowledged = g_hash_table_contains (data->added_locations, +- l->data); +- +- g_hash_table_insert (data->view->details->pending_reveal, +- nautilus_file_get (l->data), +- GUINT_TO_POINTER (acknowledged)); +- } +- } +-out: +- g_hash_table_destroy (data->added_locations); +- +- if (data->view != NULL) +- { +- g_object_remove_weak_pointer (G_OBJECT (data->view), +- (gpointer *) &data->view); +- } +- +- g_free (data); +-} +- +-static void +-extract_files (NautilusFilesView *view, +- GList *files, +- GFile *destination_directory) +-{ +- GList *locations = NULL; +- GList *l; +- gboolean extracting_to_current_directory; +- +- if (files == NULL) +- { +- return; +- } +- +- for (l = files; l != NULL; l = l->next) +- { +- locations = g_list_prepend (locations, +- nautilus_file_get_location (l->data)); +- } +- +- locations = g_list_reverse (locations); +- +- extracting_to_current_directory = g_file_equal (destination_directory, +- nautilus_view_get_location (NAUTILUS_VIEW (view))); +- +- if (extracting_to_current_directory) +- { +- ExtractData *data; +- +- data = g_new (ExtractData, 1); +- data->view = view; +- data->added_locations = g_hash_table_new_full (g_file_hash, +- (GEqualFunc) g_file_equal, +- g_object_unref, NULL); +- +- +- g_object_add_weak_pointer (G_OBJECT (data->view), +- (gpointer *) &data->view); +- +- g_signal_connect_data (view, +- "add-file", +- G_CALLBACK (track_newly_added_locations), +- data->added_locations, +- NULL, +- G_CONNECT_AFTER); +- +- nautilus_file_operations_extract_files (locations, +- destination_directory, +- nautilus_files_view_get_containing_window (view), +- extract_done, +- data); +- } +- else +- { +- nautilus_file_operations_extract_files (locations, +- destination_directory, +- nautilus_files_view_get_containing_window (view), +- NULL, +- NULL); +- } +- +- g_list_free_full (locations, g_object_unref); +-} +- +-typedef struct +-{ +- NautilusFilesView *view; +- GList *files; +-} ExtractToData; +- +-static void +-on_extract_destination_dialog_response (GtkDialog *dialog, +- gint response_id, +- gpointer user_data) +-{ +- ExtractToData *data; +- +- data = user_data; +- +- if (response_id == GTK_RESPONSE_OK) +- { +- g_autoptr (GFile) destination_directory = NULL; +- +- destination_directory = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog)); +- +- extract_files (data->view, data->files, destination_directory); +- } +- +- gtk_widget_destroy (GTK_WIDGET (dialog)); +- nautilus_file_list_free (data->files); +- g_free (data); +-} +- +-static void +-extract_files_to_chosen_location (NautilusFilesView *view, +- GList *files) +-{ +- ExtractToData *data; +- GtkWidget *dialog; +- g_autofree char *uri = NULL; +- +- if (files == NULL) +- { +- return; +- } +- +- data = g_new (ExtractToData, 1); +- +- dialog = gtk_file_chooser_dialog_new (_("Select Extract Destination"), +- GTK_WINDOW (nautilus_files_view_get_window (view)), +- GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, +- _("_Cancel"), GTK_RESPONSE_CANCEL, +- _("_Select"), GTK_RESPONSE_OK, +- NULL); +- gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (dialog), FALSE); +- +- gtk_dialog_set_default_response (GTK_DIALOG (dialog), +- GTK_RESPONSE_OK); +- +- gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE); +- gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); +- +- uri = nautilus_directory_get_uri (view->details->model); +- gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dialog), uri); +- +- data->view = view; +- data->files = nautilus_file_list_copy (files); +- +- g_signal_connect (dialog, "response", +- G_CALLBACK (on_extract_destination_dialog_response), +- data); +- +- gtk_widget_show_all (dialog); +-} +- +-static void +-action_extract_here (GSimpleAction *action, +- GVariant *state, +- gpointer user_data) +-{ +- NautilusFilesView *view; +- GList *selection; +- g_autoptr (GFile) location = NULL; +- g_autoptr (GFile) parent = NULL; +- +- view = NAUTILUS_FILES_VIEW (user_data); +- +- selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); +- location = nautilus_file_get_location (NAUTILUS_FILE (g_list_first (selection)->data)); +- /* Get a parent from a random file. We assume all files has a common parent. +- * But don't assume the parent is the view location, since that's not the +- * case in list view when expand-folder setting is set +- */ +- parent = g_file_get_parent (location); +- +- extract_files (view, selection, parent); +- +- nautilus_file_list_free (selection); +-} +- +-static void +-action_extract_to (GSimpleAction *action, +- GVariant *state, +- gpointer user_data) +-{ +- NautilusFilesView *view; +- GList *selection; +- +- view = NAUTILUS_FILES_VIEW (user_data); +- +- selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); +- +- extract_files_to_chosen_location (view, selection); +- +- nautilus_file_list_free (selection); +-} +- +-static void +-action_compress (GSimpleAction *action, +- GVariant *state, +- gpointer user_data) +-{ +- NautilusFilesView *view = user_data; +- +- nautilus_files_view_compress_dialog_new (view); +-} +- +- + #define BG_KEY_PRIMARY_COLOR "primary-color" + #define BG_KEY_SECONDARY_COLOR "secondary-color" + #define BG_KEY_COLOR_TYPE "color-shading-type" +@@ -6691,9 +6139,6 @@ const GActionEntry view_entries[] = + { "restore-from-trash", action_restore_from_trash}, + { "paste-into", action_paste_files_into }, + { "rename", action_rename}, +- { "extract-here", action_extract_here }, +- { "extract-to", action_extract_to }, +- { "compress", action_compress }, + { "properties", action_properties}, + { "set-as-wallpaper", action_set_as_wallpaper }, + { "mount-volume", action_mount_volume }, +@@ -6997,23 +6442,6 @@ all_in_trash (GList *files) + return TRUE; + } + +-static gboolean +-can_extract_all (GList *files) +-{ +- NautilusFile *file; +- GList *l; +- +- for (l = files; l != NULL; l = l->next) +- { +- file = l->data; +- if (!nautilus_file_is_archive (file)) +- { +- return FALSE; +- } +- } +- return TRUE; +-} +- + GActionGroup * + nautilus_files_view_get_action_group (NautilusFilesView *view) + { +@@ -7040,8 +6468,6 @@ real_update_actions_state (NautilusFilesView *view) + gboolean can_trash_files; + gboolean can_copy_files; + gboolean can_paste_files_into; +- gboolean can_extract_files; +- gboolean can_extract_here; + gboolean item_opens_in_view; + gboolean is_read_only; + GAction *action; +@@ -7054,7 +6480,6 @@ real_update_actions_state (NautilusFilesView *view) + gboolean show_detect_media; + gboolean settings_show_delete_permanently; + gboolean settings_show_create_link; +- gboolean settings_automatic_decompression; + GDriveStartStopType start_stop_type; + + view_action_group = view->details->view_action_group; +@@ -7088,15 +6513,10 @@ real_update_actions_state (NautilusFilesView *view) + can_paste_files_into = (!selection_contains_recent && + selection_count == 1 && + can_paste_into_file (NAUTILUS_FILE (selection->data))); +- can_extract_files = selection_count != 0 && +- can_extract_all (selection); +- can_extract_here = nautilus_files_view_supports_extract_here (view); + settings_show_delete_permanently = g_settings_get_boolean (nautilus_preferences, + NAUTILUS_PREFERENCES_SHOW_DELETE_PERMANENTLY); + settings_show_create_link = g_settings_get_boolean (nautilus_preferences, + NAUTILUS_PREFERENCES_SHOW_CREATE_LINK); +- settings_automatic_decompression = g_settings_get_boolean (nautilus_preferences, +- NAUTILUS_PREFERENCES_AUTOMATIC_DECOMPRESSION); + + /* Right click actions */ + /* Selection menu actions */ +@@ -7132,25 +6552,6 @@ real_update_actions_state (NautilusFilesView *view) + } + + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), +- "extract-here"); +- g_simple_action_set_enabled (G_SIMPLE_ACTION (action), +- can_extract_files && +- !settings_automatic_decompression && +- can_extract_here); +- +- action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), +- "extract-to"); +- g_simple_action_set_enabled (G_SIMPLE_ACTION (action), +- can_extract_files && +- (!settings_automatic_decompression || +- can_extract_here)); +- +- action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), +- "compress"); +- g_simple_action_set_enabled (G_SIMPLE_ACTION (action), +- can_create_files && can_copy_files); +- +- action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "open-item-location"); + + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), +@@ -7417,7 +6818,6 @@ update_selection_menu (NautilusFilesView *view) + gint selection_count; + gboolean show_app; + gboolean show_run; +- gboolean show_extract; + gboolean item_opens_in_view; + gchar *item_label; + GAppInfo *app; +@@ -7455,17 +6855,13 @@ update_selection_menu (NautilusFilesView *view) + g_free (item_label); + + /* Open With menu item */ +- show_extract = show_app = show_run = item_opens_in_view = selection_count != 0; ++ show_app = show_run = item_opens_in_view = selection_count != 0; + for (l = selection; l != NULL; l = l->next) + { + NautilusFile *file; + + file = NAUTILUS_FILE (l->data); + +- if (!nautilus_mime_file_extracts (file)) +- { +- show_extract = FALSE; +- } + + if (!nautilus_mime_file_opens_in_external_app (file)) + { +@@ -7482,7 +6878,7 @@ update_selection_menu (NautilusFilesView *view) + item_opens_in_view = FALSE; + } + +- if (!show_extract && !show_app && !show_run && !item_opens_in_view) ++ if (!show_app && !show_run && !item_opens_in_view) + { + break; + } +@@ -7515,12 +6911,6 @@ update_selection_menu (NautilusFilesView *view) + { + item_label = g_strdup (_("Run")); + } +- else if (show_extract) +- { +- item_label = nautilus_files_view_supports_extract_here (view) ? +- g_strdup (_("Extract Here")) : +- g_strdup (_("Extract to…")); +- } + else + { + item_label = g_strdup (_("Open")); +diff --git a/src/nautilus-mime-actions.c b/src/nautilus-mime-actions.c +index 3f7033baa..796dabbe1 100644 +--- a/src/nautilus-mime-actions.c ++++ b/src/nautilus-mime-actions.c +@@ -54,7 +54,6 @@ typedef enum + ACTIVATION_ACTION_LAUNCH_IN_TERMINAL, + ACTIVATION_ACTION_OPEN_IN_VIEW, + ACTIVATION_ACTION_OPEN_IN_APPLICATION, +- ACTIVATION_ACTION_EXTRACT, + ACTIVATION_ACTION_DO_NOTHING, + } ActivationAction; + +@@ -716,14 +715,6 @@ get_activation_action (NautilusFile *file) + { + ActivationAction action; + char *activation_uri; +- gboolean can_extract; +- can_extract = g_settings_get_boolean (nautilus_preferences, +- NAUTILUS_PREFERENCES_AUTOMATIC_DECOMPRESSION); +- +- if (can_extract && nautilus_file_is_archive (file)) +- { +- return ACTIVATION_ACTION_EXTRACT; +- } + + if (nautilus_file_is_nautilus_link (file)) + { +@@ -772,12 +763,6 @@ get_activation_action (NautilusFile *file) + } + + gboolean +-nautilus_mime_file_extracts (NautilusFile *file) +-{ +- return get_activation_action (file) == ACTIVATION_ACTION_EXTRACT; +-} +- +-gboolean + nautilus_mime_file_launches (NautilusFile *file) + { + ActivationAction activation_action; +@@ -1712,13 +1697,6 @@ activate_files (ActivateParameters *parameters) + } + break; + +- case ACTIVATION_ACTION_EXTRACT: +- { +- /* Extraction of files should be handled in the view */ +- g_assert_not_reached (); +- } +- break; +- + case ACTIVATION_ACTION_ASK: + { + g_assert_not_reached (); +@@ -2475,6 +2453,7 @@ nautilus_mime_activate_files (GtkWindow *parent_window, + } + + ++ g_print ("number of files %d\n", g_list_length (parameters->locations)); + for (l = parameters->locations; l != NULL; l = next) + { + location = l->data; +-- +2.12.0 + diff --git a/SOURCES/0001-mime-actions-use-file-metadata-for-trusting-desktop-.patch b/SOURCES/0001-mime-actions-use-file-metadata-for-trusting-desktop-.patch new file mode 100644 index 0000000..a179f2b --- /dev/null +++ b/SOURCES/0001-mime-actions-use-file-metadata-for-trusting-desktop-.patch @@ -0,0 +1,1061 @@ +From 0161c384f53630d36b88d0b4bd6cd1402b736ae9 Mon Sep 17 00:00:00 2001 +From: Carlos Soriano +Date: Thu, 2 Nov 2017 16:30:30 +0100 +Subject: [PATCH] mime-actions: use file metadata for trusting desktop files + +Currently we only trust desktop files that have the executable bit +set, and don't replace the displayed icon or the displayed name until +it's trusted, which prevents for running random programs by a malicious +desktop file. + +However, the executable permission is preserved if the desktop file +comes from a compressed file. + +To prevent this, add a metadata::trusted metadata to the file once the +user acknowledges the file as trusted. This adds metadata to the file, +which cannot be added unless it has access to the computer. + +Also remove the SHEBANG "trusted" content we were putting inside the +desktop file, since that doesn't add more security since it can come +with the file itself. + +https://bugzilla.gnome.org/show_bug.cgi?id=777991 +--- + po/be.po | 4 ++ + po/ca.po | 4 ++ + po/cs.po | 4 ++ + po/da.po | 4 ++ + po/de.po | 4 ++ + po/el.po | 4 ++ + po/en_GB.po | 4 ++ + po/eo.po | 4 ++ + po/es.po | 4 ++ + po/eu.po | 4 ++ + po/fi.po | 4 ++ + po/fr.po | 4 ++ + po/fur.po | 4 ++ + po/gl.po | 4 ++ + po/hr.po | 4 ++ + po/hu.po | 4 ++ + po/id.po | 4 ++ + po/is.po | 4 ++ + po/it.po | 4 ++ + po/kk.po | 4 ++ + po/ko.po | 4 ++ + po/lt.po | 4 ++ + po/lv.po | 4 ++ + po/ml.po | 4 ++ + po/nb.po | 4 ++ + po/ne.po | 4 ++ + po/nl.po | 4 ++ + po/pa.po | 4 ++ + po/pl.po | 4 ++ + po/pt_BR.po | 4 ++ + po/ru.po | 4 ++ + po/sk.po | 4 ++ + po/sl.po | 4 ++ + po/sr.po | 4 ++ + po/sr@latin.po | 4 ++ + po/sv.po | 4 ++ + po/tr.po | 4 ++ + po/uk.po | 4 ++ + po/vi.po | 4 ++ + po/zh_TW.po | 4 ++ + src/nautilus-directory-async.c | 7 +- + src/nautilus-file-operations.c | 152 ++++++++--------------------------------- + src/nautilus-file-operations.h | 10 +-- + src/nautilus-metadata.c | 1 + + src/nautilus-metadata.h | 2 + + src/nautilus-mime-actions.c | 46 ++++++++----- + 46 files changed, 232 insertions(+), 146 deletions(-) + +diff --git a/po/be.po b/po/be.po +index 960cd898b..bcec36f07 100644 +--- a/po/be.po ++++ b/po/be.po +@@ -3693,6 +3693,10 @@ msgstr "_Усё роўна запусціць" + msgid "Mark as _Trusted" + msgstr "_Зрабіць давераным" + ++#: src/nautilus-mime-actions.c:1514 ++msgid "Trust and _Launch" ++msgstr "Даверыцца і _запусціць" ++ + #: ../src/nautilus-mime-actions.c:1792 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/ca.po b/po/ca.po +index 594c5063e..14813cb99 100644 +--- a/po/ca.po ++++ b/po/ca.po +@@ -3607,6 +3607,10 @@ msgstr "_Executa de totes maneres" + msgid "Mark as _Trusted" + msgstr "Marca com de _confiança" + ++#: src/nautilus-mime-actions.c:1514 ++msgid "Trust and _Launch" ++msgstr "Confia i _executa" ++ + #: ../src/nautilus-mime-actions.c:1905 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/cs.po b/po/cs.po +index fae4fc51b..b2946f93b 100644 +--- a/po/cs.po ++++ b/po/cs.po +@@ -3661,6 +3661,10 @@ msgstr "_Přesto spustit" + msgid "Mark as _Trusted" + msgstr "Označit jako _důveryhodný" + ++#: src/nautilus-mime-actions.c:1514 ++msgid "Trust and _Launch" ++msgstr "Důvěřovat a _spustit" ++ + #: src/nautilus-mime-actions.c:1905 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/da.po b/po/da.po +index 5453105a5..834e69b32 100644 +--- a/po/da.po ++++ b/po/da.po +@@ -3632,6 +3632,10 @@ msgstr "_Start alligevel" + msgid "Mark as _Trusted" + msgstr "Markér som _betroet" + ++#: src/nautilus-mime-actions.c:1514 ++msgid "Trust and _Launch" ++msgstr "Hav tillid til og _kør" ++ + #: src/nautilus-mime-actions.c:1905 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/de.po b/po/de.po +index 661d352c7..77fd67a1e 100644 +--- a/po/de.po ++++ b/po/de.po +@@ -3698,6 +3698,10 @@ msgstr "_Trotzdem starten" + msgid "Mark as _Trusted" + msgstr "Als _vertrauenswürdig markieren" + ++#: src/nautilus-mime-actions.c:1514 ++msgid "Trust and _Launch" ++msgstr "Vertrauen und _starten" ++ + #: src/nautilus-mime-actions.c:1905 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/el.po b/po/el.po +index 6f02e0cf8..31644c76e 100644 +--- a/po/el.po ++++ b/po/el.po +@@ -3756,6 +3756,10 @@ msgstr "_Εκκίνηση οπωσδήποτε" + msgid "Mark as _Trusted" + msgstr "Σημείωση ως έ_μπιστου" + ++#: src/nautilus-mime-actions.c:1612 ++msgid "Trust and _Launch" ++msgstr "Έμπιστο και ε_κκίνηση" ++ + #: src/nautilus-mime-actions.c:1905 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/en_GB.po b/po/en_GB.po +index f1810aa4c..6ff33095d 100644 +--- a/po/en_GB.po ++++ b/po/en_GB.po +@@ -3585,6 +3585,10 @@ msgstr "_Launch Anyway" + msgid "Mark as _Trusted" + msgstr "Mark as _Trusted" + ++#: src/nautilus-mime-actions.c:1514 ++msgid "Trust and _Launch" ++msgstr "Trust and _Launch" ++ + #: src/nautilus-mime-actions.c:1905 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/eo.po b/po/eo.po +index 7faf9ef78..6969239ab 100644 +--- a/po/eo.po ++++ b/po/eo.po +@@ -3662,6 +3662,10 @@ msgstr "_Lanĉi ĉiukaze" + msgid "Mark as _Trusted" + msgstr "Marki kiel kon_trolita" + ++#: src/nautilus-mime-actions.c:1507 ++msgid "Trust and _Launch" ++msgstr "" ++ + #: ../src/nautilus-mime-actions.c:1793 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/es.po b/po/es.po +index 3c194b551..adfb0ea47 100644 +--- a/po/es.po ++++ b/po/es.po +@@ -3983,6 +3983,10 @@ msgstr "_Lanzar de todas formas" + msgid "Mark as _Trusted" + msgstr "Marcar como de con_fianza" + ++#: src/nautilus-mime-actions.c:1514 ++msgid "Trust and _Launch" ++msgstr "Confiar y _ejecutar" ++ + #: src/nautilus-mime-actions.c:1905 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/eu.po b/po/eu.po +index ccaf0e3b7..35c93e871 100644 +--- a/po/eu.po ++++ b/po/eu.po +@@ -3651,6 +3651,10 @@ msgstr "_Abiarazi dena den" + msgid "Mark as _Trusted" + msgstr "Markatu _fidagarri gisa" + ++#: src/nautilus-mime-actions.c:1612 ++msgid "Trust and _Launch" ++msgstr "Fidatu eta _abiarazi" ++ + #: src/nautilus-mime-actions.c:1905 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/fi.po b/po/fi.po +index 19d62bfe1..ee9f1eee0 100644 +--- a/po/fi.po ++++ b/po/fi.po +@@ -3670,6 +3670,10 @@ msgstr "_Käynnistä silti" + msgid "Mark as _Trusted" + msgstr "Merkitse luo_tetuksi" + ++#: src/nautilus-mime-actions.c:1514 ++msgid "Trust and _Launch" ++msgstr "Luota ja k_äynnistä" ++ + #: src/nautilus-mime-actions.c:1905 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/fr.po b/po/fr.po +index ec8d46321..342df517e 100644 +--- a/po/fr.po ++++ b/po/fr.po +@@ -3653,6 +3653,10 @@ msgstr "_Lancer quand même" + msgid "Mark as _Trusted" + msgstr "Marquer comme _fiable" + ++#: src/nautilus-mime-actions.c:1514 ++msgid "Trust and _Launch" ++msgstr "Faire confiance et _lancer" ++ + #: src/nautilus-mime-actions.c:1905 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/fur.po b/po/fur.po +index f205aecda..b31ca5300 100644 +--- a/po/fur.po ++++ b/po/fur.po +@@ -3599,6 +3599,10 @@ msgstr "_Invie distès" + msgid "Mark as _Trusted" + msgstr "Segne come _fidât" + ++#: src/nautilus-mime-actions.c:1514 ++msgid "Trust and _Launch" ++msgstr "Fiditi e _invie" ++ + #: src/nautilus-mime-actions.c:1905 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/gl.po b/po/gl.po +index a7f22470d..b0cc6732b 100644 +--- a/po/gl.po ++++ b/po/gl.po +@@ -3623,6 +3623,10 @@ msgstr "_Iniciar de todos os xeitos" + msgid "Mark as _Trusted" + msgstr "Marcar como _confiábel" + ++#: src/nautilus-mime-actions.c:1514 ++msgid "Trust and _Launch" ++msgstr "Confiar e _iniciar" ++ + #: src/nautilus-mime-actions.c:1905 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/hr.po b/po/hr.po +index 58f7af9e3..82317069c 100644 +--- a/po/hr.po ++++ b/po/hr.po +@@ -3631,6 +3631,10 @@ msgstr "_Svejedno pokreni" + msgid "Mark as _Trusted" + msgstr "Označi kao _pouzdano" + ++#: src/nautilus-mime-actions.c:1514 ++msgid "Trust and _Launch" ++msgstr "Vjeruj i _pokreni" ++ + #: src/nautilus-mime-actions.c:1905 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/hu.po b/po/hu.po +index 34537c84b..3ae5baa0b 100644 +--- a/po/hu.po ++++ b/po/hu.po +@@ -3568,6 +3568,10 @@ msgstr "_Indítás mindenképp" + msgid "Mark as _Trusted" + msgstr "_Megjelölés megbízhatóként" + ++#: src/nautilus-mime-actions.c:1507 ++msgid "Trust and _Launch" ++msgstr "Megbízható, elin_dítom" ++ + #: src/nautilus-mime-actions.c:1905 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/id.po b/po/id.po +index ec53ee1e2..1ab509777 100644 +--- a/po/id.po ++++ b/po/id.po +@@ -3326,6 +3326,10 @@ msgstr "Tetap _Luncurkan" + msgid "Mark as _Trusted" + msgstr "_Tandai Dipercaya" + ++#: src/nautilus-mime-actions.c:1514 ++msgid "Trust and _Launch" ++msgstr "Percayai dan _Luncurkan" ++ + #: src/nautilus-mime-actions.c:1704 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/is.po b/po/is.po +index 3ed48efca..864835f05 100644 +--- a/po/is.po ++++ b/po/is.po +@@ -3603,6 +3603,10 @@ msgstr "_Ræsa samt" + msgid "Mark as _Trusted" + msgstr "_Treysta" + ++#: src/nautilus-mime-actions.c:1612 ++msgid "Trust and _Launch" ++msgstr "Tre_ysta og ræsa" ++ + #: src/nautilus-mime-actions.c:1905 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/it.po b/po/it.po +index 18c8e0a6b..001cea3e3 100644 +--- a/po/it.po ++++ b/po/it.po +@@ -3670,6 +3670,10 @@ msgstr "_Lancia comunque" + msgid "Mark as _Trusted" + msgstr "Contrassegna come _fidato" + ++#: src/nautilus-mime-actions.c:1514 ++msgid "Trust and _Launch" ++msgstr "Dai fiducia e _lancia" ++ + #: src/nautilus-mime-actions.c:1905 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/kk.po b/po/kk.po +index 57e3c6c07..c21c2ba70 100644 +--- a/po/kk.po ++++ b/po/kk.po +@@ -3488,6 +3488,10 @@ msgstr "Сон_да да жөнелту" + msgid "Mark as _Trusted" + msgstr "Сені_мді ретінде белгілеу" + ++#: src/nautilus-mime-actions.c:1514 ++msgid "Trust and _Launch" ++msgstr "Сену және жөне_лту" ++ + #: src/nautilus-mime-actions.c:1905 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/ko.po b/po/ko.po +index e1b0f2dad..b0e29bf2d 100644 +--- a/po/ko.po ++++ b/po/ko.po +@@ -3471,6 +3471,10 @@ msgstr "그래도 실행(_L)" + msgid "Mark as _Trusted" + msgstr "신뢰한다고 표시(_T)" + ++#: src/nautilus-mime-actions.c:1514 ++msgid "Trust and _Launch" ++msgstr "신뢰하고 실행(_L)" ++ + #: src/nautilus-mime-actions.c:1905 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/lt.po b/po/lt.po +index 7af4fc3b6..a705c7ab6 100644 +--- a/po/lt.po ++++ b/po/lt.po +@@ -3652,6 +3652,10 @@ msgstr "_Vis tiek paleisti" + msgid "Mark as _Trusted" + msgstr "Pažymėti kaip _patikimą" + ++#: src/nautilus-mime-actions.c:1514 ++msgid "Trust and _Launch" ++msgstr "Pasitikėti ir _paleisti" ++ + #: src/nautilus-mime-actions.c:1905 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/lv.po b/po/lv.po +index 78a0109c5..7d38c1c36 100644 +--- a/po/lv.po ++++ b/po/lv.po +@@ -3646,6 +3646,10 @@ msgstr "_Palaist jebkurā gadījumā" + msgid "Mark as _Trusted" + msgstr "Atzīmēt kā _uzticamu" + ++#: src/nautilus-mime-actions.c:1514 ++msgid "Trust and _Launch" ++msgstr "Uzticēties un pa_laist" ++ + #: src/nautilus-mime-actions.c:1905 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/ml.po b/po/ml.po +index cc970147c..f5891c3df 100644 +--- a/po/ml.po ++++ b/po/ml.po +@@ -3644,6 +3644,10 @@ msgstr "എങ്ങനെയാണേലും _ലഭ്യമാക്കു + msgid "Mark as _Trusted" + msgstr "_വിശ്വസനീയമായി അടയാളപ്പെടുത്തുക" + ++#: src/nautilus-mime-actions.c:1507 ++msgid "Trust and _Launch" ++msgstr "" ++ + #: ../src/nautilus-mime-actions.c:1793 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/nb.po b/po/nb.po +index d61e5963b..74ebef57f 100644 +--- a/po/nb.po ++++ b/po/nb.po +@@ -3543,6 +3543,10 @@ msgstr "Start _likevel" + msgid "Mark as _Trusted" + msgstr "Merk med _tillit" + ++#: src/nautilus-mime-actions.c:1507 ++msgid "Trust and _Launch" ++msgstr "Etabler tillit og _start" ++ + #: ../src/nautilus-mime-actions.c:1905 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/ne.po b/po/ne.po +index 11f193847..a4a260cf2 100644 +--- a/po/ne.po ++++ b/po/ne.po +@@ -3700,6 +3700,10 @@ msgstr "जसरी पनि बचत गर्नुहोस्" + msgid "Mark as _Trusted" + msgstr "महत्वपूर्णको रूपमा चिन्ह लगाउनुहोस्" + ++#, fuzzy ++msgid "Trust and _Launch" ++msgstr "विश्वास" ++ + #: ../src/nautilus-mime-actions.c:1792 + #, fuzzy, c-format + msgid "This will open %d separate application." +diff --git a/po/nl.po b/po/nl.po +index 7552e34c7..f0f8416d6 100644 +--- a/po/nl.po ++++ b/po/nl.po +@@ -3660,6 +3660,10 @@ msgstr "_Toch uitvoeren" + msgid "Mark as _Trusted" + msgstr "Als _vertrouwd markeren" + ++#: src/nautilus-mime-actions.c:1514 ++msgid "Trust and _Launch" ++msgstr "Vertrouwen en _uitvoeren" ++ + #: src/nautilus-mime-actions.c:1905 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/pa.po b/po/pa.po +index efab77ce1..b00ddc2fb 100644 +--- a/po/pa.po ++++ b/po/pa.po +@@ -3674,6 +3674,10 @@ msgstr "ਕਿਵੇਂ ਵੀ ਚਲਾਓ(_L)" + msgid "Mark as _Trusted" + msgstr "ਭਰੋਸੇਯੋਗ ਬਣਾਓ(_T)" + ++#: src/nautilus-mime-actions.c:1612 ++msgid "Trust and _Launch" ++msgstr "ਭਰੋਸਾ ਕਰੋ ਅਤੇ ਚਲਾਓ(_L)" ++ + #: src/nautilus-mime-actions.c:1870 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/pl.po b/po/pl.po +index a121659c1..b1a0b8df5 100644 +--- a/po/pl.po ++++ b/po/pl.po +@@ -3658,6 +3658,10 @@ msgstr "_Uruchom mimo to" + msgid "Mark as _Trusted" + msgstr "_Oznacz jako zaufany" + ++#: src/nautilus-mime-actions.c:1514 ++msgid "Trust and _Launch" ++msgstr "Oznacz jako zaufany i _uruchom" ++ + #: src/nautilus-mime-actions.c:1905 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/pt_BR.po b/po/pt_BR.po +index d08dc5928..3f5f91929 100644 +--- a/po/pt_BR.po ++++ b/po/pt_BR.po +@@ -3630,6 +3630,10 @@ msgstr "_Lançar mesmo assim" + msgid "Mark as _Trusted" + msgstr "Marcar como _confiável" + ++#: src/nautilus-mime-actions.c:1514 ++msgid "Trust and _Launch" ++msgstr "Confiar e _iniciar" ++ + #: src/nautilus-mime-actions.c:1905 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/ru.po b/po/ru.po +index 9dba7fd88..8d9ee1875 100644 +--- a/po/ru.po ++++ b/po/ru.po +@@ -3650,6 +3650,10 @@ msgstr "_Запустить всё равно" + msgid "Mark as _Trusted" + msgstr "_Считать проверенным" + ++#: src/nautilus-mime-actions.c:1514 ++msgid "Trust and _Launch" ++msgstr "Доверить и запустить" ++ + #: src/nautilus-mime-actions.c:1905 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/sk.po b/po/sk.po +index 3c1b812bd..7555353dc 100644 +--- a/po/sk.po ++++ b/po/sk.po +@@ -3716,6 +3716,10 @@ msgstr "_Aj tak spustiť" + msgid "Mark as _Trusted" + msgstr "Označiť ako _dôveryhodné" + ++#: src/nautilus-mime-actions.c:1514 ++msgid "Trust and _Launch" ++msgstr "Dôverovať a _spustiť" ++ + #: src/nautilus-mime-actions.c:1905 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/sl.po b/po/sl.po +index bd2495910..a6c52cd72 100644 +--- a/po/sl.po ++++ b/po/sl.po +@@ -3757,6 +3757,10 @@ msgstr "_Vseeno zaženi" + msgid "Mark as _Trusted" + msgstr "Označi kot _zaupanja vredno" + ++#: src/nautilus-mime-actions.c:1514 ++msgid "Trust and _Launch" ++msgstr "Zaupaj in _zaženi" ++ + #: ../src/nautilus-mime-actions.c:1713 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/sr.po b/po/sr.po +index 1d006d0b3..f31eb31db 100644 +--- a/po/sr.po ++++ b/po/sr.po +@@ -3725,6 +3725,10 @@ msgstr "_Ипак покрени" + msgid "Mark as _Trusted" + msgstr "_Означи као поверљиво" + ++#: src/nautilus-mime-actions.c:1514 ++msgid "Trust and _Launch" ++msgstr "Веруј и _покрени" ++ + #: src/nautilus-mime-actions.c:1905 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/sr@latin.po b/po/sr@latin.po +index 1cd7559cc..7aa8d3023 100644 +--- a/po/sr@latin.po ++++ b/po/sr@latin.po +@@ -3725,6 +3725,10 @@ msgstr "_Ipak pokreni" + msgid "Mark as _Trusted" + msgstr "_Označi kao poverljivo" + ++#: src/nautilus-mime-actions.c:1514 ++msgid "Trust and _Launch" ++msgstr "Veruj i _pokreni" ++ + #: src/nautilus-mime-actions.c:1905 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/sv.po b/po/sv.po +index 68de06638..05730d44c 100644 +--- a/po/sv.po ++++ b/po/sv.po +@@ -3596,6 +3596,10 @@ msgstr "Starta _ändå" + msgid "Mark as _Trusted" + msgstr "Markera som _pålitlig" + ++#: src/nautilus-mime-actions.c:1612 ++msgid "Trust and _Launch" ++msgstr "Lita på och _kör" ++ + #: src/nautilus-mime-actions.c:1905 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/tr.po b/po/tr.po +index 0c3c5a78d..77284c48c 100644 +--- a/po/tr.po ++++ b/po/tr.po +@@ -3612,6 +3612,10 @@ msgstr "_Yine de Başlat" + msgid "Mark as _Trusted" + msgstr "Güvenilir _Olarak İşaretle" + ++#: src/nautilus-mime-actions.c:1514 ++msgid "Trust and _Launch" ++msgstr "Güven ve _Başlat" ++ + #: ../src/nautilus-mime-actions.c:1704 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/uk.po b/po/uk.po +index 42a90213d..458006d8d 100644 +--- a/po/uk.po ++++ b/po/uk.po +@@ -3706,6 +3706,10 @@ msgstr "Однаково _Запустити " + msgid "Mark as _Trusted" + msgstr "Вважати _перевіреним" + ++#: src/nautilus-mime-actions.c:1612 ++msgid "Trust and _Launch" ++msgstr "Довіритись і _запустити" ++ + #: src/nautilus-mime-actions.c:1905 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/vi.po b/po/vi.po +index 5de71c79a..0442dd124 100644 +--- a/po/vi.po ++++ b/po/vi.po +@@ -3507,6 +3507,10 @@ msgstr "_Chạy bằng mọi giá" + msgid "Mark as _Trusted" + msgstr "Đánh dấu là đáng _tin" + ++#: src/nautilus-mime-actions.c:1514 ++msgid "Trust and _Launch" ++msgstr "Tin và Khởi chạ_y" ++ + #: src/nautilus-mime-actions.c:1905 + #, c-format + msgid "This will open %d separate application." +diff --git a/po/zh_TW.po b/po/zh_TW.po +index 69810ce25..0bddf2fc8 100644 +--- a/po/zh_TW.po ++++ b/po/zh_TW.po +@@ -3427,6 +3427,10 @@ msgstr "強制啟動(_L)" + msgid "Mark as _Trusted" + msgstr "標記成受信任的(_T)" + ++#: src/nautilus-mime-actions.c:1514 ++msgid "Trust and _Launch" ++msgstr "信任並啟動(_L)" ++ + #: src/nautilus-mime-actions.c:1905 + #, c-format + msgid "This will open %d separate application." +diff --git a/src/nautilus-directory-async.c b/src/nautilus-directory-async.c +index e8a10cd3b..b02e3de87 100644 +--- a/src/nautilus-directory-async.c ++++ b/src/nautilus-directory-async.c +@@ -30,6 +30,7 @@ + #include "nautilus-global-preferences.h" + #include "nautilus-link.h" + #include "nautilus-profile.h" ++#include "nautilus-metadata.h" + #include + #include + #include +@@ -3580,13 +3581,17 @@ is_link_trusted (NautilusFile *file, + { + GFile *location; + gboolean res; ++ g_autofree gchar* trusted = NULL; + + if (!is_launcher) + { + return TRUE; + } + +- if (nautilus_file_can_execute (file)) ++ trusted = nautilus_file_get_metadata (file, ++ NAUTILUS_METADATA_KEY_DESKTOP_FILE_TRUSTED, ++ NULL); ++ if (nautilus_file_can_execute (file) && trusted != NULL) + { + return TRUE; + } +diff --git a/src/nautilus-file-operations.c b/src/nautilus-file-operations.c +index 728a80df8..3b55854f4 100644 +--- a/src/nautilus-file-operations.c ++++ b/src/nautilus-file-operations.c +@@ -200,10 +200,10 @@ typedef struct + #define COPY_FORCE _("Copy _Anyway") + + static void +-mark_desktop_file_trusted (CommonJob *common, +- GCancellable *cancellable, +- GFile *file, +- gboolean interactive); ++mark_desktop_file_executable (CommonJob *common, ++ GCancellable *cancellable, ++ GFile *file, ++ gboolean interactive); + + static gboolean + is_all_button_text (const char *button_text) +@@ -5246,10 +5246,10 @@ retry: + g_file_equal (copy_job->desktop_location, dest_dir) && + is_trusted_desktop_file (src, job->cancellable)) + { +- mark_desktop_file_trusted (job, +- job->cancellable, +- dest, +- FALSE); ++ mark_desktop_file_executable (job, ++ job->cancellable, ++ dest, ++ FALSE); + } + + if (job->undo_info != NULL) +@@ -7843,9 +7843,9 @@ nautilus_file_operations_empty_trash (GtkWidget *parent_view) + } + + static void +-mark_trusted_task_done (GObject *source_object, +- GAsyncResult *res, +- gpointer user_data) ++mark_desktop_file_executable_task_done (GObject *source_object, ++ GAsyncResult *res, ++ gpointer user_data) + { + MarkTrustedJob *job = user_data; + +@@ -7863,13 +7863,11 @@ mark_trusted_task_done (GObject *source_object, + #define TRUSTED_SHEBANG "#!/usr/bin/env xdg-open\n" + + static void +-mark_desktop_file_trusted (CommonJob *common, +- GCancellable *cancellable, +- GFile *file, +- gboolean interactive) ++mark_desktop_file_executable (CommonJob *common, ++ GCancellable *cancellable, ++ GFile *file, ++ gboolean interactive) + { +- char *contents, *new_contents; +- gsize length, new_length; + GError *error; + guint32 current_perms, new_perms; + int response; +@@ -7877,96 +7875,6 @@ mark_desktop_file_trusted (CommonJob *common, + + retry: + error = NULL; +- if (!g_file_load_contents (file, +- cancellable, +- &contents, &length, +- NULL, &error)) +- { +- if (interactive) +- { +- response = run_error (common, +- g_strdup (_("Unable to mark launcher trusted (executable)")), +- error->message, +- NULL, +- FALSE, +- CANCEL, RETRY, +- NULL); +- } +- else +- { +- response = 0; +- } +- +- +- if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) +- { +- abort_job (common); +- } +- else if (response == 1) +- { +- goto retry; +- } +- else +- { +- g_assert_not_reached (); +- } +- +- goto out; +- } +- +- if (!g_str_has_prefix (contents, "#!")) +- { +- new_length = length + strlen (TRUSTED_SHEBANG); +- new_contents = g_malloc (new_length); +- +- strcpy (new_contents, TRUSTED_SHEBANG); +- memcpy (new_contents + strlen (TRUSTED_SHEBANG), +- contents, length); +- +- if (!g_file_replace_contents (file, +- new_contents, +- new_length, +- NULL, +- FALSE, 0, +- NULL, cancellable, &error)) +- { +- g_free (contents); +- g_free (new_contents); +- +- if (interactive) +- { +- response = run_error (common, +- g_strdup (_("Unable to mark launcher trusted (executable)")), +- error->message, +- NULL, +- FALSE, +- CANCEL, RETRY, +- NULL); +- } +- else +- { +- response = 0; +- } +- +- if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) +- { +- abort_job (common); +- } +- else if (response == 1) +- { +- goto retry; +- } +- else +- { +- g_assert_not_reached (); +- } +- +- goto out; +- } +- g_free (new_contents); +- } +- g_free (contents); +- + info = g_file_query_info (file, + G_FILE_ATTRIBUTE_STANDARD_TYPE "," + G_FILE_ATTRIBUTE_UNIX_MODE, +@@ -8057,10 +7965,10 @@ out: + } + + static void +-mark_trusted_task_thread_func (GTask *task, +- gpointer source_object, +- gpointer task_data, +- GCancellable *cancellable) ++mark_desktop_file_executable_task_thread_func (GTask *task, ++ gpointer source_object, ++ gpointer task_data, ++ GCancellable *cancellable) + { + MarkTrustedJob *job = task_data; + CommonJob *common; +@@ -8069,18 +7977,18 @@ mark_trusted_task_thread_func (GTask *task, + + nautilus_progress_info_start (job->common.progress); + +- mark_desktop_file_trusted (common, +- cancellable, +- job->file, +- job->interactive); ++ mark_desktop_file_executable (common, ++ cancellable, ++ job->file, ++ job->interactive); + } + + void +-nautilus_file_mark_desktop_file_trusted (GFile *file, +- GtkWindow *parent_window, +- gboolean interactive, +- NautilusOpCallback done_callback, +- gpointer done_callback_data) ++nautilus_file_mark_desktop_file_executable (GFile *file, ++ GtkWindow *parent_window, ++ gboolean interactive, ++ NautilusOpCallback done_callback, ++ gpointer done_callback_data) + { + GTask *task; + MarkTrustedJob *job; +@@ -8091,9 +7999,9 @@ nautilus_file_mark_desktop_file_trusted (GFile *file, + job->done_callback = done_callback; + job->done_callback_data = done_callback_data; + +- task = g_task_new (NULL, NULL, mark_trusted_task_done, job); ++ task = g_task_new (NULL, NULL, mark_desktop_file_executable_task_done, job); + g_task_set_task_data (task, job, NULL); +- g_task_run_in_thread (task, mark_trusted_task_thread_func); ++ g_task_run_in_thread (task, mark_desktop_file_executable_task_thread_func); + g_object_unref (task); + } + +diff --git a/src/nautilus-file-operations.h b/src/nautilus-file-operations.h +index 7b8e7ad68..630474a74 100644 +--- a/src/nautilus-file-operations.h ++++ b/src/nautilus-file-operations.h +@@ -143,10 +143,10 @@ void nautilus_file_operations_link (GList *files, + GtkWindow *parent_window, + NautilusCopyCallback done_callback, + gpointer done_callback_data); +-void nautilus_file_mark_desktop_file_trusted (GFile *file, +- GtkWindow *parent_window, +- gboolean interactive, +- NautilusOpCallback done_callback, +- gpointer done_callback_data); ++void nautilus_file_mark_desktop_file_executable (GFile *file, ++ GtkWindow *parent_window, ++ gboolean interactive, ++ NautilusOpCallback done_callback, ++ gpointer done_callback_data); + + #endif /* NAUTILUS_FILE_OPERATIONS_H */ +diff --git a/src/nautilus-metadata.c b/src/nautilus-metadata.c +index 8316426f9..bee04e7ca 100644 +--- a/src/nautilus-metadata.c ++++ b/src/nautilus-metadata.c +@@ -51,6 +51,7 @@ static char *used_metadata_names[] = + NAUTILUS_METADATA_KEY_CUSTOM_ICON_NAME, + NAUTILUS_METADATA_KEY_SCREEN, + NAUTILUS_METADATA_KEY_EMBLEMS, ++ NAUTILUS_METADATA_KEY_DESKTOP_FILE_TRUSTED, + NULL + }; + +diff --git a/src/nautilus-metadata.h b/src/nautilus-metadata.h +index 7a734af31..c4a303ec5 100644 +--- a/src/nautilus-metadata.h ++++ b/src/nautilus-metadata.h +@@ -67,6 +67,8 @@ + #define NAUTILUS_METADATA_KEY_SCREEN "screen" + #define NAUTILUS_METADATA_KEY_EMBLEMS "emblems" + ++#define NAUTILUS_METADATA_KEY_DESKTOP_FILE_TRUSTED "trusted" ++ + guint nautilus_metadata_get_id (const char *metadata); + + #endif /* NAUTILUS_METADATA_H */ +diff --git a/src/nautilus-mime-actions.c b/src/nautilus-mime-actions.c +index 796dabbe1..66d7fbd67 100644 +--- a/src/nautilus-mime-actions.c ++++ b/src/nautilus-mime-actions.c +@@ -42,6 +42,7 @@ + #include "nautilus-program-choosing.h" + #include "nautilus-global-preferences.h" + #include "nautilus-signaller.h" ++#include "nautilus-metadata.h" + + #define DEBUG_FLAG NAUTILUS_DEBUG_MIME + #include "nautilus-debug.h" +@@ -220,7 +221,6 @@ struct + #define RESPONSE_RUN 1000 + #define RESPONSE_DISPLAY 1001 + #define RESPONSE_RUN_IN_TERMINAL 1002 +-#define RESPONSE_MARK_TRUSTED 1003 + + #define SILENT_WINDOW_OPEN_LIMIT 5 + #define SILENT_OPEN_LIMIT 5 +@@ -1502,24 +1502,35 @@ untrusted_launcher_response_callback (GtkDialog *dialog, + + switch (response_id) + { +- case RESPONSE_RUN: ++ case GTK_RESPONSE_OK: + { ++ file = nautilus_file_get_location (parameters->file); ++ ++ /* We need to do this in order to prevent malicious desktop files ++ * with the executable bit already set. ++ * See https://bugzilla.gnome.org/show_bug.cgi?id=777991 ++ */ ++ nautilus_file_set_metadata (parameters->file, NAUTILUS_METADATA_KEY_DESKTOP_FILE_TRUSTED, ++ NULL, ++ "yes"); ++ ++ nautilus_file_mark_desktop_file_executable (file, ++ parameters->parent_window, ++ TRUE, ++ NULL, NULL); ++ ++ /* Need to force a reload of the attributes so is_trusted is marked ++ * correctly. Not sure why the general monitor doesn't fire in this ++ * case when setting the metadata ++ */ ++ nautilus_file_invalidate_all_attributes (parameters->file); ++ + screen = gtk_widget_get_screen (GTK_WIDGET (parameters->parent_window)); + uri = nautilus_file_get_uri (parameters->file); + DEBUG ("Launching untrusted launcher %s", uri); + nautilus_launch_desktop_file (screen, uri, NULL, + parameters->parent_window); + g_free (uri); +- } +- break; +- +- case RESPONSE_MARK_TRUSTED: +- { +- file = nautilus_file_get_location (parameters->file); +- nautilus_file_mark_desktop_file_trusted (file, +- parameters->parent_window, +- TRUE, +- NULL, NULL); + g_object_unref (file); + } + break; +@@ -1571,21 +1582,20 @@ activate_desktop_file (ActivateParameters *parameters, + GTK_MESSAGE_WARNING, + GTK_BUTTONS_NONE, + NULL); ++ + g_object_set (dialog, + "text", primary, + "secondary-text", secondary, + NULL); + gtk_dialog_add_button (GTK_DIALOG (dialog), +- _("_Launch Anyway"), RESPONSE_RUN); ++ _("_Cancel"), GTK_RESPONSE_CANCEL); ++ ++ gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL); + if (nautilus_file_can_set_permissions (file)) + { + gtk_dialog_add_button (GTK_DIALOG (dialog), +- _("Mark as _Trusted"), RESPONSE_MARK_TRUSTED); ++ _("Trust and _Launch"), GTK_RESPONSE_OK); + } +- gtk_dialog_add_button (GTK_DIALOG (dialog), +- _("_Cancel"), GTK_RESPONSE_CANCEL); +- gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL); +- + g_signal_connect (dialog, "response", + G_CALLBACK (untrusted_launcher_response_callback), + parameters_desktop); +-- +2.14.3 + diff --git a/SOURCES/0001-translation-Add-Japanese.patch b/SOURCES/0001-translation-Add-Japanese.patch new file mode 100644 index 0000000..6be7461 --- /dev/null +++ b/SOURCES/0001-translation-Add-Japanese.patch @@ -0,0 +1,7362 @@ +From db7be70130a382416f425365b46df9757c8ece3e Mon Sep 17 00:00:00 2001 +From: Carlos Soriano +Date: Mon, 29 May 2017 10:58:25 +0200 +Subject: [PATCH] translation: Add japanese + +--- + po/ja.po | 4732 ++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 2570 insertions(+), 2162 deletions(-) + +diff --git a/po/ja.po b/po/ja.po +index 89cbe16cd..3b9146bb0 100644 +--- a/po/ja.po ++++ b/po/ja.po +@@ -10,760 +10,1304 @@ + # Takayuki KUSANO , 2009-2012. + # Hideki Yamane (Debian-JP) , 2009. + # Jiro Matsuzawa , 2011-2016. +-# ++# + # * Merged eel since v2.25.2. + # Copyright (C) 2000-2005,2007,2008 Free Software Foundation, Inc. +-# ++# kmoriguc , 2017. #zanata ++# ljanda , 2017. #zanata + msgid "" + msgstr "" +-"Project-Id-Version: nautilus master\n" +-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=nautilus&keywords=I18N+L10N&component=Internationalization (i18n)\n" +-"POT-Creation-Date: 2016-03-13 01:47+0000\n" +-"PO-Revision-Date: 2016-03-13 15:52+0900\n" +-"Last-Translator: Jiro Matsuzawa \n" +-"Language-Team: Japanese \n" +-"Language: ja\n" ++"Project-Id-Version: nautilus 3.22.3\n" ++"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=" ++"nautilus\n" ++"POT-Creation-Date: 2017-05-18 10:57+0200\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"PO-Revision-Date: 2017-05-23 01:27+0000\n" ++"Last-Translator: kmoriguc \n" ++"Language-Team: Japanese \n" ++"Language: ja\n" + "Plural-Forms: nplurals=1; plural=0;\n" ++"X-Generator: Zanata 4.1.1\n" ++ ++#: data/nautilus-autorun-software.desktop.in:3 ++msgid "Run Software" ++msgstr "ソフトウェアの実行" ++ ++#. Translators: Do NOT translate or transliterate this text (this is an icon file name)! ++#: data/nautilus-autorun-software.desktop.in:7 ++msgid "application-x-executable" ++msgstr "application-x-executable" + +-#: ../data/org.gnome.Nautilus.appdata.xml.in.h:1 ++#: data/org.gnome.Nautilus.appdata.xml.in:6 + msgid "Nautilus" + msgstr "Nautilus" + +-#: ../data/org.gnome.Nautilus.appdata.xml.in.h:2 +-#: ../data/org.gnome.Nautilus.desktop.in.in.h:2 ++#: data/org.gnome.Nautilus.appdata.xml.in:7 ++#: data/org.gnome.Nautilus.desktop.in:4 + msgid "Access and organize files" + msgstr "ファイルの操作や整理をします" + +-#: ../data/org.gnome.Nautilus.appdata.xml.in.h:3 +-msgid "Nautilus, also known as Files, is the default file manager of the GNOME desktop. It provides a simple and integrated way of managing your files and browsing your file system." +-msgstr "Nautilus (「ファイル」という名称でも知られています) は、GNOME デスクトップで使用されているデフォルトのファイルマネージャーです。ファイルの管理やファイルシステムの閲覧をシンプルかつ統合的に行うことができます。" +- +-#: ../data/org.gnome.Nautilus.appdata.xml.in.h:4 +-msgid "Nautilus supports all the basic functions of a file manager and more. It can search and manage your files and folders, both locally and on a network, read and write data to and from removable media, run scripts, and launch applications. It has three views: Icon Grid, Icon List, and Tree List. Its functions can be extended with plugins and scripts." +-msgstr "Nautilus は、ファイルマネージャーとしての基本機能を完備するだけでなく、便利な機能もたくさんあります。たとえば、ファイルとフォルダーの検索と管理、ローカルおよびネットワーク上でのファイル操作、リムーバルメディアのデータ読み書き、スクリプトの実行アプリケーションの起動などです。三種類の表示モードが利用できます: アイコングリッド、アイコンリスト、そしてツリーリストです。プラグインとスクリプトを利用して機能拡張ができます。" ++#: data/org.gnome.Nautilus.appdata.xml.in:9 ++msgid "" ++"Nautilus, also known as Files, is the default file manager of the GNOME " ++"desktop. It provides a simple and integrated way of managing your files and " ++"browsing your file system." ++msgstr "" ++"Nautilus (「ファイル」という名称でも知られています) は、GNOME " ++"デスクトップで使用されているデフォルトのファイルマネージャーです。ファイルの管理やファイルシステムの閲覧をシンプルかつ統合的に行うことができます。" + +-#: ../data/nautilus-autorun-software.desktop.in.in.h:1 +-msgid "Run Software" +-msgstr "ソフトウェアの実行" ++#: data/org.gnome.Nautilus.appdata.xml.in:13 ++msgid "" ++"Nautilus supports all the basic functions of a file manager and more. It can " ++"search and manage your files and folders, both locally and on a network, " ++"read and write data to and from removable media, run scripts, and launch " ++"applications. It has three views: Icon Grid, Icon List, and Tree List. Its " ++"functions can be extended with plugins and scripts." ++msgstr "" ++"Nautilus " ++"は、ファイルマネージャーとしての基本機能を完備するだけでなく、便利な機能もたくさんあります。たとえば、ファイルとフォルダーの検索と管理、ローカルおよびネットワーク上でのファイル操作、リムーバルメディアのデータ読み書き、スクリプトの実行アプリケーションの起動などです。三種類の表示モードが利用できます:" ++" アイコングリッド、アイコンリスト、そしてツリーリストです。プラグインとスクリプトを利用して機能拡張ができます。" + +-#: ../data/org.gnome.Nautilus.desktop.in.in.h:1 +-#: ../src/nautilus-mime-actions.c:99 ../src/nautilus-properties-window.c:4198 +-#: ../src/nautilus-window.c:2727 ++#: data/org.gnome.Nautilus.desktop.in:3 src/nautilus-mime-actions.c:102 ++#: src/nautilus-properties-window.c:4629 src/nautilus-window.c:2908 + msgid "Files" + msgstr "ファイル" + +-#: ../data/org.gnome.Nautilus.desktop.in.in.h:3 ++#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! ++#: data/org.gnome.Nautilus.desktop.in:6 + msgid "folder;manager;explore;disk;filesystem;" +-msgstr "folder;manager;explore;disk;filesystem;フォルダー;マネージャー;エクスプローラー;ディスク;ファイルシステム;" ++msgstr "" ++"folder;manager;explore;disk;filesystem;フォルダー;マネージャー;エクスプローラー;ディスク;ファイルシステム;" + +-#: ../data/org.gnome.Nautilus.desktop.in.in.h:4 ++#. Translators: Do NOT translate or transliterate this text (this is an icon file name)! ++#: data/org.gnome.Nautilus.desktop.in:9 ++msgid "org.gnome.Nautilus" ++msgstr "org.gnome.Nautilus" ++ ++#: data/org.gnome.Nautilus.desktop.in:24 + msgid "New Window" + msgstr "新しいウィンドウ" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:1 ++#: data/org.gnome.nautilus.gschema.xml:80 + msgid "Where to position newly open tabs in browser windows" + msgstr "ブラウザーウィンドウで新しいタブを開く位置" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:2 +-msgid "If set to \"after-current-tab\", then new tabs are inserted after the current tab. If set to \"end\", then new tabs are appended to the end of the tab list." +-msgstr "\"after-current-tab\" にすると、新しいタブが現在フォーカスが当たっているタブの後ろに挿入されるようになります。\"end\" にすると、新しいタブは常に一番最後に追加されます。" ++#: data/org.gnome.nautilus.gschema.xml:81 ++msgid "" ++"If set to \"after-current-tab\", then new tabs are inserted after the " ++"current tab. If set to \"end\", then new tabs are appended to the end of the " ++"tab list." ++msgstr "" ++"\"after-current-tab\" にすると、新しいタブが現在フォーカスが当たっているタブの後ろに挿入されるようになります。\"end\" " ++"にすると、新しいタブは常に一番最後に追加されます。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:3 ++#: data/org.gnome.nautilus.gschema.xml:85 + msgid "Always use the location entry, instead of the pathbar" + msgstr "常に場所エントリを使用する (パスバーは使わない)" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:4 +-msgid "If set to true, then Nautilus browser windows will always use a textual input entry for the location toolbar, instead of the pathbar." ++#: data/org.gnome.nautilus.gschema.xml:86 ++msgid "" ++"If set to true, then Nautilus browser windows will always use a textual " ++"input entry for the location toolbar, instead of the pathbar." + msgstr "true にすると、Nautilus ブラウザーの場所バーはパスバーのスタイルではなく、キーボードから入力するスタイルを使用します。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:5 ++#: data/org.gnome.nautilus.gschema.xml:90 + msgid "Where to perform recursive search" + msgstr "再帰検索を行う場所" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:6 +-msgid "In which locations Nautilus should search on subfolders. Available values are 'local-only', 'always', 'never'." ++#: data/org.gnome.nautilus.gschema.xml:91 ++msgid "" ++"In which locations Nautilus should search on subfolders. Available values " ++"are 'local-only', 'always', 'never'." + msgstr "どの場所でサブフォルダー内の検索を行うかの設定です。指定可能な値: 'local-only', 'always', 'never'" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:7 ++#: data/org.gnome.nautilus.gschema.xml:95 + msgid "Filter the search dates using either last used or last modified" + msgstr "検索フィルターの日付に最終使用日時か最終更新日時のどちらを指定するか" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:8 ++#: data/org.gnome.nautilus.gschema.xml:96 + msgid "Filter the search dates using either last used or last modified." + msgstr "検索フィルターの日付に最終使用日時か最終更新日時のどちらを指定するかの設定です。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:9 ++#: data/org.gnome.nautilus.gschema.xml:100 + msgid "Whether to show a context menu item to delete permanently" + msgstr "ファイルを完全に削除する項目をコンテキストメニューに追加する" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:10 +-msgid "If set to true, then Nautilus will show a delete permanently context menu item to bypass the Trash." +-msgstr "true にすると、ファイルを完全に削除するための項目をコンテキストメニューに追加します。この操作はファイルをゴミ箱へ移動せずに抹消します。" ++#: data/org.gnome.nautilus.gschema.xml:101 ++msgid "" ++"If set to true, then Nautilus will show a delete permanently context menu " ++"item to bypass the Trash." ++msgstr "" ++"true にすると、ファイルを完全に削除するための項目をコンテキストメニューに追加します。この操作はファイルをゴミ箱へ移動せずに抹消します。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:11 +-msgid "Whether to show context menu items to create links from copied or selected files" ++#: data/org.gnome.nautilus.gschema.xml:105 ++msgid "" ++"Whether to show context menu items to create links from copied or selected " ++"files" + msgstr "コピーまたは選択したファイルのリンクを作成する項目をコンテキストメニューに追加する" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:12 +-msgid "If set to true, then Nautilus will show context menu items to create links from the copied or selected files." ++#: data/org.gnome.nautilus.gschema.xml:106 ++msgid "" ++"If set to true, then Nautilus will show context menu items to create links " ++"from the copied or selected files." + msgstr "true にすると、コピーまたは選択したファイルのリンクを作成するための項目をコンテキストメニューに追加します。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:13 +-msgid "Whether to ask for confirmation when deleting files, or emptying the Trash" ++#: data/org.gnome.nautilus.gschema.xml:110 ++msgid "" ++"Whether to ask for confirmation when deleting files, or emptying the Trash" + msgstr "ファイルを削除したりゴミ箱へ移動するときに確認する" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:14 +-msgid "If set to true, then Nautilus will ask for confirmation when you attempt to delete files, or empty the Trash." ++#: data/org.gnome.nautilus.gschema.xml:111 ++msgid "" ++"If set to true, then Nautilus will ask for confirmation when you attempt to " ++"delete files, or empty the Trash." + msgstr "true にすると、ファイルを削除したりゴミ箱に移動するたびに確認ダイアログを表示します。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:15 ++#: data/org.gnome.nautilus.gschema.xml:115 ++msgid "" ++"Whether to extract compressed files instead of opening them in another " ++"application" ++msgstr "圧縮ファイルを別のアプリケーションで開くのではなく、展開するかどうか" ++ ++#: data/org.gnome.nautilus.gschema.xml:116 ++msgid "" ++"If set to true, then Nautilus will automatically extract compressed files " ++"instead of opening them in another application" ++msgstr "true に設定すると、Nautilus は圧縮ファイルを別のアプリケーションで開くのではなく、自動的に展開します" ++ ++#: data/org.gnome.nautilus.gschema.xml:121 + msgid "When to show number of items in a folder" + msgstr "フォルダーの中にあるアイテム数を表示する条件" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:16 +-msgid "Speed tradeoff for when to show the number of items in a folder. If set to \"always\" then always show item counts, even if the folder is on a remote server. If set to \"local-only\" then only show counts for local file systems. If set to \"never\" then never bother to compute item counts." +-msgstr "フォルダーの中にあるアイテムの総数をどういう時に表示するかです。指定内容により処理速度のトレードオフがあります。\"always\" にすると、リモートサーバー上にあるファイルもカウントします。\"local-only\" にすると、ローカルのファイルシステム上にあるファイルのみカウントします。\"never\" にすると、わざわざアイテムの総数をカウントしません。" ++#: data/org.gnome.nautilus.gschema.xml:122 ++msgid "" ++"Speed tradeoff for when to show the number of items in a folder. If set to " ++"\"always\" then always show item counts, even if the folder is on a remote " ++"server. If set to \"local-only\" then only show counts for local file " ++"systems. If set to \"never\" then never bother to compute item counts." ++msgstr "" ++"フォルダーの中にあるアイテムの総数をどういう時に表示するかです。指定内容により処理速度のトレードオフがあります。\"always\" " ++"にすると、リモートサーバー上にあるファイルもカウントします。\"local-only\" " ++"にすると、ローカルのファイルシステム上にあるファイルのみカウントします。\"never\" にすると、わざわざアイテムの総数をカウントしません。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:17 ++#: data/org.gnome.nautilus.gschema.xml:126 + msgid "Type of click used to launch/open files" + msgstr "アイテムを起動したり開いたりする際に使用するクリックの種類" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:18 +-msgid "Possible values are \"single\" to launch files on a single click, or \"double\" to launch them on a double click." ++#: data/org.gnome.nautilus.gschema.xml:127 ++msgid "" ++"Possible values are \"single\" to launch files on a single click, or " ++"\"double\" to launch them on a double click." + msgstr "シングルクリックでアイテムを起動する場合は \"single\"、ダブルクリックでアイテムを起動する場合は \"double\" です。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:19 ++#: data/org.gnome.nautilus.gschema.xml:131 + msgid "What to do with executable text files when activated" + msgstr "実行型式のテキストファイルをクリックした際の扱い方" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:20 +-msgid "What to do with executable text files when they are activated (single or double clicked). Possible values are \"launch\" to launch them as programs, \"ask\" to ask what to do via a dialog, and \"display\" to display them as text files." +-msgstr "(シングル/ダブルクリックで) 実行型式のテキストファイルをクリックした際にどのように扱うかです。利用可能な値: \"launch\" にするとプログラムとして起動、\"ask\" にするとダイアログ表示、\"display\" にするとテキストファイルとして表示" ++#: data/org.gnome.nautilus.gschema.xml:132 ++msgid "" ++"What to do with executable text files when they are activated (single or " ++"double clicked). Possible values are \"launch\" to launch them as programs, " ++"\"ask\" to ask what to do via a dialog, and \"display\" to display them as " ++"text files." ++msgstr "" ++"(シングル/ダブルクリックで) 実行型式のテキストファイルをクリックした際にどのように扱うかです。利用可能な値: \"launch\" " ++"にするとプログラムとして起動、\"ask\" にするとダイアログ表示、\"display\" にするとテキストファイルとして表示" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:21 ++#: data/org.gnome.nautilus.gschema.xml:136 + msgid "Show the package installer for unknown MIME types" + msgstr "MIME 型が不明な場合にパッケージのインストーラーを表示する" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:22 +-msgid "Whether to show the user a package installer dialog in case an unknown MIME type is opened, in order to search for an application to handle it." +-msgstr "未知の MIME 型のファイルを開こうとしたときに、パッケージインストーラーのダイアログを表示するかどうかの設定です。パッケージインストーラーを使ってファイルを扱えるアプリケーションを探すことができます。" ++#: data/org.gnome.nautilus.gschema.xml:137 ++msgid "" ++"Whether to show the user a package installer dialog in case an unknown MIME " ++"type is opened, in order to search for an application to handle it." ++msgstr "" ++"未知の MIME " ++"型のファイルを開こうとしたときに、パッケージインストーラーのダイアログを表示するかどうかの設定です。パッケージインストーラーを使ってファイルを扱えるアプリケーションを探すことができます。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:23 +-msgid "Show a warning dialog for the change of the shortcut for move to the Trash" ++#: data/org.gnome.nautilus.gschema.xml:141 ++msgid "" ++"Show a warning dialog for the change of the shortcut for move to the Trash" + msgstr "ゴミ箱へ移動するショートカットの変更についてダイアログで注意を促す" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:24 +-msgid "Show a warning dialog for the change of the shortcut for move to the Trash from Control + Delete to just Delete." ++#: data/org.gnome.nautilus.gschema.xml:142 ++msgid "" ++"Show a warning dialog for the change of the shortcut for move to the Trash " ++"from Control + Delete to just Delete." + msgstr "ゴミ箱へ移動するショートカットを Ctrl+Delete から Delete のみに変更した場合にダイアログで注意を促します。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:25 ++#: data/org.gnome.nautilus.gschema.xml:146 + msgid "Use extra mouse button events in Nautilus' browser window" + msgstr "Nautilus のブラウザーウィンドウでマウスの特別なボタンを使う" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:26 +-msgid "For users with mice that have \"Forward\" and \"Back\" buttons, this key will determine if any action is taken inside of Nautilus when either is pressed." +-msgstr "「進む」「戻る」ボタンのあるマウスを使う場合、Nautilus 中においてそれらのボタンを押した時に何らかのアクションを実行するかどうか、このキーによって 決定します" ++#: data/org.gnome.nautilus.gschema.xml:147 ++msgid "" ++"For users with mice that have \"Forward\" and \"Back\" buttons, this key " ++"will determine if any action is taken inside of Nautilus when either is " ++"pressed." ++msgstr "" ++"「進む」「戻る」ボタンのあるマウスを使う場合、Nautilus " ++"中においてそれらのボタンを押した時に何らかのアクションを実行するかどうか、このキーによって 決定します" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:27 ++#: data/org.gnome.nautilus.gschema.xml:151 + msgid "Mouse button to activate the \"Forward\" command in browser window" + msgstr "ブラウザーウィンドウで「進む」コマンドを実行するマウスのボタン" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:28 +-msgid "For users with mice that have buttons for \"Forward\" and \"Back\", this key will set which button activates the \"Forward\" command in a browser window. Possible values range between 6 and 14." +-msgstr "「進む」「戻る」ボタンのあるボタンを使う場合、ブラウザーウィンドウで「進む」コマンドをどのボタンで実行するかを、このキーで設定します。可能な値は6と14の間です。" ++#: data/org.gnome.nautilus.gschema.xml:152 ++msgid "" ++"For users with mice that have buttons for \"Forward\" and \"Back\", this key " ++"will set which button activates the \"Forward\" command in a browser window. " ++"Possible values range between 6 and 14." ++msgstr "" ++"「進む」「戻る」ボタンのあるボタンを使う場合、ブラウザーウィンドウで「進む」コマンドをどのボタンで実行するかを、このキーで設定します。可能な値は6と14の間です。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:29 ++#: data/org.gnome.nautilus.gschema.xml:156 + msgid "Mouse button to activate the \"Back\" command in browser window" + msgstr "ブラウザーウィンドウで「戻る」コマンドを実行するマウスのボタン" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:30 +-msgid "For users with mice that have buttons for \"Forward\" and \"Back\", this key will set which button activates the \"Back\" command in a browser window. Possible values range between 6 and 14." +-msgstr "「進む」「戻る」ボタンのあるボタンを使う場合、ブラウザーウィンドウで「戻る」コマンドをどのボタンで実行するかを、このキーで設定します。可能な値は6と14の間です。" ++#: data/org.gnome.nautilus.gschema.xml:157 ++msgid "" ++"For users with mice that have buttons for \"Forward\" and \"Back\", this key " ++"will set which button activates the \"Back\" command in a browser window. " ++"Possible values range between 6 and 14." ++msgstr "" ++"「進む」「戻る」ボタンのあるボタンを使う場合、ブラウザーウィンドウで「戻る」コマンドをどのボタンで実行するかを、このキーで設定します。可能な値は6と14の間です。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:31 ++#: data/org.gnome.nautilus.gschema.xml:162 + msgid "When to show thumbnails of files" + msgstr "ファイルのサムネイルをいつ表示するか" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:32 +-msgid "Speed trade-off for when to show a file as a thumbnail. If set to \"always\" then always thumbnail, even if the folder is on a remote server. If set to \"local-only\" then only show thumbnails for local file systems. If set to \"never\" then never bother to thumbnail files, just use a generic icon. Despite what the name may suggest, this applies to any previewable file type." +-msgstr "ファイルのサムネイルをどういう時に表示するかは、処理速度のトレードオフがあります。\"always\" にすると、リモートサーバー上にあるファイルでも常にサムネイル表示します。\"local-only\" にすると、ローカルのファイルシステム上のファイルのみサムネイル表示します。\"never\" にすると、サムネイル表示せずに一般的なアイコン表示になります。ファイル名から推測されるものに関わらず、これはプレビュー可能な種類のファイルに適用されます。" ++#: data/org.gnome.nautilus.gschema.xml:163 ++msgid "" ++"Speed trade-off for when to show a file as a thumbnail. If set to \"always\" " ++"then always thumbnail, even if the folder is on a remote server. If set to " ++"\"local-only\" then only show thumbnails for local file systems. If set to " ++"\"never\" then never bother to thumbnail files, just use a generic icon. " ++"Despite what the name may suggest, this applies to any previewable file type." ++"" ++msgstr "" ++"ファイルのサムネイルをどういう時に表示するかは、処理速度のトレードオフがあります。\"always\" " ++"にすると、リモートサーバー上にあるファイルでも常にサムネイル表示します。\"local-only\" " ++"にすると、ローカルのファイルシステム上のファイルのみサムネイル表示します。\"never\" " ++"にすると、サムネイル表示せずに一般的なアイコン表示になります。ファイル名から推測されるものに関わらず、これはプレビュー可能な種類のファイルに適用されます。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:33 ++#: data/org.gnome.nautilus.gschema.xml:167 + msgid "Maximum image size for thumbnailing" + msgstr "サムネイル表示が可能な画像の最大サイズ" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:34 +-msgid "Images over this size (in bytes) won't be thumbnailed. The purpose of this setting is to avoid thumbnailing large images that may take a long time to load or use lots of memory." +-msgstr "サムネイル表示の際に画像サイズがこのサイズ (バイト単位) を越えるものは表示しません。この設定の意図は表示するまでに時間がかかり、多くのメモリを消費する大きな画像のサムネイル表示を制限するためです。" +- +-#: ../data/org.gnome.nautilus.gschema.xml.h:35 +-msgid "Show folders first in windows" +-msgstr "ウィンドウの中でフォルダーを最初に表示する" +- +-#: ../data/org.gnome.nautilus.gschema.xml.h:36 +-msgid "If set to true, then Nautilus shows folders prior to showing files in the icon and list views." +-msgstr "true にすると、アイコン表示と一覧表示でファイルの前にフォルダーを表示します。" ++#: data/org.gnome.nautilus.gschema.xml:168 ++msgid "" ++"Images over this size (in bytes) won't be thumbnailed. The purpose of this " ++"setting is to avoid thumbnailing large images that may take a long time to " ++"load or use lots of memory." ++msgstr "" ++"サムネイル表示の際に画像サイズがこのサイズ (バイト単位) " ++"を越えるものは表示しません。この設定の意図は表示するまでに時間がかかり、多くのメモリを消費する大きな画像のサムネイル表示を制限するためです。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:37 ++#: data/org.gnome.nautilus.gschema.xml:175 + msgid "Default sort order" + msgstr "デフォルトの並び順" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:38 +-msgid "The default sort-order for items in the icon view. Possible values are \"name\", \"size\", \"type\" and \"mtime\"." ++#: data/org.gnome.nautilus.gschema.xml:176 ++msgid "" ++"The default sort-order for items in the icon view. Possible values are " ++"\"name\", \"size\", \"type\" and \"mtime\"." + msgstr "アイコン表示でアイテムを並べるデフォルトの順番です。利用可能な値: \"name\", \"size\", \"type\", \"mtime\"" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:39 ++#: data/org.gnome.nautilus.gschema.xml:180 + msgid "Reverse sort order in new windows" + msgstr "新しいウィンドウの中で逆順に並べ替える" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:40 +-msgid "If true, files in new windows will be sorted in reverse order. I.e., if sorted by name, then instead of sorting the files from \"a\" to \"z\", they will be sorted from \"z\" to \"a\"; if sorted by size, instead of being incrementally they will be sorted decrementally." +-msgstr "true にすると、ウィンドウに表示されるファイルが逆順に並びます。つまり、名前順の場合は \"a\" 〜 \"z\" でファイルを並べ替えるかわりに、\"z\" 〜 \"a\" の順番で並べます。サイズ順にすると、大きい順のかわりに小さい順で並べます。" ++#: data/org.gnome.nautilus.gschema.xml:181 ++msgid "" ++"If true, files in new windows will be sorted in reverse order. I.e., if " ++"sorted by name, then instead of sorting the files from \"a\" to \"z\", they " ++"will be sorted from \"z\" to \"a\"; if sorted by size, instead of being " ++"incrementally they will be sorted decrementally." ++msgstr "" ++"true にすると、ウィンドウに表示されるファイルが逆順に並びます。つまり、名前順の場合は \"a\" 〜 \"z\" " ++"でファイルを並べ替えるかわりに、\"z\" 〜 \"a\" の順番で並べます。サイズ順にすると、大きい順のかわりに小さい順で並べます。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:41 ++#: data/org.gnome.nautilus.gschema.xml:191 + msgid "Default folder viewer" + msgstr "デフォルトのフォルダー表示形式" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:42 +-msgid "When a folder is visited this viewer is used unless you have selected another view for that particular folder. Possible values are \"list-view\", and \"icon-view\"." +-msgstr "フォルダーを開いたら、特定のフォルダーで別の表示形式を選択していない限り、デフォルトで使用する表示形式です。指定可能な値: \"list-view\", \"icon-view\"" ++#: data/org.gnome.nautilus.gschema.xml:192 ++msgid "" ++"When a folder is visited this viewer is used unless you have selected " ++"another view for that particular folder. Possible values are \"list-view\", " ++"and \"icon-view\"." ++msgstr "" ++"フォルダーを開いたら、特定のフォルダーで別の表示形式を選択していない限り、デフォルトで使用する表示形式です。指定可能な値: \"list-view\", " ++"\"icon-view\"" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:43 ++#: data/org.gnome.nautilus.gschema.xml:196 + msgid "Whether to show hidden files" + msgstr "隠しファイルを表示するかどうか" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:44 +-msgid "This key is deprecated and ignored. The \"show-hidden\" key from \"org.gtk.Settings.FileChooser\" is now used instead." +-msgstr "このキーは非推奨であり、無視されます。代わりに \"org.gtk.Settings.FileChooser\" の \"show-hidden\" が使用されます。" ++#: data/org.gnome.nautilus.gschema.xml:197 ++msgid "" ++"This key is deprecated and ignored. The \"show-hidden\" key from \"org.gtk." ++"Settings.FileChooser\" is now used instead." ++msgstr "" ++"このキーは非推奨であり、無視されます。代わりに \"org.gtk.Settings.FileChooser\" の \"show-hidden\" " ++"が使用されます。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:45 ++#: data/org.gnome.nautilus.gschema.xml:201 + msgid "What viewer should be used when searching" + msgstr "検索結果を表示するモード" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:46 +-msgid "When searching Nautilus will switch to the type of view in this setting." ++#: data/org.gnome.nautilus.gschema.xml:202 ++msgid "" ++"When searching Nautilus will switch to the type of view in this setting." + msgstr "検索結果の表示モードを指定します。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:47 ++#: data/org.gnome.nautilus.gschema.xml:206 + msgid "Bulk rename utility" + msgstr "一括リネームユーティリティ" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:48 +-msgid "If set, Nautilus will append URIs of selected files and treat the result as a command line for bulk renaming. Bulk rename applications can register themselves in this key by setting the key to a space-separated string of their executable name and any command line options. If the executable name is not set to a full path, it will be searched for in the search path." +-msgstr "これが設定されると、一括リネーム対象として選択されたファイル群の各 URI が連結され、リネームアプリケーションのコマンドライン引数として扱われます。一括リネームアプリケーションは、このキーに対して自身を登録することができます。その実行ファイル名と任意のコマンドラインオプションからなるスペース区切り文字列をこのキーに指定します。実行ファイル名がフルパス指定されていない場合は、そのコマンドを検索パスから探します。" ++#: data/org.gnome.nautilus.gschema.xml:207 ++msgid "" ++"If set, Nautilus will append URIs of selected files and treat the result as " ++"a command line for bulk renaming. Bulk rename applications can register " ++"themselves in this key by setting the key to a space-separated string of " ++"their executable name and any command line options. If the executable name " ++"is not set to a full path, it will be searched for in the search path." ++msgstr "" ++"これが設定されると、一括リネーム対象として選択されたファイル群の各 URI " ++"が連結され、リネームアプリケーションのコマンドライン引数として扱われます。一括リネームアプリケーションは、このキーに対して自身を登録することができます。その実行ファイル名と任意のコマンドラインオプションからなるスペース区切り文字列をこのキーに指定します。実行ファイル名がフルパス指定されていない場合は、そのコマンドを検索パスから探します。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:49 +-msgid "Whether to open the hovered folder after a timeout when drag and drop operation" ++#: data/org.gnome.nautilus.gschema.xml:211 ++msgid "" ++"Whether to open the hovered folder after a timeout when drag and drop " ++"operation" + msgstr "アイテムをドラッグしてフォルダー上で一定時間待機すると該当のフォルダーを開く" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:50 +-msgid "If this is set to true, when performing a drag and drop operation the hovered folder will open automatically after a timeout." ++#: data/org.gnome.nautilus.gschema.xml:212 ++msgid "" ++"If this is set to true, when performing a drag and drop operation the " ++"hovered folder will open automatically after a timeout." + msgstr "true にした場合、アイテムをドラッグしてフォルダーの上で一定時間待機すると、該当のフォルダー内に遷移します。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:51 ++#: data/org.gnome.nautilus.gschema.xml:219 ++msgid "Default format for compressing files" ++msgstr "ファイル圧縮時のデフォルト形式" ++ ++#: data/org.gnome.nautilus.gschema.xml:220 ++msgid "The format that will be selected when compressing files." ++msgstr "ファイルを圧縮する際に選択される形式。" ++ ++#: data/org.gnome.nautilus.gschema.xml:227 + msgid "List of possible captions on icons" + msgstr "アイコンの下に表示する見出し" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:52 +-msgid "A list of captions below an icon in the icon view and the desktop. The actual number of captions shown depends on the zoom level. Some possible values are: \"size\", \"type\", \"date_modified\", \"owner\", \"group\", \"permissions\", and \"mime_type\"." +-msgstr "デスクトップとアイコン表示でアイコンの下に表示する見出しの一覧です。実際に表示できる見出しの数はズームレベルに依存します。利用可能な値: \"size\", \"type\", \"date_modified\", \"owner\", \"group\", \"permissions\", \"mime_type\"" ++#: data/org.gnome.nautilus.gschema.xml:228 ++msgid "" ++"A list of captions below an icon in the icon view and the desktop. The " ++"actual number of captions shown depends on the zoom level. Some possible " ++"values are: \"size\", \"type\", \"date_modified\", \"owner\", \"group\", " ++"\"permissions\", and \"mime_type\"." ++msgstr "" ++"デスクトップとアイコン表示でアイコンの下に表示する見出しの一覧です。実際に表示できる見出しの数はズームレベルに依存します。利用可能な値: " ++"\"size\", \"type\", \"date_modified\", \"owner\", \"group\", " ++"\"permissions\", \"mime_type\"" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:53 ++#: data/org.gnome.nautilus.gschema.xml:232 + msgid "Default icon zoom level" + msgstr "デフォルトのアイコン表示のズームレベル" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:54 ++#: data/org.gnome.nautilus.gschema.xml:233 + msgid "Default zoom level used by the icon view." + msgstr "アイコン表示に適用するデフォルトのズームレベルです。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:55 ++#: data/org.gnome.nautilus.gschema.xml:237 + msgid "Default Thumbnail Icon Size" + msgstr "デフォルトのサムネイルアイコンのサイズ" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:56 +-msgid "The default size of an icon for a thumbnail in the icon view when using NAUTILUS_ICON_SIZE_STANDARD size." +-msgstr "アイコン表示でサムネイルとして表示するアイコンのデフォルトサイズです (NAUTILUS_ICON_SIZE_STANDARD を使用している場合)。" ++#: data/org.gnome.nautilus.gschema.xml:238 ++msgid "" ++"The default size of an icon for a thumbnail in the icon view when using " ++"NAUTILUS_ICON_SIZE_STANDARD size." ++msgstr "" ++"アイコン表示でサムネイルとして表示するアイコンのデフォルトサイズです (NAUTILUS_ICON_SIZE_STANDARD を使用している場合)。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:57 ++#: data/org.gnome.nautilus.gschema.xml:242 ++#: data/org.gnome.nautilus.gschema.xml:313 + msgid "Text Ellipsis Limit" + msgstr "ファイル名を省略する際の上限" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:58 +-msgid "A string specifying how parts of overlong file names should be replaced by ellipses, depending on the zoom level. Each of the list entries is of the form \"Zoom Level:Integer\". For each specified zoom level, if the given integer is larger than 0, the file name will not exceed the given number of lines. If the integer is 0 or smaller, no limit is imposed on the specified zoom level. A default entry of the form \"Integer\" without any specified zoom level is also allowed. It defines the maximum number of lines for all other zoom levels. Examples: 0 - always display overlong file names; 3 - shorten file names if they exceed three lines; smallest:5,smaller:4,0 - shorten file names if they exceed five lines for zoom level \"smallest\". Shorten file names if they exceed four lines for zoom level \"smaller\". Do not shorten file names for other zoom levels. Available zoom levels: small, standard, large." +-msgstr "ズームレベルに応じ、ファイル名の一部を省略記号 (...) で置き換えるべき長さを指定したリストです (すなわち、n 行に収まらないファイル名を省略文字で置き換えて表示するか、それともそのまま複数行にまたがって表示するかを、ズームレベル毎に指定します)。リストの各要素は \"ズームレベル:整数値\" という形式にしてください。それぞれ指定したズームレベルに対して整数値が 0 より大きい場合、ファイル名は指定した行数を超えて表示されることはありません。整数値が 0 以下の場合、そのズームレベルでは無制限で表示されることになります。ズームレベルを指定せずに \"整数値\" の形式で指定することも可能です。この場合、既に指定しているズーム以外のレベルに対してその整数値が表示する際の最大行数になります。例: \"0\" (常にすべてのファイル名を表示する)、\"3\" (3 行を超えて表示されるファイル名を 3 行に収めるように省略記号で置き換える)、\"smallest:5,smaller:4,0\" というリスト (ズームレベルが \"smallest\" の場合には 5 行を超えて表示されるファイル名を 5 行に収めるように省略記号で置き換え、ズームレベルが \"smaller\" の場合には 4 行を超えて表示されるファイル名を 4 行に収めるように省略記号で置き換え、それ以外のズームレベルではすべてのファイル名を表示する); ズームレベルで指定可能な値: small, standard, large" +- +-#: ../data/org.gnome.nautilus.gschema.xml.h:59 ++#: data/org.gnome.nautilus.gschema.xml:243 ++msgid "" ++"A string specifying how parts of overlong file names should be replaced by " ++"ellipses, depending on the zoom level. Each of the list entries is of the " ++"form \"Zoom Level:Integer\". For each specified zoom level, if the given " ++"integer is larger than 0, the file name will not exceed the given number of " ++"lines. If the integer is 0 or smaller, no limit is imposed on the specified " ++"zoom level. A default entry of the form \"Integer\" without any specified " ++"zoom level is also allowed. It defines the maximum number of lines for all " ++"other zoom levels. Examples: 0 - always display overlong file names; 3 - " ++"shorten file names if they exceed three lines; smallest:5,smaller:4,0 - " ++"shorten file names if they exceed five lines for zoom level \"smallest\". " ++"Shorten file names if they exceed four lines for zoom level \"smaller\". Do " ++"not shorten file names for other zoom levels. Available zoom levels: small, " ++"standard, large." ++msgstr "" ++"ズームレベルに応じ、ファイル名の一部を省略記号 (...) で置き換えるべき長さを指定したリストです (すなわち、n " ++"行に収まらないファイル名を省略文字で置き換えて表示するか、それともそのまま複数行にまたがって表示するかを、ズームレベル毎に指定します)。リストの各要素は " ++"\"ズームレベル:整数値\" という形式にしてください。それぞれ指定したズームレベルに対して整数値が 0 " ++"より大きい場合、ファイル名は指定した行数を超えて表示されることはありません。整数値が 0 " ++"以下の場合、そのズームレベルでは無制限で表示されることになります。ズームレベルを指定せずに \"整数値\" " ++"の形式で指定することも可能です。この場合、既に指定しているズーム以外のレベルに対してその整数値が表示する際の最大行数になります。例: \"0\" " ++"(常にすべてのファイル名を表示する)、\"3\" (3 行を超えて表示されるファイル名を 3 " ++"行に収めるように省略記号で置き換える)、\"smallest:5,smaller:4,0\" というリスト (ズームレベルが \"smallest\" " ++"の場合には 5 行を超えて表示されるファイル名を 5 行に収めるように省略記号で置き換え、ズームレベルが \"smaller\" の場合には 4 " ++"行を超えて表示されるファイル名を 4 行に収めるように省略記号で置き換え、それ以外のズームレベルではすべてのファイル名を表示する); " ++"ズームレベルで指定可能な値: small, standard, large" ++ ++#: data/org.gnome.nautilus.gschema.xml:250 + msgid "Default list zoom level" + msgstr "デフォルトの一覧表示のズームレベル" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:60 ++#: data/org.gnome.nautilus.gschema.xml:251 + msgid "Default zoom level used by the list view." + msgstr "一覧表示に適用するデフォルトのズームレベルです。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:61 ++#: data/org.gnome.nautilus.gschema.xml:255 + msgid "Default list of columns visible in the list view" + msgstr "一覧表示に表示する項目 (デフォルト値)" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:62 ++#: data/org.gnome.nautilus.gschema.xml:256 + msgid "Default list of columns visible in the list view." + msgstr "一覧表示にデフォルトで表示する項目のリストです。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:63 ++#: data/org.gnome.nautilus.gschema.xml:260 + msgid "Default column order in the list view" + msgstr "一覧表示の項目に対するデフォルトの順番" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:64 ++#: data/org.gnome.nautilus.gschema.xml:261 + msgid "Default column order in the list view." + msgstr "一覧表示の中にある項目に対するデフォルトの順番です。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:65 ++#: data/org.gnome.nautilus.gschema.xml:265 + msgid "Use tree view" + msgstr "ツリービューを使用する" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:66 +-msgid "Whether a tree should be used for list view navigation instead of a flat list." ++#: data/org.gnome.nautilus.gschema.xml:266 ++msgid "" ++"Whether a tree should be used for list view navigation instead of a flat " ++"list." + msgstr "一覧表示のナビゲーションに、フラットリストではなくツリービューを使用します。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:67 ++#: data/org.gnome.nautilus.gschema.xml:272 + msgctxt "desktop-font" + msgid "''" + msgstr "''" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:68 ++#: data/org.gnome.nautilus.gschema.xml:273 + msgid "Desktop font" + msgstr "デスクトップのフォント" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:69 ++#: data/org.gnome.nautilus.gschema.xml:274 + msgid "The font description used for the icons on the desktop." + msgstr "デスクトップ上にあるアイコンに使用するフォントの説明です。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:70 ++#: data/org.gnome.nautilus.gschema.xml:278 + msgid "Home icon visible on desktop" + msgstr "デスクトップにホームアイコンを表示する" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:71 +-msgid "If this is set to true, an icon linking to the home folder will be put on the desktop." ++#: data/org.gnome.nautilus.gschema.xml:279 ++msgid "" ++"If this is set to true, an icon linking to the home folder will be put on " ++"the desktop." + msgstr "true にすると、ホームフォルダーのアイコンをデスクトップに表示します。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:72 ++#: data/org.gnome.nautilus.gschema.xml:283 + msgid "Trash icon visible on desktop" + msgstr "デスクトップにゴミ箱アイコンを表示する" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:73 +-msgid "If this is set to true, an icon linking to the Trash will be put on the desktop." ++#: data/org.gnome.nautilus.gschema.xml:284 ++msgid "" ++"If this is set to true, an icon linking to the Trash will be put on the " ++"desktop." + msgstr "true にすると、ゴミ箱アイコンをデスクトップに表示します。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:74 ++#: data/org.gnome.nautilus.gschema.xml:288 + msgid "Show mounted volumes on the desktop" + msgstr "デスクトップにマウントしたボリュームを表示する" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:75 +-msgid "If this is set to true, icons linking to mounted volumes will be put on the desktop." ++#: data/org.gnome.nautilus.gschema.xml:289 ++msgid "" ++"If this is set to true, icons linking to mounted volumes will be put on the " ++"desktop." + msgstr "true にすると、マウント済みのボリュームのアイコンをデスクトップに表示します。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:76 ++#: data/org.gnome.nautilus.gschema.xml:293 + msgid "Network Servers icon visible on the desktop" + msgstr "デスクトップにネットワークサーバーのアイコンを表示する" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:77 +-msgid "If this is set to true, an icon linking to the Network Servers view will be put on the desktop." ++#: data/org.gnome.nautilus.gschema.xml:294 ++msgid "" ++"If this is set to true, an icon linking to the Network Servers view will be " ++"put on the desktop." + msgstr "true にすると、ネットワークサーバーのアイコンをデスクトップに表示します。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:78 ++#: data/org.gnome.nautilus.gschema.xml:297 + msgctxt "home-icon-name" + msgid "'Home'" + msgstr "'ホーム'" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:79 ++#: data/org.gnome.nautilus.gschema.xml:298 + msgid "Desktop home icon name" + msgstr "デスクトップのホームアイコンの名前" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:80 +-msgid "This name can be set if you want a custom name for the home icon on the desktop." ++#: data/org.gnome.nautilus.gschema.xml:299 ++msgid "" ++"This name can be set if you want a custom name for the home icon on the " ++"desktop." + msgstr "デスクトップのホームアイコンの名前を設定します。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:81 ++#: data/org.gnome.nautilus.gschema.xml:302 + msgctxt "trash-icon-name" + msgid "'Trash'" + msgstr "'ゴミ箱'" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:82 ++#: data/org.gnome.nautilus.gschema.xml:303 + msgid "Desktop Trash icon name" + msgstr "デスクトップのゴミ箱アイコンの名前" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:83 +-msgid "This name can be set if you want a custom name for the Trash icon on the desktop." ++#: data/org.gnome.nautilus.gschema.xml:304 ++msgid "" ++"This name can be set if you want a custom name for the Trash icon on the " ++"desktop." + msgstr "デスクトップのゴミ箱アイコンの名前を設定します。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:84 ++#: data/org.gnome.nautilus.gschema.xml:307 + msgctxt "network-icon-name" + msgid "'Network Servers'" + msgstr "'ネットワーク'" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:85 ++#: data/org.gnome.nautilus.gschema.xml:308 + msgid "Network servers icon name" + msgstr "ネットワークサーバーのアイコン名" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:86 +-msgid "This name can be set if you want a custom name for the network servers icon on the desktop." ++#: data/org.gnome.nautilus.gschema.xml:309 ++msgid "" ++"This name can be set if you want a custom name for the network servers icon " ++"on the desktop." + msgstr "デスクトップのネットワークアイコンの名前を設定します。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:87 +-msgid "An integer specifying how parts of overlong file names should be replaced by ellipses on the desktop. If the number is larger than 0, the file name will not exceed the given number of lines. If the number is 0 or smaller, no limit is imposed on the number of displayed lines." +-msgstr "デスクトップで、ファイル名の一部を省略記号 (...) で置き換えるべき長さを指定します (すなわち、n 行に収まらないファイル名を省略文字で置き換えて表示するか、それともそのまま複数行にまたがって表示するかを指定します)。ここで指定した整数値が 0 より大きい場合、ファイル名は指定した行数を超えて表示されることはありません。整数値が 0 以下の場合は制限なしで表示されます。" ++#: data/org.gnome.nautilus.gschema.xml:314 ++msgid "" ++"An integer specifying how parts of overlong file names should be replaced by " ++"ellipses on the desktop. If the number is larger than 0, the file name will " ++"not exceed the given number of lines. If the number is 0 or smaller, no " ++"limit is imposed on the number of displayed lines." ++msgstr "" ++"デスクトップで、ファイル名の一部を省略記号 (...) で置き換えるべき長さを指定します (すなわち、n " ++"行に収まらないファイル名を省略文字で置き換えて表示するか、それともそのまま複数行にまたがって表示するかを指定します)。ここで指定した整数値が 0 " ++"より大きい場合、ファイル名は指定した行数を超えて表示されることはありません。整数値が 0 以下の場合は制限なしで表示されます。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:88 ++#: data/org.gnome.nautilus.gschema.xml:318 + msgid "Fade the background on change" + msgstr "背景の変更時にフェード効果を適用" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:89 +-msgid "If set to true, then Nautilus will use a fade effect to change the desktop background." ++#: data/org.gnome.nautilus.gschema.xml:319 ++msgid "" ++"If set to true, then Nautilus will use a fade effect to change the desktop " ++"background." + msgstr "true にすると、デスクトップの背景を変更するときにフェード効果を適用します。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:90 ++#: data/org.gnome.nautilus.gschema.xml:327 + msgid "The geometry string for a navigation window" + msgstr "ナビゲーションウィンドウの座標を表す文字列" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:91 +-msgid "A string containing the saved geometry and coordinates string for navigation windows." ++#: data/org.gnome.nautilus.gschema.xml:328 ++msgid "" ++"A string containing the saved geometry and coordinates string for navigation " ++"windows." + msgstr "ナビゲーションウィンドウの大きさと位置を保存する文字列です。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:92 ++#: data/org.gnome.nautilus.gschema.xml:332 + msgid "Whether the navigation window should be maximized" + msgstr "ナビゲーションウィンドウを最大化する" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:93 ++#: data/org.gnome.nautilus.gschema.xml:333 + msgid "Whether the navigation window should be maximized by default." + msgstr "ナビゲーションウィンドウをデフォルトで最大化するかどうかです。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:94 ++#: data/org.gnome.nautilus.gschema.xml:337 + msgid "Width of the side pane" + msgstr "サイドペインの幅" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:95 ++#: data/org.gnome.nautilus.gschema.xml:338 + msgid "The default width of the side pane in new windows." + msgstr "新しいウィンドウに表示するサイドペインのデフォルトの幅です。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:96 ++#: data/org.gnome.nautilus.gschema.xml:342 + msgid "Show location bar in new windows" + msgstr "新しいウィンドウに場所バーを表示する" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:97 +-msgid "If set to true, newly opened windows will have the location bar visible." ++#: data/org.gnome.nautilus.gschema.xml:343 ++msgid "" ++"If set to true, newly opened windows will have the location bar visible." + msgstr "true にすると、新規に開いたウィンドウに場所バーが表示されます。" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:98 ++#: data/org.gnome.nautilus.gschema.xml:347 + msgid "Show side pane in new windows" + msgstr "新しいウィンドウにサイドペインを表示する" + +-#: ../data/org.gnome.nautilus.gschema.xml.h:99 ++#: data/org.gnome.nautilus.gschema.xml:348 + msgid "If set to true, newly opened windows will have the side pane visible." + msgstr "true にすると、新規に開いたウィンドウにサイドペインが表示されます。" + +-#: ../eel/eel-canvas.c:1254 ../eel/eel-canvas.c:1255 ++#: eel/eel-canvas.c:1465 eel/eel-canvas.c:1466 + msgid "X" + msgstr "X" + +-#: ../eel/eel-canvas.c:1261 ../eel/eel-canvas.c:1262 ++#: eel/eel-canvas.c:1472 eel/eel-canvas.c:1473 + msgid "Y" + msgstr "Y" + +-#: ../eel/eel-gtk-extensions.c:326 ++#: eel/eel-gtk-extensions.c:337 + msgid "Show more _details" + msgstr "詳細を表示する(_D)" + + #. Put up the timed wait window. +-#: ../eel/eel-stock-dialogs.c:195 +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:558 +-#: ../libnautilus-private/nautilus-file-operations.c:182 +-#: ../src/nautilus-files-view.c:1082 ../src/nautilus-files-view.c:1556 +-#: ../src/nautilus-files-view.c:5274 ../src/nautilus-location-entry.c:270 +-#: ../src/nautilus-mime-actions.c:560 ../src/nautilus-mime-actions.c:564 +-#: ../src/nautilus-mime-actions.c:635 ../src/nautilus-mime-actions.c:978 +-#: ../src/nautilus-mime-actions.c:1488 ../src/nautilus-mime-actions.c:1717 +-#: ../src/nautilus-properties-window.c:4189 +-#: ../src/nautilus-properties-window.c:5181 +-#: ../src/nautilus-search-popover.c:539 ++#. Add buttons ++#: eel/eel-stock-dialogs.c:204 src/nautilus-file-conflict-dialog.c:318 ++#: src/nautilus-file-operations.c:190 src/nautilus-files-view.c:1040 ++#: src/nautilus-files-view.c:1534 src/nautilus-files-view.c:5384 ++#: src/nautilus-location-entry.c:282 src/nautilus-mime-actions.c:569 ++#: src/nautilus-mime-actions.c:573 src/nautilus-mime-actions.c:655 ++#: src/nautilus-mime-actions.c:1039 src/nautilus-mime-actions.c:1586 ++#: src/nautilus-mime-actions.c:1886 src/nautilus-properties-window.c:4620 ++#: src/nautilus-properties-window.c:5719 src/nautilus-search-popover.c:550 ++#: src/resources/ui/nautilus-batch-rename-dialog.ui:12 + msgid "_Cancel" + msgstr "キャンセル(_C)" + +-#: ../eel/eel-stock-dialogs.c:204 ++#: eel/eel-stock-dialogs.c:213 + msgid "You can stop this operation by clicking cancel." + msgstr "[キャンセル] をクリックすると、この操作を取り消せます。" + +-#: ../eel/eel-vfs-extensions.c:98 ++#: eel/eel-vfs-extensions.c:106 + msgid " (invalid Unicode)" + msgstr " (Unicode が正しくありません)" + +-#: ../libnautilus-private/nautilus-bookmark.c:107 +-#: ../libnautilus-private/nautilus-file-utilities.c:273 +-#: ../src/nautilus-pathbar.c:408 +-msgid "Other Locations" +-msgstr "他の場所" ++#: nautilus-desktop/nautilus-desktop-application.c:257 ++msgid "Always manage the desktop (ignore the GSettings preference)." ++msgstr "デスクトップを管理する (GSettings の設定を無視する)" ++ ++#: nautilus-desktop/nautilus-desktop-directory-file.c:444 ++#: nautilus-desktop/nautilus-desktop-icon-file.c:158 ++msgid "on the desktop" ++msgstr "デスクトップ上" ++ ++#: nautilus-desktop/nautilus-desktop-icon-file.c:436 ++msgid "Unable to rename desktop icon" ++msgstr "デスクトップのアイコン名を変更できません" + +-#: ../libnautilus-private/nautilus-bookmark.c:109 +-#: ../libnautilus-private/nautilus-desktop-link.c:129 +-#: ../libnautilus-private/nautilus-file-utilities.c:265 +-#: ../src/nautilus-list-view.c:1490 ../src/nautilus-pathbar.c:406 +-#: ../src/nautilus-shell-search-provider.c:292 ++#: nautilus-desktop/nautilus-desktop-link.c:142 src/nautilus-bookmark.c:116 ++#: src/nautilus-file-utilities.c:304 src/nautilus-list-view.c:1703 ++#: src/nautilus-pathbar.c:429 src/nautilus-shell-search-provider.c:315 + msgid "Home" + msgstr "ホーム" + +-#: ../libnautilus-private/nautilus-canvas-container.c:2481 ++#. hardcode "Desktop" ++#: nautilus-desktop/nautilus-desktop-window.c:309 ++#: nautilus-desktop/nautilus-desktop-window.c:488 ++msgid "Desktop" ++msgstr "デスクトップ" ++ ++#: nautilus-sendto-extension/nautilus-nste.c:107 ++#: nautilus-sendto-extension/nautilus-nste.c:114 ++msgid "Send to…" ++msgstr "送る…" ++ ++#: nautilus-sendto-extension/nautilus-nste.c:108 ++msgid "Send file by mail…" ++msgstr "ファイルをメールで送ります…" ++ ++#: nautilus-sendto-extension/nautilus-nste.c:115 ++msgid "Send files by mail…" ++msgstr "ファイルをメールで送ります…" ++ ++#. Some sort of failure occurred. How 'bout we tell the user? ++#: src/nautilus-application.c:175 src/nautilus-window-slot.c:1348 ++msgid "Oops! Something went wrong." ++msgstr "うわっ! 何か問題が発生しました。" ++ ++#: src/nautilus-application.c:178 ++#, c-format ++msgid "" ++"Unable to create a required folder. Please create the following folder, or " ++"set permissions such that it can be created:\n" ++"%s" ++msgstr "必要なフォルダーが作成できません。以下のフォルダーを作成するか、フォルダーを作成できるように適切なパーミッションを設定してください:\n" ++"%s" ++ ++#: src/nautilus-application.c:185 ++#, c-format ++msgid "" ++"Unable to create required folders. Please create the following folders, or " ++"set permissions such that they can be created:\n" ++"%s" ++msgstr "必要なフォルダーを作成できません。以下のフォルダーを作成するか、フォルダーを作成できるように適切なパーミッションを設定してください:\n" ++"%s" ++ ++#: src/nautilus-application.c:629 ++msgid "--check cannot be used with other options." ++msgstr "--check オプションには他のオプションを指定できません。" ++ ++#: src/nautilus-application.c:637 ++msgid "--quit cannot be used with URIs." ++msgstr "--quit オプションには URI を指定できません。" ++ ++#: src/nautilus-application.c:646 ++msgid "--select must be used with at least an URI." ++msgstr "--select オプションにはひとつ以上の URI を指定してください。" ++ ++#: src/nautilus-application.c:760 ++#, c-format ++msgid "There was an error displaying help: \n" ++"%s" ++msgstr "ヘルプを表示する際にエラーが発生しました: \n" ++"%s" ++ ++#: src/nautilus-application.c:883 ++msgid "Perform a quick set of self-check tests." ++msgstr "簡易自己診断テストセットを実行する" ++ ++#: src/nautilus-application.c:892 ++msgid "Create the initial window with the given geometry." ++msgstr "指定した大きさでウィンドウを起動する" ++ ++#: src/nautilus-application.c:892 ++msgid "GEOMETRY" ++msgstr "GEOMETRY" ++ ++#: src/nautilus-application.c:894 ++msgid "Show the version of the program." ++msgstr "バージョンを表示する" ++ ++#: src/nautilus-application.c:896 ++msgid "Always open a new window for browsing specified URIs" ++msgstr "指定した URI を常に新しいウィンドウで開く" ++ ++#: src/nautilus-application.c:898 ++msgid "Only create windows for explicitly specified URIs." ++msgstr "明示的に指定した URI のウィンドウだけを起動する" ++ ++#: src/nautilus-application.c:900 ++msgid "Quit Nautilus." ++msgstr "Nautilus を強制終了する" ++ ++#: src/nautilus-application.c:902 ++msgid "Select specified URI in parent folder." ++msgstr "指定した URI の親フォルダーを選択する" ++ ++#: src/nautilus-application.c:903 ++msgid "[URI...]" ++msgstr "[URI...]" ++ ++#: src/nautilus-autorun-software.c:158 src/nautilus-autorun-software.c:161 ++#, c-format ++msgid "Unable to start the program:\n" ++"%s" ++msgstr "プログラムを起動できません:\n" ++"%s" ++ ++#: src/nautilus-autorun-software.c:164 ++msgid "Unable to locate the program" ++msgstr "プログラムを見つけることができません" ++ ++#: src/nautilus-autorun-software.c:190 ++msgid "Oops! There was a problem running this software." ++msgstr "うわっ! このソフトウェアの実行で問題が発生しました。" ++ ++#: src/nautilus-autorun-software.c:220 ++#, c-format ++msgid "" ++"“%s” contains software intended to be automatically started. Would you like " ++"to run it?" ++msgstr "“%s”には自動的に起動することを意図したソフトウェアが含まれています。実行してみますか?" ++ ++#: src/nautilus-autorun-software.c:224 ++msgid "If you don't trust this location or aren't sure, press Cancel." ++msgstr "もしこの場所が信用できるものではないか、よくわからない時はキャンセルを押してください。" ++ ++#: src/nautilus-autorun-software.c:255 src/nautilus-mime-actions.c:656 ++msgid "_Run" ++msgstr "実行する(_R)" ++ ++#: src/nautilus-batch-rename-dialog.c:821 ++#, c-format ++msgid "“%s” would not be a unique new name." ++msgstr "“%s” は新しい一意の名前ではありません。" ++ ++#: src/nautilus-batch-rename-dialog.c:827 ++#, c-format ++msgid "“%s” would conflict with an existing file." ++msgstr "“%s” は既存ファイルと競合します。" ++ ++#: src/nautilus-batch-rename-dialog.c:2127 ++#, c-format ++msgid "Rename %d Folder" ++msgid_plural "Rename %d Folders" ++msgstr[0] "%d フォルダーの名前を変更" ++ ++#: src/nautilus-batch-rename-dialog.c:2133 ++#, c-format ++msgid "Rename %d File" ++msgid_plural "Rename %d Files" ++msgstr[0] "%d ファイルの名前を変更" ++ ++#: src/nautilus-batch-rename-dialog.h:88 ++#: src/resources/ui/nautilus-batch-rename-dialog.ui:186 ++#: src/resources/ui/nautilus-batch-rename-dialog.ui:488 ++msgid "Original Name (Ascending)" ++msgstr "元の名前 (昇順)" ++ ++#: src/nautilus-batch-rename-dialog.h:93 ++#: src/resources/ui/nautilus-batch-rename-dialog.ui:493 ++msgid "Original Name (Descending)" ++msgstr "元の名前 (降順)" ++ ++#: src/nautilus-batch-rename-dialog.h:98 ++#: src/resources/ui/nautilus-batch-rename-dialog.ui:498 ++msgid "First Modified" ++msgstr "初回更新日時" ++ ++#: src/nautilus-batch-rename-dialog.h:103 ++#: src/resources/ui/nautilus-batch-rename-dialog.ui:503 ++msgid "Last Modified" ++msgstr "最終更新日時" ++ ++#: src/nautilus-batch-rename-dialog.h:108 ++msgid "First Created" ++msgstr "初回作成日時" ++ ++#: src/nautilus-batch-rename-dialog.h:113 ++msgid "Last Created" ++msgstr "最終作成日時" ++ ++#: src/nautilus-batch-rename-dialog.h:122 ++msgid "Camera model" ++msgstr "カメラのモデル" ++ ++#: src/nautilus-batch-rename-dialog.h:129 ++msgid "Creation date" ++msgstr "作成日" ++ ++#: src/nautilus-batch-rename-dialog.h:136 ++msgid "Season number" ++msgstr "シーズン番号" ++ ++#: src/nautilus-batch-rename-dialog.h:143 ++msgid "Episode number" ++msgstr "エピソード番号" ++ ++#: src/nautilus-batch-rename-dialog.h:150 ++msgid "Track number" ++msgstr "トラック番号" ++ ++#: src/nautilus-batch-rename-dialog.h:157 ++msgid "Artist name" ++msgstr "アーチスト名" ++ ++#: src/nautilus-batch-rename-dialog.h:164 ++#: src/nautilus-image-properties-page.c:382 ++#: src/nautilus-image-properties-page.c:384 ++#: src/resources/ui/nautilus-batch-rename-dialog.ui:459 ++msgid "Title" ++msgstr "タイトル" ++ ++#: src/nautilus-batch-rename-dialog.h:171 ++msgid "Album name" ++msgstr "アルバム名" ++ ++#: src/nautilus-batch-rename-dialog.h:178 ++msgid "Original file name" ++msgstr "元のファイル名" ++ ++#: src/nautilus-batch-rename-dialog.h:189 ++msgid "1, 2, 3" ++msgstr "1, 2, 3" ++ ++#: src/nautilus-batch-rename-dialog.h:196 ++msgid "01, 02, 03" ++msgstr "01, 02, 03" ++ ++#: src/nautilus-batch-rename-dialog.h:203 ++msgid "001, 002, 003" ++msgstr "001, 002, 003" ++ ++#: src/nautilus-bookmark.c:112 src/nautilus-file-utilities.c:323 ++#: src/nautilus-pathbar.c:434 ++msgid "Other Locations" ++msgstr "他の場所" ++ ++#: src/nautilus-canvas-container.c:2783 + msgid "The selection rectangle" + msgstr "選択範囲" + +-#: ../libnautilus-private/nautilus-column-chooser.c:416 ++#: src/nautilus-canvas-view-container.c:366 ++#: src/resources/ui/nautilus-preferences-window.ui:46 ++msgid "Icon View" ++msgstr "アイコン表示" ++ ++#: src/nautilus-column-chooser.c:436 + msgid "Reset to De_fault" + msgstr "デフォルトに戻す(_F)" + +-#: ../libnautilus-private/nautilus-column-chooser.c:418 ++#: src/nautilus-column-chooser.c:438 + msgid "Replace the current List Columns settings with the default settings" + msgstr "一覧に表示する項目の設定をデフォルト設定に戻します" + +-#: ../libnautilus-private/nautilus-column-utilities.c:57 +-#: ../src/nautilus-list-view.c:1716 +-#: ../src/resources/ui/nautilus-rename-file-popover.ui.h:1 ++#: src/nautilus-column-utilities.c:56 src/nautilus-list-view.c:1947 ++#: src/resources/ui/nautilus-rename-file-popover.ui:14 + msgid "Name" + msgstr "名前" + +-#: ../libnautilus-private/nautilus-column-utilities.c:58 ++#: src/nautilus-column-utilities.c:57 + msgid "The name and icon of the file." + msgstr "ファイルの名前とアイコン" + +-#: ../libnautilus-private/nautilus-column-utilities.c:64 ++#: src/nautilus-column-utilities.c:63 + msgid "Size" + msgstr "サイズ" + +-#: ../libnautilus-private/nautilus-column-utilities.c:65 ++#: src/nautilus-column-utilities.c:64 + msgid "The size of the file." + msgstr "ファイルのサイズ" + +-#: ../libnautilus-private/nautilus-column-utilities.c:71 ++#: src/nautilus-column-utilities.c:70 + msgid "Type" + msgstr "種類" + +-#: ../libnautilus-private/nautilus-column-utilities.c:72 ++#: src/nautilus-column-utilities.c:71 + msgid "The type of the file." + msgstr "ファイルの種類" + +-#: ../libnautilus-private/nautilus-column-utilities.c:78 ++#: src/nautilus-column-utilities.c:77 + msgid "Modified" + msgstr "更新日" + +-#: ../libnautilus-private/nautilus-column-utilities.c:79 +-#: ../libnautilus-private/nautilus-column-utilities.c:137 ++#: src/nautilus-column-utilities.c:78 src/nautilus-column-utilities.c:136 + msgid "The date the file was modified." + msgstr "ファイルが変更された日付" + +-#: ../libnautilus-private/nautilus-column-utilities.c:87 ++#: src/nautilus-column-utilities.c:86 + msgid "Accessed" + msgstr "アクセス日時" + +-#: ../libnautilus-private/nautilus-column-utilities.c:88 ++#: src/nautilus-column-utilities.c:87 + msgid "The date the file was accessed." + msgstr "ファイルにアクセスした日付" + +-#: ../libnautilus-private/nautilus-column-utilities.c:97 ++#: src/nautilus-column-utilities.c:96 + msgid "Owner" + msgstr "所有者" + +-#: ../libnautilus-private/nautilus-column-utilities.c:98 ++#: src/nautilus-column-utilities.c:97 + msgid "The owner of the file." + msgstr "ファイルの所有者" + +-#: ../libnautilus-private/nautilus-column-utilities.c:105 ++#: src/nautilus-column-utilities.c:104 + msgid "Group" + msgstr "グループ" + +-#: ../libnautilus-private/nautilus-column-utilities.c:106 ++#: src/nautilus-column-utilities.c:105 + msgid "The group of the file." + msgstr "ファイルが所属するグループ" + +-#: ../libnautilus-private/nautilus-column-utilities.c:113 +-#: ../src/nautilus-properties-window.c:4258 ++#: src/nautilus-column-utilities.c:112 src/nautilus-properties-window.c:4689 + msgid "Permissions" + msgstr "アクセス権" + +-#: ../libnautilus-private/nautilus-column-utilities.c:114 ++#: src/nautilus-column-utilities.c:113 + msgid "The permissions of the file." + msgstr "ファイルのアクセス権" + +-#: ../libnautilus-private/nautilus-column-utilities.c:121 ++#: src/nautilus-column-utilities.c:120 + msgid "MIME Type" + msgstr "MIME 型" + +-#: ../libnautilus-private/nautilus-column-utilities.c:122 ++#: src/nautilus-column-utilities.c:121 + msgid "The MIME type of the file." + msgstr "ファイルの MIME 型" + +-#: ../libnautilus-private/nautilus-column-utilities.c:129 +-#: ../src/nautilus-image-properties-page.c:415 ++#: src/nautilus-column-utilities.c:128 src/nautilus-image-properties-page.c:452 + msgid "Location" + msgstr "場所" + +-#: ../libnautilus-private/nautilus-column-utilities.c:130 ++#: src/nautilus-column-utilities.c:129 + msgid "The location of the file." + msgstr "ファイルの場所" + +-#: ../libnautilus-private/nautilus-column-utilities.c:136 ++#: src/nautilus-column-utilities.c:135 + msgid "Modified - Time" + msgstr "更新日時" + +-#: ../libnautilus-private/nautilus-column-utilities.c:179 ++#: src/nautilus-column-utilities.c:180 + msgid "Trashed On" + msgstr "移動日時" + +-#: ../libnautilus-private/nautilus-column-utilities.c:180 ++#: src/nautilus-column-utilities.c:181 + msgid "Date when file was moved to the Trash" + msgstr "ファイルをゴミ箱に移動した日時" + +-#: ../libnautilus-private/nautilus-column-utilities.c:187 ++#: src/nautilus-column-utilities.c:188 + msgid "Original Location" + msgstr "元の場所" + +-#: ../libnautilus-private/nautilus-column-utilities.c:188 ++#: src/nautilus-column-utilities.c:189 + msgid "Original location of file before moved to the Trash" + msgstr "ファイルがゴミ箱に移動される前にあった場所" + +-#: ../libnautilus-private/nautilus-column-utilities.c:205 ++#: src/nautilus-column-utilities.c:207 + msgid "Relevance" + msgstr "関連度" + +-#: ../libnautilus-private/nautilus-column-utilities.c:206 ++#: src/nautilus-column-utilities.c:208 + msgid "Relevance rank for search" + msgstr "検索の関連度順" + +-#: ../libnautilus-private/nautilus-desktop-directory-file.c:433 +-#: ../libnautilus-private/nautilus-desktop-icon-file.c:149 +-msgid "on the desktop" +-msgstr "デスクトップ上" ++#: src/nautilus-desktop-item-properties.c:442 ++#: src/nautilus-desktop-item-properties.c:454 ++#: src/nautilus-image-properties-page.c:400 ++msgid "Comment" ++msgstr "コメント" ++ ++#: src/nautilus-desktop-item-properties.c:445 ++msgid "URL" ++msgstr "URL" ++ ++#: src/nautilus-desktop-item-properties.c:448 ++#: src/nautilus-desktop-item-properties.c:460 ++#: src/nautilus-image-properties-page.c:391 ++#: src/nautilus-image-properties-page.c:453 ++msgid "Description" ++msgstr "説明" ++ ++#: src/nautilus-desktop-item-properties.c:457 ++msgid "Command" ++msgstr "コマンド" + + #. Translators: this is of the format "hostname (uri-scheme)" +-#: ../libnautilus-private/nautilus-directory.c:517 ++#: src/nautilus-directory.c:568 + #, c-format + msgid "%s (%s)" + msgstr "%s (%s)" + +-#: ../libnautilus-private/nautilus-dnd.c:747 ++#: src/nautilus-dnd.c:862 + msgid "_Move Here" + msgstr "ここへ移動(_M)" + +-#: ../libnautilus-private/nautilus-dnd.c:752 ++#: src/nautilus-dnd.c:867 + msgid "_Copy Here" + msgstr "ここへコピー(_C)" + +-#: ../libnautilus-private/nautilus-dnd.c:757 ++#: src/nautilus-dnd.c:872 + msgid "_Link Here" + msgstr "ここへリンクを作る(_L)" + +-#: ../libnautilus-private/nautilus-dnd.c:764 +-#: ../src/resources/ui/nautilus-create-folder-dialog.ui.h:1 ++#: src/nautilus-dnd.c:879 src/resources/ui/nautilus-create-folder-dialog.ui:63 + msgid "Cancel" + msgstr "キャンセル" + +-#: ../libnautilus-private/nautilus-file.c:1235 +-#: ../libnautilus-private/nautilus-vfs-file.c:369 +-msgid "This file cannot be mounted" +-msgstr "このファイルはマウントできません" ++#: src/nautilus-error-reporting.c:72 ++#, c-format ++msgid "" ++"You do not have the permissions necessary to view the contents of “%s”." ++msgstr "“%s”の内容を表示するために必要な権限がありません。" + +-#: ../libnautilus-private/nautilus-file.c:1280 +-msgid "This file cannot be unmounted" +-msgstr "このファイルはアンマウントできません" ++#: src/nautilus-error-reporting.c:79 ++#, c-format ++msgid "“%s” could not be found. Perhaps it has recently been deleted." ++msgstr "“%s”が見つかりませんでした。最近削除されたようです。" + +-#: ../libnautilus-private/nautilus-file.c:1314 +-msgid "This file cannot be ejected" +-msgstr "このファイルは取り出せません" ++#: src/nautilus-error-reporting.c:85 ++#, c-format ++msgid "Sorry, could not display all the contents of “%s”: %s" ++msgstr "“%s”のすべての内容を表示できませんでした: %s" + +-#: ../libnautilus-private/nautilus-file.c:1347 +-#: ../libnautilus-private/nautilus-vfs-file.c:547 +-msgid "This file cannot be started" +-msgstr "このファイルは起動できません" ++#: src/nautilus-error-reporting.c:94 ++msgid "This location could not be displayed." ++msgstr "この場所は表示できませんでした。" + +-#: ../libnautilus-private/nautilus-file.c:1399 +-#: ../libnautilus-private/nautilus-file.c:1430 +-msgid "This file cannot be stopped" +-msgstr "このファイルは停止できません" ++#: src/nautilus-error-reporting.c:122 ++#, c-format ++msgid "You do not have the permissions necessary to change the group of “%s”." ++msgstr "“%s”のグループを変更するために必要な権限がありません。" + +-#: ../libnautilus-private/nautilus-file.c:1846 ++#. fall through ++#: src/nautilus-error-reporting.c:140 + #, c-format +-msgid "Slashes are not allowed in filenames" +-msgstr "ファイル名にスラッシュは使えません" ++msgid "Sorry, could not change the group of “%s”: %s" ++msgstr "“%s”のグループを変更できませんでした: %s" + +-#: ../libnautilus-private/nautilus-file.c:1864 ++#: src/nautilus-error-reporting.c:145 ++msgid "The group could not be changed." ++msgstr "グループを変更できませんでした。" ++ ++#: src/nautilus-error-reporting.c:166 + #, c-format +-msgid "File not found" +-msgstr "ファイルが見つかりません" ++msgid "Sorry, could not change the owner of “%s”: %s" ++msgstr "“%s”の所有者を変更できませんでした: %s" ++ ++#: src/nautilus-error-reporting.c:168 ++msgid "The owner could not be changed." ++msgstr "所有者を変更できませんでした。" + +-#: ../libnautilus-private/nautilus-file.c:1892 ++#: src/nautilus-error-reporting.c:189 + #, c-format +-msgid "Toplevel files cannot be renamed" +-msgstr "トップレベルのファイル名を変更できません" ++msgid "Sorry, could not change the permissions of “%s”: %s" ++msgstr "“%s”のアクセス権を変更できませんでした: %s" ++ ++#: src/nautilus-error-reporting.c:191 ++msgid "The permissions could not be changed." ++msgstr "アクセス権を変更できませんでした。" + +-#: ../libnautilus-private/nautilus-file.c:1915 ++#: src/nautilus-error-reporting.c:230 + #, c-format +-msgid "Unable to rename desktop icon" +-msgstr "デスクトップのアイコン名を変更できません" ++msgid "" ++"The name “%s” is already used in this location. Please use a different name." ++msgstr "名前“%s”は既にこの場所で使われています。別の名前を使ってください。" ++ ++#: src/nautilus-error-reporting.c:238 ++#, c-format ++msgid "" ++"There is no “%s” in this location. Perhaps it was just moved or deleted?" ++msgstr "この場所に“%s”はありません。おそらく移動したか削除したのではないでしょうか?" ++ ++#: src/nautilus-error-reporting.c:246 ++#, c-format ++msgid "You do not have the permissions necessary to rename “%s”." ++msgstr "“%s”の名前を変更するために必要な権限がありません。" ++ ++#: src/nautilus-error-reporting.c:255 ++#, c-format ++msgid "" ++"The name “%s” is not valid because it contains the character “/”. Please use " ++"a different name." ++msgstr "名前“%s”の中に文字“/”があるのは適切ではありません。別の名前を使ってください。" ++ ++#: src/nautilus-error-reporting.c:261 ++#, c-format ++msgid "The name “%s” is not valid. Please use a different name." ++msgstr "名前“%s”は正しくありません。別の名前を使ってください。" ++ ++#: src/nautilus-error-reporting.c:270 ++#, c-format ++msgid "The name “%s” is too long. Please use a different name." ++msgstr "名前“%s”が長すぎます。別の名前を使ってください。" ++ ++#. fall through ++#: src/nautilus-error-reporting.c:289 ++#, c-format ++msgid "Sorry, could not rename “%s” to “%s”: %s" ++msgstr "“%s”から“%s”へ名前を変更できませんでした: %s" ++ ++#: src/nautilus-error-reporting.c:297 ++msgid "The item could not be renamed." ++msgstr "アイテムの名前を変更できませんでした。" + +-#: ../libnautilus-private/nautilus-file.c:1944 ++#: src/nautilus-error-reporting.c:405 + #, c-format ++msgid "Renaming “%s” to “%s”." ++msgstr "“%s”から“%s”に変更中。" ++ ++#: src/nautilus-file.c:1325 src/nautilus-vfs-file.c:411 ++msgid "This file cannot be mounted" ++msgstr "このファイルはマウントできません" ++ ++#: src/nautilus-file.c:1379 ++msgid "This file cannot be unmounted" ++msgstr "このファイルはアンマウントできません" ++ ++#: src/nautilus-file.c:1422 ++msgid "This file cannot be ejected" ++msgstr "このファイルは取り出せません" ++ ++#: src/nautilus-file.c:1463 src/nautilus-vfs-file.c:600 ++msgid "This file cannot be started" ++msgstr "このファイルは起動できません" ++ ++#: src/nautilus-file.c:1522 src/nautilus-file.c:1562 ++msgid "This file cannot be stopped" ++msgstr "このファイルは停止できません" ++ ++#: src/nautilus-file.c:2071 ++msgid "Slashes are not allowed in filenames" ++msgstr "ファイル名にスラッシュは使えません" ++ ++#: src/nautilus-file.c:2115 ++msgid "Toplevel files cannot be renamed" ++msgstr "トップレベルのファイル名を変更できません" ++ ++#: src/nautilus-file.c:2150 + msgid "Probably the content of the file is an invalid desktop file format" + msgstr "おそらくファイルの内容が不正な desktop ファイルフォーマットです" + ++#: src/nautilus-file.c:2202 ++msgid "File not found" ++msgstr "ファイルが見つかりません" ++ + #. Translators: Time in 24h format +-#: ../libnautilus-private/nautilus-file.c:4769 ++#: src/nautilus-file.c:5642 + msgid "%H:%M" + msgstr "%H:%M" + + #. Translators: Time in 12h format +-#: ../libnautilus-private/nautilus-file.c:4772 ++#: src/nautilus-file.c:5647 + msgid "%l:%M %p" + msgstr "%p%I:%M" + +-#: ../libnautilus-private/nautilus-file.c:4779 ++#: src/nautilus-file.c:5656 + #, no-c-format + msgid "Yesterday" + msgstr "昨日" + + #. Translators: this is the word Yesterday followed by + #. * a time in 24h format. i.e. "Yesterday 23:04" +-#: ../libnautilus-private/nautilus-file.c:4785 ++#: src/nautilus-file.c:5665 + #, no-c-format + msgid "Yesterday %H:%M" + msgstr "昨日 %H:%M" + + #. Translators: this is the word Yesterday followed by + #. * a time in 12h format. i.e. "Yesterday 9:04 PM" +-#: ../libnautilus-private/nautilus-file.c:4790 ++#: src/nautilus-file.c:5672 + #, no-c-format + msgid "Yesterday %l:%M %p" + msgstr "昨日 %p%I:%M" + +-#: ../libnautilus-private/nautilus-file.c:4798 ++#: src/nautilus-file.c:5682 + #, no-c-format + msgid "%a" + msgstr "%A" + + #. Translators: this is the name of the week day followed by + #. * a time in 24h format. i.e. "Monday 23:04" +-#: ../libnautilus-private/nautilus-file.c:4804 ++#: src/nautilus-file.c:5691 + #, no-c-format + msgid "%a %H:%M" + msgstr "%A %H:%M" + + #. Translators: this is the week day name followed by + #. * a time in 12h format. i.e. "Monday 9:04 PM" +-#: ../libnautilus-private/nautilus-file.c:4809 ++#: src/nautilus-file.c:5698 + #, no-c-format + msgid "%a %l:%M %p" + msgstr "%A %p%I:%M" + + #. Translators: this is the day of the month followed + #. * by the abbreviated month name i.e. "3 Feb" +-#: ../libnautilus-private/nautilus-file.c:4817 ++#: src/nautilus-file.c:5709 + #, no-c-format + msgid "%-e %b" + msgstr "%-m月%-e日" +@@ -771,7 +1315,7 @@ msgstr "%-m月%-e日" + #. Translators: this is the day of the month followed + #. * by the abbreviated month name followed by a time in + #. * 24h format i.e. "3 Feb 23:04" +-#: ../libnautilus-private/nautilus-file.c:4824 ++#: src/nautilus-file.c:5719 + #, no-c-format + msgid "%-e %b %H:%M" + msgstr "%-m月%-e日 %H:%M" +@@ -779,14 +1323,14 @@ msgstr "%-m月%-e日 %H:%M" + #. Translators: this is the day of the month followed + #. * by the abbreviated month name followed by a time in + #. * 12h format i.e. "3 Feb 9:04" +-#: ../libnautilus-private/nautilus-file.c:4830 ++#: src/nautilus-file.c:5727 + #, no-c-format + msgid "%-e %b %l:%M %p" + msgstr "%-m月%-e日 %p%I:%M" + + #. Translators: this is the day of the month followed by the abbreviated + #. * month name followed by the year i.e. "3 Feb 2015" +-#: ../libnautilus-private/nautilus-file.c:4838 ++#: src/nautilus-file.c:5738 + #, no-c-format + msgid "%-e %b %Y" + msgstr "%Y年%-m月%-e日" +@@ -794,7 +1338,7 @@ msgstr "%Y年%-m月%-e日" + #. Translators: this is the day number followed + #. * by the abbreviated month name followed by the year followed + #. * by a time in 24h format i.e. "3 Feb 2015 23:04" +-#: ../libnautilus-private/nautilus-file.c:4845 ++#: src/nautilus-file.c:5748 + #, no-c-format + msgid "%-e %b %Y %H:%M" + msgstr "%Y年%-m月%-e日 %H:%M" +@@ -802,385 +1346,273 @@ msgstr "%Y年%-m月%-e日 %H:%M" + #. Translators: this is the day number followed + #. * by the abbreviated month name followed by the year followed + #. * by a time in 12h format i.e. "3 Feb 2015 9:04 PM" +-#: ../libnautilus-private/nautilus-file.c:4851 ++#: src/nautilus-file.c:5756 + #, no-c-format + msgid "%-e %b %Y %l:%M %p" + msgstr "%Y年%-m月%-e日 %p%I:%M" + +-#: ../libnautilus-private/nautilus-file.c:4860 ++#: src/nautilus-file.c:5768 + #, no-c-format + msgid "%c" + msgstr "%c" + +-#: ../libnautilus-private/nautilus-file.c:5259 +-#, c-format ++#: src/nautilus-file.c:6203 + msgid "Not allowed to set permissions" + msgstr "アクセス権は指定できません" + +-#: ../libnautilus-private/nautilus-file.c:5554 +-#, c-format ++#: src/nautilus-file.c:6526 + msgid "Not allowed to set owner" + msgstr "所有者は指定できません" + +-#: ../libnautilus-private/nautilus-file.c:5572 ++#: src/nautilus-file.c:6545 + #, c-format + msgid "Specified owner '%s' doesn't exist" + msgstr "指定した '%s' という所有者は存在しません" + +-#: ../libnautilus-private/nautilus-file.c:5836 +-#, c-format ++#: src/nautilus-file.c:6830 + msgid "Not allowed to set group" + msgstr "グループは指定できません" + +-#: ../libnautilus-private/nautilus-file.c:5854 ++#: src/nautilus-file.c:6849 + #, c-format + msgid "Specified group '%s' doesn't exist" + msgstr "指定した '%s' というグループは存在しません" + + #. Translators: "Me" is used to indicate the file is owned by me (the current user) +-#: ../libnautilus-private/nautilus-file.c:5989 ++#: src/nautilus-file.c:6991 + msgid "Me" + msgstr "自分" + +-#: ../libnautilus-private/nautilus-file.c:6013 ++#: src/nautilus-file.c:7023 + #, c-format + msgid "%'u item" + msgid_plural "%'u items" + msgstr[0] "%'u個のアイテム" + +-#: ../libnautilus-private/nautilus-file.c:6014 ++#: src/nautilus-file.c:7024 + #, c-format + msgid "%'u folder" + msgid_plural "%'u folders" + msgstr[0] "%'u個のフォルダー" + +-#: ../libnautilus-private/nautilus-file.c:6015 ++#: src/nautilus-file.c:7025 + #, c-format + msgid "%'u file" + msgid_plural "%'u files" + msgstr[0] "%'u個のファイル" + + #. This means no contents at all were readable +-#: ../libnautilus-private/nautilus-file.c:6416 +-#: ../libnautilus-private/nautilus-file.c:6432 ++#: src/nautilus-file.c:7485 src/nautilus-file.c:7505 + msgid "? items" + msgstr "?個のアイテム" + + #. This means no contents at all were readable +-#: ../libnautilus-private/nautilus-file.c:6422 ++#: src/nautilus-file.c:7493 + msgid "? bytes" + msgstr "?バイト" + +-#: ../libnautilus-private/nautilus-file.c:6439 +-#: ../libnautilus-private/nautilus-file.c:6520 ++#: src/nautilus-file.c:7513 src/nautilus-file.c:7604 + msgid "Unknown" + msgstr "不明" + + #. Fallback, use for both unknown attributes and attributes + #. * for which we have no more appropriate default. +-#. +-#: ../libnautilus-private/nautilus-file.c:6453 +-#: ../src/nautilus-properties-window.c:1186 ++#. ++#: src/nautilus-file.c:7529 src/nautilus-properties-window.c:1313 + msgid "unknown" + msgstr "不明" + +-#: ../libnautilus-private/nautilus-file.c:6484 +-#: ../libnautilus-private/nautilus-file.c:6492 +-#: ../libnautilus-private/nautilus-file.c:6543 ++#: src/nautilus-file.c:7564 src/nautilus-file.c:7572 src/nautilus-file.c:7630 + msgid "Program" + msgstr "プログラム" + +-#: ../libnautilus-private/nautilus-file.c:6485 ++#: src/nautilus-file.c:7565 + msgid "Audio" + msgstr "オーディオ" + +-#: ../libnautilus-private/nautilus-file.c:6486 ++#: src/nautilus-file.c:7566 + msgid "Font" + msgstr "フォント" + +-#: ../libnautilus-private/nautilus-file.c:6487 +-#: ../src/nautilus-image-properties-page.c:769 ++#: src/nautilus-file.c:7567 src/nautilus-image-properties-page.c:832 + msgid "Image" + msgstr "画像" + +-#: ../libnautilus-private/nautilus-file.c:6488 ++#: src/nautilus-file.c:7568 + msgid "Archive" + msgstr "アーカイブ" + +-#: ../libnautilus-private/nautilus-file.c:6489 ++#: src/nautilus-file.c:7569 + msgid "Markup" + msgstr "マークアップ" + +-#: ../libnautilus-private/nautilus-file.c:6490 +-#: ../libnautilus-private/nautilus-file.c:6491 ++#: src/nautilus-file.c:7570 src/nautilus-file.c:7571 + msgid "Text" + msgstr "テキスト" + +-#: ../libnautilus-private/nautilus-file.c:6493 +-#: ../src/nautilus-mime-actions.c:216 ++#: src/nautilus-file.c:7573 src/nautilus-mime-actions.c:201 + msgid "Video" + msgstr "動画" + +-#: ../libnautilus-private/nautilus-file.c:6494 ++#: src/nautilus-file.c:7574 + msgid "Contacts" + msgstr "連絡先" + +-#: ../libnautilus-private/nautilus-file.c:6495 ++#: src/nautilus-file.c:7575 + msgid "Calendar" + msgstr "カレンダー" + +-#: ../libnautilus-private/nautilus-file.c:6496 ++#: src/nautilus-file.c:7576 + msgid "Document" + msgstr "ドキュメント" + +-#: ../libnautilus-private/nautilus-file.c:6497 +-#: ../src/nautilus-mime-actions.c:186 ++#: src/nautilus-file.c:7577 src/nautilus-mime-actions.c:177 + msgid "Presentation" + msgstr "プレゼンテーション" + +-#: ../libnautilus-private/nautilus-file.c:6498 +-#: ../src/nautilus-mime-actions.c:195 ++#: src/nautilus-file.c:7578 src/nautilus-mime-actions.c:184 + msgid "Spreadsheet" + msgstr "表計算" + +-#: ../libnautilus-private/nautilus-file.c:6545 ++#: src/nautilus-file.c:7632 + msgid "Binary" + msgstr "バイナリ" + +-#: ../libnautilus-private/nautilus-file.c:6549 ++#: src/nautilus-file.c:7637 + msgid "Folder" + msgstr "フォルダー" + +-#: ../libnautilus-private/nautilus-file.c:6580 ++#: src/nautilus-file.c:7676 + msgid "Link" + msgstr "リンク" + + #. Note to localizers: convert file type string for file + #. * (e.g. "folder", "plain text") to file type for symbolic link + #. * to that kind of file (e.g. "link to folder"). +-#. ++#. + #. appended to new link file +-#: ../libnautilus-private/nautilus-file.c:6586 +-#: ../libnautilus-private/nautilus-file-operations.c:381 +-#: ../src/nautilus-files-view-dnd.c:125 ++#: src/nautilus-file.c:7682 src/nautilus-file-operations.c:416 ++#: src/nautilus-files-view-dnd.c:131 + #, c-format + msgid "Link to %s" + msgstr "%sへのリンク" + +-#: ../libnautilus-private/nautilus-file.c:6602 +-#: ../libnautilus-private/nautilus-file.c:6616 ++#: src/nautilus-file.c:7700 src/nautilus-file.c:7716 + msgid "Link (broken)" + msgstr "リンク切れ" + +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:141 +-#, c-format +-msgid "Merge folder “%s”?" +-msgstr "フォルダー“%s”をマージしますか?" +- +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:145 +-msgid "Merging will ask for confirmation before replacing any files in the folder that conflict with the files being copied." +-msgstr "マージする際に、コピーするファイルと衝突するフォルダー中のファイルを置き換える時に確認します。" +- +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:150 +-#, c-format +-msgid "An older folder with the same name already exists in “%s”." +-msgstr "同じ名前の古いフォルダーが既に“%s”にあります。" +- +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:154 +-#, c-format +-msgid "A newer folder with the same name already exists in “%s”." +-msgstr "同じ名前の新しいフォルダーが既に“%s”にあります。" +- +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:158 +-#, c-format +-msgid "Another folder with the same name already exists in “%s”." +-msgstr "同じ名前の他のフォルダーが“%s”にあります。" +- +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:163 +-msgid "Replacing it will remove all files in the folder." +-msgstr "置き換えるとフォルダー中のすべてのファイルが削除されます。" +- +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:165 +-#, c-format +-msgid "Replace folder “%s”?" +-msgstr "フォルダー“%s”を置き換えますか?" +- +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:167 +-#, c-format +-msgid "A folder with the same name already exists in “%s”." +-msgstr "同じ名前のフォルダーが既に“%s”にあります。" +- +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:172 +-#, c-format +-msgid "Replace file “%s”?" +-msgstr "ファイル“%s”を置き換えますか?" +- +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:174 +-msgid "Replacing it will overwrite its content." +-msgstr "置き換えると内容が上書きされます。" +- +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:178 +-#, c-format +-msgid "An older file with the same name already exists in “%s”." +-msgstr "同じ名前の古いファイルが既に“%s”にあります。" +- +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:182 +-#, c-format +-msgid "A newer file with the same name already exists in “%s”." +-msgstr "同じ名前の新しいファイルが既に“%s”にあります。" +- +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:186 +-#, c-format +-msgid "Another file with the same name already exists in “%s”." +-msgstr "同じ名前の他のファイルが既に“%s”にあります。" +- +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:255 +-msgid "Original folder" +-msgstr "元のフォルダー" +- +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:256 +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:293 +-msgid "Items:" +-msgstr "アイテム数:" +- +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:259 +-msgid "Original file" +-msgstr "元のファイル" +- +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:260 +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:297 +-#: ../src/nautilus-properties-window.c:2997 +-msgid "Size:" +-msgstr "サイズ:" +- +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:264 +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:301 +-#: ../src/nautilus-properties-window.c:2979 +-msgid "Type:" +-msgstr "種類:" +- +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:267 +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:304 +-msgid "Last modified:" +-msgstr "最終更新日時:" +- +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:292 +-msgid "Merge with" +-msgstr "マージするフォルダー" +- +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:292 +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:296 +-msgid "Replace with" +-msgstr "置き換え後のファイル" +- +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:326 +-msgid "Merge" +-msgstr "マージする" +- + #. Setup the expander for the rename action +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:522 ++#: src/nautilus-file-conflict-dialog.c:285 + msgid "_Select a new name for the destination" + msgstr "別の名前を付けて保存する(_S)" + +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:536 +-#: ../libnautilus-private/nautilus-mime-application-chooser.c:317 ++#: src/nautilus-file-conflict-dialog.c:299 ++#: src/nautilus-mime-application-chooser.c:336 + msgid "Reset" + msgstr "リセット" + + #. Setup the checkbox to apply the action to all files +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:548 ++#: src/nautilus-file-conflict-dialog.c:310 + msgid "Apply this action to all files and folders" + msgstr "この操作をすべてのファイルとフォルダーに適用する" + +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:560 +-#: ../libnautilus-private/nautilus-file-operations.c:183 ++#: src/nautilus-file-conflict-dialog.c:321 src/nautilus-file-operations.c:191 + msgid "_Skip" + msgstr "スキップする(_S)" + +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:565 ++#: src/nautilus-file-conflict-dialog.c:325 + msgid "Re_name" + msgstr "名前の変更(_N)" + +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:571 ++#: src/nautilus-file-conflict-dialog.c:330 + msgid "Replace" + msgstr "置き換える" + +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:654 +-msgid "Merge Folder" +-msgstr "フォルダーのマージ" ++#: src/nautilus-file-name-widget-controller.c:106 ++#: src/nautilus-rename-file-popover-controller.c:85 ++msgid "File names cannot contain “/”." ++msgstr "'/' はファイル名に使用できません。" + +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:654 +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:660 +-msgid "File and Folder conflict" +-msgstr "ファイルとフォルダーの衝突" ++#: src/nautilus-file-name-widget-controller.c:110 ++#: src/nautilus-rename-file-popover-controller.c:96 ++msgid "A file cannot be called “.”." ++msgstr "'.' という名前のファイルは作成できません。" + +-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:660 +-msgid "File conflict" +-msgstr "ファイルの衝突" ++#: src/nautilus-file-name-widget-controller.c:114 ++#: src/nautilus-rename-file-popover-controller.c:107 ++msgid "A file cannot be called “..”." ++msgstr "'..' という名前をファイルに付けられません。" ++ ++#: src/nautilus-file-name-widget-controller.c:136 ++msgid "A folder with that name already exists." ++msgstr "同じ名前のフォルダーが既に存在します。" ++ ++#: src/nautilus-file-name-widget-controller.c:141 ++msgid "A file with that name already exists." ++msgstr "同じ名前のファイルが既に存在します。" + +-#: ../libnautilus-private/nautilus-file-operations.c:184 ++#: src/nautilus-file-operations.c:192 + msgid "S_kip All" + msgstr "すべてスキップする(_K)" + +-#: ../libnautilus-private/nautilus-file-operations.c:185 ++#: src/nautilus-file-operations.c:193 + msgid "_Retry" + msgstr "再試行する(_R)" + +-#: ../libnautilus-private/nautilus-file-operations.c:186 ++#: src/nautilus-file-operations.c:194 + msgid "_Delete" + msgstr "削除(_D)" + +-#: ../libnautilus-private/nautilus-file-operations.c:187 ++#: src/nautilus-file-operations.c:195 + msgid "Delete _All" + msgstr "すべて削除する(_A)" + +-#: ../libnautilus-private/nautilus-file-operations.c:188 ++#: src/nautilus-file-operations.c:196 + msgid "_Replace" + msgstr "置き換える(_R)" + +-#: ../libnautilus-private/nautilus-file-operations.c:189 ++#: src/nautilus-file-operations.c:197 + msgid "Replace _All" + msgstr "すべて置き換える(_A)" + +-#: ../libnautilus-private/nautilus-file-operations.c:190 ++#: src/nautilus-file-operations.c:198 + msgid "_Merge" + msgstr "マージする(_M)" + +-#: ../libnautilus-private/nautilus-file-operations.c:191 ++#: src/nautilus-file-operations.c:199 + msgid "Merge _All" + msgstr "すべてマージする(_A)" + +-#: ../libnautilus-private/nautilus-file-operations.c:192 ++#: src/nautilus-file-operations.c:200 + msgid "Copy _Anyway" + msgstr "とにかくコピーする(_A)" + +-#: ../libnautilus-private/nautilus-file-operations.c:282 ++#: src/nautilus-file-operations.c:296 + #, c-format + msgid "%'d second" + msgid_plural "%'d seconds" + msgstr[0] "%'d 秒" + +-#: ../libnautilus-private/nautilus-file-operations.c:287 +-#: ../libnautilus-private/nautilus-file-operations.c:298 ++#: src/nautilus-file-operations.c:302 src/nautilus-file-operations.c:314 + #, c-format + msgid "%'d minute" + msgid_plural "%'d minutes" + msgstr[0] "%'d 分" + +-#: ../libnautilus-private/nautilus-file-operations.c:297 ++#: src/nautilus-file-operations.c:313 + #, c-format + msgid "%'d hour" + msgid_plural "%'d hours" + msgstr[0] "%'d 時間" + +-#: ../libnautilus-private/nautilus-file-operations.c:305 ++#: src/nautilus-file-operations.c:321 + #, c-format + msgid "approximately %'d hour" + msgid_plural "approximately %'d hours" + msgstr[0] "およそ %'d 時間" + + #. appended to new link file +-#: ../libnautilus-private/nautilus-file-operations.c:385 ++#: src/nautilus-file-operations.c:423 + #, c-format + msgid "Another link to %s" + msgstr "%sへの別のリンク" +@@ -1188,26 +1620,26 @@ msgstr "%sへの別のリンク" + #. Localizers: Feel free to leave out the "st" suffix + #. * if there's no way to do that nicely for a + #. * particular language. +-#. +-#: ../libnautilus-private/nautilus-file-operations.c:401 ++#. ++#: src/nautilus-file-operations.c:444 + #, c-format + msgid "%'dst link to %s" + msgstr "%'d 番目の%sへのリンク" + + #. appended to new link file +-#: ../libnautilus-private/nautilus-file-operations.c:405 ++#: src/nautilus-file-operations.c:451 + #, c-format + msgid "%'dnd link to %s" + msgstr "%'d 番目の%sへのリンク" + + #. appended to new link file +-#: ../libnautilus-private/nautilus-file-operations.c:409 ++#: src/nautilus-file-operations.c:458 + #, c-format + msgid "%'drd link to %s" + msgstr "%'d 番目の%sへのリンク" + + #. appended to new link file +-#: ../libnautilus-private/nautilus-file-operations.c:413 ++#: src/nautilus-file-operations.c:465 + #, c-format + msgid "%'dth link to %s" + msgstr "%'d 番目の%sへのリンク" +@@ -1215,14 +1647,14 @@ msgstr "%'d 番目の%sへのリンク" + #. Localizers: + #. * Feel free to leave out the st, nd, rd and th suffix or + #. * make some or all of them match. +-#. ++#. + #. localizers: tag used to detect the first copy of a file +-#: ../libnautilus-private/nautilus-file-operations.c:452 ++#: src/nautilus-file-operations.c:517 + msgid " (copy)" + msgstr " (コピー)" + + #. localizers: tag used to detect the second copy of a file +-#: ../libnautilus-private/nautilus-file-operations.c:454 ++#: src/nautilus-file-operations.c:519 + msgid " (another copy)" + msgstr " (別のコピー)" + +@@ -1230,36 +1662,34 @@ msgstr " (別のコピー)" + #. localizers: tag used to detect the x12th copy of a file + #. localizers: tag used to detect the x13th copy of a file + #. localizers: tag used to detect the xxth copy of a file +-#: ../libnautilus-private/nautilus-file-operations.c:457 +-#: ../libnautilus-private/nautilus-file-operations.c:459 +-#: ../libnautilus-private/nautilus-file-operations.c:461 +-#: ../libnautilus-private/nautilus-file-operations.c:471 ++#: src/nautilus-file-operations.c:522 src/nautilus-file-operations.c:524 ++#: src/nautilus-file-operations.c:526 src/nautilus-file-operations.c:536 + msgid "th copy)" + msgstr "番目のコピー)" + + #. localizers: tag used to detect the x1st copy of a file +-#: ../libnautilus-private/nautilus-file-operations.c:464 ++#: src/nautilus-file-operations.c:529 + msgid "st copy)" + msgstr "番目のコピー)" + + #. localizers: tag used to detect the x2nd copy of a file +-#: ../libnautilus-private/nautilus-file-operations.c:466 ++#: src/nautilus-file-operations.c:531 + msgid "nd copy)" + msgstr "番目のコピー)" + + #. localizers: tag used to detect the x3rd copy of a file +-#: ../libnautilus-private/nautilus-file-operations.c:468 ++#: src/nautilus-file-operations.c:533 + msgid "rd copy)" + msgstr "番目のコピー)" + + #. localizers: appended to first file copy +-#: ../libnautilus-private/nautilus-file-operations.c:485 ++#: src/nautilus-file-operations.c:550 + #, c-format + msgid "%s (copy)%s" + msgstr "%s (コピー)%s" + + #. localizers: appended to second file copy +-#: ../libnautilus-private/nautilus-file-operations.c:487 ++#: src/nautilus-file-operations.c:552 + #, c-format + msgid "%s (another copy)%s" + msgstr "%s (別のコピー)%s" +@@ -1268,10 +1698,8 @@ msgstr "%s (別のコピー)%s" + #. localizers: appended to x12th file copy + #. localizers: appended to x13th file copy + #. localizers: appended to xxth file copy +-#: ../libnautilus-private/nautilus-file-operations.c:490 +-#: ../libnautilus-private/nautilus-file-operations.c:492 +-#: ../libnautilus-private/nautilus-file-operations.c:494 +-#: ../libnautilus-private/nautilus-file-operations.c:508 ++#: src/nautilus-file-operations.c:555 src/nautilus-file-operations.c:557 ++#: src/nautilus-file-operations.c:559 src/nautilus-file-operations.c:573 + #, c-format + msgid "%s (%'dth copy)%s" + msgstr "%s (%'d 番目のコピー)%s" +@@ -1279,90 +1707,93 @@ msgstr "%s (%'d 番目のコピー)%s" + #. localizers: if in your language there's no difference between 1st, 2nd, 3rd and nth + #. * plurals, you can leave the st, nd, rd suffixes out and just make all the translated + #. * strings look like "%s (copy %'d)%s". +-#. ++#. + #. localizers: appended to x1st file copy +-#: ../libnautilus-private/nautilus-file-operations.c:502 ++#: src/nautilus-file-operations.c:567 + #, c-format + msgid "%s (%'dst copy)%s" + msgstr "%s (%'d 番目のコピー)%s" + + #. localizers: appended to x2nd file copy +-#: ../libnautilus-private/nautilus-file-operations.c:504 ++#: src/nautilus-file-operations.c:569 + #, c-format + msgid "%s (%'dnd copy)%s" + msgstr "%s (%'d 番目のコピー)%s" + + #. localizers: appended to x3rd file copy +-#: ../libnautilus-private/nautilus-file-operations.c:506 ++#: src/nautilus-file-operations.c:571 + #, c-format + msgid "%s (%'drd copy)%s" + msgstr "%s (%'d番目のコピー)%s" + + #. localizers: opening parentheses to match the "th copy)" string +-#: ../libnautilus-private/nautilus-file-operations.c:607 ++#: src/nautilus-file-operations.c:685 + msgid " (" + msgstr " (" + + #. localizers: opening parentheses of the "th copy)" string +-#: ../libnautilus-private/nautilus-file-operations.c:615 ++#: src/nautilus-file-operations.c:695 + #, c-format + msgid " (%'d" + msgstr " (%'d" + +-#: ../libnautilus-private/nautilus-file-operations.c:1388 ++#: src/nautilus-file-operations.c:1571 + msgid "Are you sure you want to permanently delete “%B” from the trash?" + msgstr "ゴミ箱から“%B”を完全に削除してもよろしいですか?" + +-#: ../libnautilus-private/nautilus-file-operations.c:1391 ++#: src/nautilus-file-operations.c:1576 + #, c-format +-msgid "Are you sure you want to permanently delete the %'d selected item from the trash?" +-msgid_plural "Are you sure you want to permanently delete the %'d selected items from the trash?" ++msgid "" ++"Are you sure you want to permanently delete the %'d selected item from the " ++"trash?" ++msgid_plural "" ++"Are you sure you want to permanently delete the %'d selected items from the " ++"trash?" + msgstr[0] "選択した %'d 個のアイテムをゴミ箱から完全に削除してもよろしいですか?" + +-#: ../libnautilus-private/nautilus-file-operations.c:1401 +-#: ../libnautilus-private/nautilus-file-operations.c:1467 ++#: src/nautilus-file-operations.c:1586 src/nautilus-file-operations.c:1658 + msgid "If you delete an item, it will be permanently lost." + msgstr "ここでアイテムを削除すると元に戻すことはできません。" + +-#: ../libnautilus-private/nautilus-file-operations.c:1421 ++#: src/nautilus-file-operations.c:1607 + msgid "Empty all items from Trash?" + msgstr "ゴミ箱からすべてのアイテムを削除してもよろしいですか?" + +-#: ../libnautilus-private/nautilus-file-operations.c:1425 ++#: src/nautilus-file-operations.c:1611 + msgid "All items in the Trash will be permanently deleted." + msgstr "ここでアイテムを削除すると元に戻すことはできません。" + +-#: ../libnautilus-private/nautilus-file-operations.c:1428 +-#: ../libnautilus-private/nautilus-file-operations.c:2504 +-#: ../src/nautilus-window.c:1301 ++#: src/nautilus-file-operations.c:1614 src/nautilus-file-operations.c:2795 ++#: src/nautilus-window.c:1387 + msgid "Empty _Trash" + msgstr "ゴミ箱を空にする(_T)" + +-#: ../libnautilus-private/nautilus-file-operations.c:1455 ++#: src/nautilus-file-operations.c:1644 + msgid "Are you sure you want to permanently delete “%B”?" + msgstr "“%B”を完全に削除してもよろしいですか?" + +-#: ../libnautilus-private/nautilus-file-operations.c:1458 ++#: src/nautilus-file-operations.c:1649 + #, c-format + msgid "Are you sure you want to permanently delete the %'d selected item?" +-msgid_plural "Are you sure you want to permanently delete the %'d selected items?" ++msgid_plural "" ++"Are you sure you want to permanently delete the %'d selected items?" + msgstr[0] "選択した %'d 個のアイテムを完全に削除してもよろしいですか?" + +-#: ../libnautilus-private/nautilus-file-operations.c:1511 ++#: src/nautilus-file-operations.c:1706 + msgid "Deleted “%B”" + msgstr "“%B”を削除しました" + +-#: ../libnautilus-private/nautilus-file-operations.c:1513 ++#: src/nautilus-file-operations.c:1710 + msgid "Deleting “%B”" + msgstr "“%B”を削除しています" + +-#: ../libnautilus-private/nautilus-file-operations.c:1521 ++#: src/nautilus-file-operations.c:1720 + #, c-format + msgid "Deleted %'d file" + msgid_plural "Deleted %'d files" + msgstr[0] "%'d 個のファイルを削除しました" + +-#: ../libnautilus-private/nautilus-file-operations.c:1525 ++#: src/nautilus-file-operations.c:1726 + #, c-format + msgid "Deleting %'d file" + msgid_plural "Deleting %'d files" +@@ -1370,15 +1801,11 @@ msgstr[0] "%'d 個のファイルを削除しています" + + #. To translators: %'d is the number of files completed for the operation, + #. * so it will be something like 2/14. +-#: ../libnautilus-private/nautilus-file-operations.c:1547 +-#: ../libnautilus-private/nautilus-file-operations.c:1553 +-#: ../libnautilus-private/nautilus-file-operations.c:1585 +-#: ../libnautilus-private/nautilus-file-operations.c:1943 +-#: ../libnautilus-private/nautilus-file-operations.c:1949 +-#: ../libnautilus-private/nautilus-file-operations.c:1981 +-#: ../libnautilus-private/nautilus-file-operations.c:3329 +-#: ../libnautilus-private/nautilus-file-operations.c:3335 +-#: ../libnautilus-private/nautilus-file-operations.c:3376 ++#: src/nautilus-file-operations.c:1753 src/nautilus-file-operations.c:1761 ++#: src/nautilus-file-operations.c:1799 src/nautilus-file-operations.c:2128 ++#: src/nautilus-file-operations.c:2136 src/nautilus-file-operations.c:2173 ++#: src/nautilus-file-operations.c:3809 src/nautilus-file-operations.c:3817 ++#: src/nautilus-file-operations.c:3869 + #, c-format + msgid "%'d / %'d" + msgstr "%'d / %'d" +@@ -1387,272 +1814,261 @@ msgstr "%'d / %'d" + #. * So the whole thing will be something like "1 / 5 -- 2 hours left (4 files/sec)" + #. * + #. * The singular/plural form will be used depending on the remaining time (i.e. the %T argument). +-#. +-#: ../libnautilus-private/nautilus-file-operations.c:1568 +-#: ../libnautilus-private/nautilus-file-operations.c:1964 ++#. ++#: src/nautilus-file-operations.c:1779 src/nautilus-file-operations.c:2154 + msgid "%'d / %'d — %T left" + msgid_plural "%'d / %'d — %T left" + msgstr[0] "%'d / %'d — 残り %T" + +-#: ../libnautilus-private/nautilus-file-operations.c:1571 +-#: ../libnautilus-private/nautilus-file-operations.c:1967 ++#: src/nautilus-file-operations.c:1783 src/nautilus-file-operations.c:2157 + #, c-format + msgid "(%d file/sec)" + msgid_plural "(%d files/sec)" + msgstr[0] "(%d ファイル/秒)" + +-#: ../libnautilus-private/nautilus-file-operations.c:1653 +-#: ../libnautilus-private/nautilus-file-operations.c:1687 +-#: ../libnautilus-private/nautilus-file-operations.c:1726 +-#: ../libnautilus-private/nautilus-file-operations.c:1802 +-#: ../libnautilus-private/nautilus-file-operations.c:2765 ++#: src/nautilus-file-operations.c:1939 src/nautilus-file-operations.c:3090 + msgid "Error while deleting." + msgstr "削除中にエラーが発生しました。" + +-#: ../libnautilus-private/nautilus-file-operations.c:1657 +-msgid "Files in the folder “%B” cannot be deleted because you do not have permissions to see them." +-msgstr "“%B”というフォルダーの中にあるファイルを参照する権限がないため、これらのファイルを削除できません。" +- +-#: ../libnautilus-private/nautilus-file-operations.c:1660 +-#: ../libnautilus-private/nautilus-file-operations.c:2824 +-#: ../libnautilus-private/nautilus-file-operations.c:4016 +-msgid "There was an error getting information about the files in the folder “%B”." +-msgstr "“%B”というフォルダーの中にあるファイルの情報を取得する際にエラーが発生しました。" +- +-#: ../libnautilus-private/nautilus-file-operations.c:1669 +-#: ../libnautilus-private/nautilus-file-operations.c:4025 +-msgid "_Skip files" +-msgstr "ファイルのスキップ(_S)" +- +-#: ../libnautilus-private/nautilus-file-operations.c:1690 +-msgid "The folder “%B” cannot be deleted because you do not have permissions to read it." +-msgstr "“%B”というフォルダーを参照する権限がないため、このフォルダーを削除できません。" ++#: src/nautilus-file-operations.c:1948 ++msgid "There was an error deleting the folder “%B”." ++msgstr "フォルダー '%B' の削除中にエラーが発生しました。" + +-#: ../libnautilus-private/nautilus-file-operations.c:1693 +-#: ../libnautilus-private/nautilus-file-operations.c:2863 +-#: ../libnautilus-private/nautilus-file-operations.c:4061 +-msgid "There was an error reading the folder “%B”." +-msgstr "“%B”というフォルダーを読み込んでいる際にエラーが発生しました。" ++#: src/nautilus-file-operations.c:1950 ++msgid "You do not have sufficient permissions to delete the folder “%B”." ++msgstr "フォルダー '%B' の削除に必要なパーミッションがありません。" + +-#: ../libnautilus-private/nautilus-file-operations.c:1727 +-msgid "Could not remove the folder %B." +-msgstr "%B というフォルダーを削除できませんでした。" ++#: src/nautilus-file-operations.c:1956 ++msgid "There was an error deleting the file “%B”." ++msgstr "ファイル '%B' の削除中にエラーが発生しました。" + +-#: ../libnautilus-private/nautilus-file-operations.c:1803 +-msgid "There was an error deleting %B." +-msgstr "%B を削除する際にエラーが発生しました。" ++#: src/nautilus-file-operations.c:1958 ++msgid "You do not have sufficient permissions to delete the file “%B”." ++msgstr "ファイル '%B' の削除に必要なパーミッションがありません。" + +-#: ../libnautilus-private/nautilus-file-operations.c:1906 ++#: src/nautilus-file-operations.c:2080 + msgid "Trashing “%B”" + msgstr "“%B”をゴミ箱へ移動しています" + +-#: ../libnautilus-private/nautilus-file-operations.c:1908 ++#: src/nautilus-file-operations.c:2084 + msgid "Trashed “%B”" + msgstr "“%B”をゴミ箱へ移動しました" + +-#: ../libnautilus-private/nautilus-file-operations.c:1916 ++#: src/nautilus-file-operations.c:2094 + #, c-format + msgid "Trashing %'d file" + msgid_plural "Trashing %'d files" + msgstr[0] "%'d 個のファイルをゴミ箱へ移動しています" + +-#: ../libnautilus-private/nautilus-file-operations.c:1920 ++#: src/nautilus-file-operations.c:2100 + #, c-format + msgid "Trashed %'d file" + msgid_plural "Trashed %'d files" + msgstr[0] "%'d 個のファイルをゴミ箱へ移動しました" + + #. Translators: %B is a file name +-#: ../libnautilus-private/nautilus-file-operations.c:2043 ++#: src/nautilus-file-operations.c:2242 + msgid "“%B” can't be put in the trash. Do you want to delete it immediately?" + msgstr "“%B”をゴミ箱へ移動できません。今すぐ削除しますか?" + +-#: ../libnautilus-private/nautilus-file-operations.c:2049 ++#: src/nautilus-file-operations.c:2251 + msgid "This remote location does not support sending items to the trash." + msgstr "リモートの場所はアイテムをゴミ箱に送り込む機能をサポートしてません。" + +-#: ../libnautilus-private/nautilus-file-operations.c:2252 ++#: src/nautilus-file-operations.c:2515 + msgid "Trashing Files" + msgstr "ファイルをゴミ箱へ移動中" + +-#: ../libnautilus-private/nautilus-file-operations.c:2254 ++#: src/nautilus-file-operations.c:2519 + msgid "Deleting Files" + msgstr "ファイルを削除中" + +-#: ../libnautilus-private/nautilus-file-operations.c:2335 ++#: src/nautilus-file-operations.c:2609 + msgid "Unable to eject %V" + msgstr "%V を取り出せません" + +-#: ../libnautilus-private/nautilus-file-operations.c:2337 ++#: src/nautilus-file-operations.c:2613 + msgid "Unable to unmount %V" + msgstr "%V をアンマウントできません" + +-#: ../libnautilus-private/nautilus-file-operations.c:2494 ++#: src/nautilus-file-operations.c:2785 + msgid "Do you want to empty the trash before you unmount?" + msgstr "アンマウントする前にゴミ箱を空にしますか?" + +-#: ../libnautilus-private/nautilus-file-operations.c:2496 +-msgid "In order to regain the free space on this volume the trash must be emptied. All trashed items on the volume will be permanently lost." ++#: src/nautilus-file-operations.c:2787 ++msgid "" ++"In order to regain the free space on this volume the trash must be emptied. " ++"All trashed items on the volume will be permanently lost." + msgstr "このデバイス上の空き領域を増やすにはゴミ箱を空にしなければなりません。空にすると、ゴミ箱の中にあるすべてのアイテムが完全に消去されます。" + +-#: ../libnautilus-private/nautilus-file-operations.c:2502 ++#: src/nautilus-file-operations.c:2793 + msgid "Do _not Empty Trash" + msgstr "ゴミ箱を空にしない(_N)" + + #. Translators: %s is a file name formatted for display +-#: ../libnautilus-private/nautilus-file-operations.c:2636 +-#: ../src/nautilus-files-view.c:5695 ++#: src/nautilus-file-operations.c:2937 src/nautilus-files-view.c:5818 + #, c-format + msgid "Unable to access “%s”" + msgstr "“%s”にアクセスできません" + +-#: ../libnautilus-private/nautilus-file-operations.c:2712 ++#: src/nautilus-file-operations.c:3018 + #, c-format + msgid "Preparing to copy %'d file (%S)" + msgid_plural "Preparing to copy %'d files (%S)" + msgstr[0] "%'d 個のファイル (%S) をコピーする準備中です" + +-#: ../libnautilus-private/nautilus-file-operations.c:2718 ++#: src/nautilus-file-operations.c:3027 + #, c-format + msgid "Preparing to move %'d file (%S)" + msgid_plural "Preparing to move %'d files (%S)" + msgstr[0] "%'d 個のファイル (%S) を移動する準備中です" + +-#: ../libnautilus-private/nautilus-file-operations.c:2724 ++#: src/nautilus-file-operations.c:3036 + #, c-format + msgid "Preparing to delete %'d file (%S)" + msgid_plural "Preparing to delete %'d files (%S)" + msgstr[0] "%'d 個のファイル (%S) を削除する準備中です" + +-#: ../libnautilus-private/nautilus-file-operations.c:2730 ++#: src/nautilus-file-operations.c:3045 + #, c-format + msgid "Preparing to trash %'d file" + msgid_plural "Preparing to trash %'d files" + msgstr[0] "%'d 個のファイルをゴミ箱に移動する準備中です" + +-#: ../libnautilus-private/nautilus-file-operations.c:2761 +-#: ../libnautilus-private/nautilus-file-operations.c:3876 +-#: ../libnautilus-private/nautilus-file-operations.c:4008 +-#: ../libnautilus-private/nautilus-file-operations.c:4053 ++#: src/nautilus-file-operations.c:3080 src/nautilus-file-operations.c:4437 ++#: src/nautilus-file-operations.c:4603 src/nautilus-file-operations.c:4664 + msgid "Error while copying." + msgstr "コピー中にエラーが発生しました。" + +-#: ../libnautilus-private/nautilus-file-operations.c:2763 +-#: ../libnautilus-private/nautilus-file-operations.c:4006 +-#: ../libnautilus-private/nautilus-file-operations.c:4051 ++#: src/nautilus-file-operations.c:3085 src/nautilus-file-operations.c:4599 ++#: src/nautilus-file-operations.c:4660 + msgid "Error while moving." + msgstr "移動中にエラーが発生しました。" + +-#: ../libnautilus-private/nautilus-file-operations.c:2767 ++#: src/nautilus-file-operations.c:3095 + msgid "Error while moving files to trash." + msgstr "ファイルをゴミ箱へ移動する際にエラーが発生しました。" + +-#: ../libnautilus-private/nautilus-file-operations.c:2821 +-msgid "Files in the folder “%B” cannot be handled because you do not have permissions to see them." ++#: src/nautilus-file-operations.c:3168 ++msgid "" ++"Files in the folder “%B” cannot be handled because you do not have " ++"permissions to see them." + msgstr "“%B”というフォルダーの中にあるファイルを参照する権限がないため、それらのファイルを操作できません。" + +-#: ../libnautilus-private/nautilus-file-operations.c:2860 +-msgid "The folder “%B” cannot be handled because you do not have permissions to read it." ++#: src/nautilus-file-operations.c:3173 src/nautilus-file-operations.c:4614 ++msgid "" ++"There was an error getting information about the files in the folder “%B”." ++msgstr "“%B”というフォルダーの中にあるファイルの情報を取得する際にエラーが発生しました。" ++ ++#: src/nautilus-file-operations.c:3222 ++msgid "" ++"The folder “%B” cannot be handled because you do not have permissions to " ++"read it." + msgstr "“%B”というフォルダーを参照する権限がないため、そのフォルダーを操作できません。" + +-#: ../libnautilus-private/nautilus-file-operations.c:2937 +-msgid "The file “%B” cannot be handled because you do not have permissions to read it." ++#: src/nautilus-file-operations.c:3227 src/nautilus-file-operations.c:4675 ++msgid "There was an error reading the folder “%B”." ++msgstr "“%B”というフォルダーを読み込んでいる際にエラーが発生しました。" ++ ++#: src/nautilus-file-operations.c:3328 ++msgid "" ++"The file “%B” cannot be handled because you do not have permissions to read " ++"it." + msgstr "“%B”というファイルを参照する権限がないため、そのファイルを操作できません。" + +-#: ../libnautilus-private/nautilus-file-operations.c:2940 ++#: src/nautilus-file-operations.c:3333 + msgid "There was an error getting information about “%B”." + msgstr "“%B”の情報を取得する際にエラーが発生しました。" + +-#: ../libnautilus-private/nautilus-file-operations.c:3042 +-#: ../libnautilus-private/nautilus-file-operations.c:3090 +-#: ../libnautilus-private/nautilus-file-operations.c:3129 +-#: ../libnautilus-private/nautilus-file-operations.c:3159 ++#: src/nautilus-file-operations.c:3455 src/nautilus-file-operations.c:3514 ++#: src/nautilus-file-operations.c:3557 src/nautilus-file-operations.c:3595 + msgid "Error while copying to “%B”." + msgstr "“%B”へコピー中にエラーが発生しました。" + +-#: ../libnautilus-private/nautilus-file-operations.c:3046 ++#: src/nautilus-file-operations.c:3460 + msgid "You do not have permissions to access the destination folder." + msgstr "転送先のフォルダーにアクセスする権限がありません。" + +-#: ../libnautilus-private/nautilus-file-operations.c:3048 ++#: src/nautilus-file-operations.c:3464 + msgid "There was an error getting information about the destination." + msgstr "転送先の情報を取得する際にエラーが発生しました。" + +-#: ../libnautilus-private/nautilus-file-operations.c:3091 ++#: src/nautilus-file-operations.c:3515 + msgid "The destination is not a folder." + msgstr "その場所はフォルダーではありません。" + +-#: ../libnautilus-private/nautilus-file-operations.c:3130 +-msgid "There is not enough space on the destination. Try to remove files to make space." ++#: src/nautilus-file-operations.c:3558 ++msgid "" ++"There is not enough space on the destination. Try to remove files to make " ++"space." + msgstr "転送先に十分な空き容量がありません (容量を増やすためにファイルを削除してみてください)。" + +-#: ../libnautilus-private/nautilus-file-operations.c:3132 ++#: src/nautilus-file-operations.c:3560 + #, c-format + msgid "%S more space is required to copy to the destination." + msgstr "転送先にコピーするには、%S 以上の空き容量が必要です。" + +-#: ../libnautilus-private/nautilus-file-operations.c:3160 ++#: src/nautilus-file-operations.c:3596 + msgid "The destination is read-only." + msgstr "コピー先は読み込み専用です。" + +-#: ../libnautilus-private/nautilus-file-operations.c:3225 ++#: src/nautilus-file-operations.c:3668 + msgid "Moving “%B” to “%B”" + msgstr "“%B”から“%B”へ移動しています" + +-#: ../libnautilus-private/nautilus-file-operations.c:3227 ++#: src/nautilus-file-operations.c:3672 + msgid "Moved “%B” to “%B”" + msgstr "“%B”から“%B”へ移動しました" + +-#: ../libnautilus-private/nautilus-file-operations.c:3231 ++#: src/nautilus-file-operations.c:3679 + msgid "Copying “%B” to “%B”" + msgstr "“%B”から“%B”へコピーしています" + +-#: ../libnautilus-private/nautilus-file-operations.c:3233 ++#: src/nautilus-file-operations.c:3683 + msgid "Copied “%B” to “%B”" + msgstr "“%B”から“%B”へコピーしました" + +-#: ../libnautilus-private/nautilus-file-operations.c:3244 ++#: src/nautilus-file-operations.c:3697 + msgid "Duplicating “%B”" + msgstr "“%B”を複製しています" + +-#: ../libnautilus-private/nautilus-file-operations.c:3246 ++#: src/nautilus-file-operations.c:3701 + msgid "Duplicated “%B”" + msgstr "“%B”を複製しました" + +-#: ../libnautilus-private/nautilus-file-operations.c:3256 ++#: src/nautilus-file-operations.c:3716 + msgid "Moving %'d file to “%B”" + msgid_plural "Moving %'d files to “%B”" + msgstr[0] "%'d 個のファイルを“%B”へ移動しています" + +-#: ../libnautilus-private/nautilus-file-operations.c:3260 ++#: src/nautilus-file-operations.c:3722 + msgid "Copying %'d file to “%B”" + msgid_plural "Copying %'d files to “%B”" + msgstr[0] "%'d 個のファイルを“%B”へコピーしています" + +-#: ../libnautilus-private/nautilus-file-operations.c:3270 ++#: src/nautilus-file-operations.c:3735 + msgid "Moved %'d file to “%B”" + msgid_plural "Moved %'d files to “%B”" + msgstr[0] "%'d 個のファイルを“%B”へ移動しました" + +-#: ../libnautilus-private/nautilus-file-operations.c:3274 ++#: src/nautilus-file-operations.c:3741 + msgid "Copied %'d file to “%B”" + msgid_plural "Copied %'d files to “%B”" + msgstr[0] "%'d 個のファイルを“%B”へコピーしました" + +-#: ../libnautilus-private/nautilus-file-operations.c:3288 ++#: src/nautilus-file-operations.c:3758 + msgid "Duplicating %'d file in “%B”" + msgid_plural "Duplicating %'d files in “%B”" + msgstr[0] "%'d 個のファイルを“%B”で複製しています" + +-#: ../libnautilus-private/nautilus-file-operations.c:3296 ++#: src/nautilus-file-operations.c:3768 + msgid "Duplicated %'d file in “%B”" + msgid_plural "Duplicated %'d files in “%B”" + msgstr[0] "%'d 個のファイルを“%B”で複製しました" + + #. To translators: %S will expand to a size like "2 bytes" or "3 MB", so something like "4 kb / 4 MB" + #. To translators: %S will expand to a size like "2 bytes" or "3 MB". +-#: ../libnautilus-private/nautilus-file-operations.c:3324 +-#: ../libnautilus-private/nautilus-file-operations.c:3356 ++#: src/nautilus-file-operations.c:3801 src/nautilus-file-operations.c:3844 + #, c-format + msgid "%S / %S" + msgstr "%S / %S" +@@ -1661,8 +2077,8 @@ msgstr "%S / %S" + #. * "2 minutes". So the whole thing will be something like "2 kb / 4 MB -- 2 hours left (4kb/sec)" + #. * + #. * The singular/plural form will be used depending on the remaining time (i.e. the %T argument). +-#. +-#: ../libnautilus-private/nautilus-file-operations.c:3348 ++#. ++#: src/nautilus-file-operations.c:3834 + msgid "%S / %S — %T left (%S/sec)" + msgid_plural "%S / %S — %T left (%S/sec)" + msgstr[0] "%S / %S — 残り %T (%S/秒)" +@@ -1671,1701 +2087,1498 @@ msgstr[0] "%S / %S — 残り %T (%S/秒)" + #. * So the whole thing will be something like "1 / 5 -- 2 hours left (4kb/sec)" + #. * + #. * The singular/plural form will be used depending on the remaining time (i.e. the %T argument). +-#. +-#: ../libnautilus-private/nautilus-file-operations.c:3367 ++#. ++#: src/nautilus-file-operations.c:3858 + msgid "%'d / %'d — %T left (%S/sec)" + msgid_plural "%'d / %'d — %T left (%S/sec)" + msgstr[0] "%'d / %'d — 残り %T (%S/秒)" + +-#: ../libnautilus-private/nautilus-file-operations.c:3880 +-msgid "The folder “%B” cannot be copied because you do not have permissions to create it in the destination." ++#: src/nautilus-file-operations.c:4442 ++msgid "" ++"The folder “%B” cannot be copied because you do not have permissions to " ++"create it in the destination." + msgstr "“%B”というフォルダーをコピー先に作成する権限がないため、そのフォルダーをコピーできません。" + +-#: ../libnautilus-private/nautilus-file-operations.c:3883 ++#: src/nautilus-file-operations.c:4447 + msgid "There was an error creating the folder “%B”." + msgstr "“%B”というフォルダーを作成する際にエラーが発生しました。" + +-#: ../libnautilus-private/nautilus-file-operations.c:4013 +-msgid "Files in the folder “%B” cannot be copied because you do not have permissions to see them." ++#: src/nautilus-file-operations.c:4609 ++msgid "" ++"Files in the folder “%B” cannot be copied because you do not have " ++"permissions to see them." + msgstr "“%B”というフォルダーの中にあるファイルを参照する権限がないため、それらのファイルをコピーできません。" + +-#: ../libnautilus-private/nautilus-file-operations.c:4058 +-msgid "The folder “%B” cannot be copied because you do not have permissions to read it." ++#: src/nautilus-file-operations.c:4623 ++msgid "_Skip files" ++msgstr "ファイルのスキップ(_S)" ++ ++#: src/nautilus-file-operations.c:4670 ++msgid "" ++"The folder “%B” cannot be copied because you do not have permissions to read " ++"it." + msgstr "“%B”というフォルダーを参照する権限がないため、そのフォルダーをコピーできません。" + +-#: ../libnautilus-private/nautilus-file-operations.c:4103 +-#: ../libnautilus-private/nautilus-file-operations.c:4832 +-#: ../libnautilus-private/nautilus-file-operations.c:5446 ++#: src/nautilus-file-operations.c:4728 src/nautilus-file-operations.c:5422 ++#: src/nautilus-file-operations.c:6125 + msgid "Error while moving “%B”." + msgstr "“%B”の移動中にエラーが発生しました。" + +-#: ../libnautilus-private/nautilus-file-operations.c:4104 ++#: src/nautilus-file-operations.c:4729 + msgid "Could not remove the source folder." + msgstr "転送元のフォルダーを削除できませんでした。" + +-#: ../libnautilus-private/nautilus-file-operations.c:4188 +-#: ../libnautilus-private/nautilus-file-operations.c:4229 +-#: ../libnautilus-private/nautilus-file-operations.c:4834 +-#: ../libnautilus-private/nautilus-file-operations.c:4905 ++#: src/nautilus-file-operations.c:4807 src/nautilus-file-operations.c:5426 ++#: src/nautilus-file-operations.c:5506 + msgid "Error while copying “%B”." + msgstr "“%B”のコピー中にエラーが発生しました。" + +-#: ../libnautilus-private/nautilus-file-operations.c:4189 ++#: src/nautilus-file-operations.c:4815 + #, c-format +-msgid "Could not remove files from the already existing folder %F." +-msgstr "既に存在している %F というフォルダーからファイルを削除できませんでした。" ++msgid "Could not remove the already existing folder %F." ++msgstr "既存のフォルダー %F を削除できませんでした。" + +-#: ../libnautilus-private/nautilus-file-operations.c:4230 ++#: src/nautilus-file-operations.c:4820 + #, c-format + msgid "Could not remove the already existing file %F." + msgstr "既に存在しているファイル %F を削除できませんでした。" + + #. the run_warning() frees all strings passed in automatically +-#: ../libnautilus-private/nautilus-file-operations.c:4577 +-#: ../libnautilus-private/nautilus-file-operations.c:5289 ++#: src/nautilus-file-operations.c:5091 src/nautilus-file-operations.c:5933 + msgid "You cannot move a folder into itself." + msgstr "フォルダーを自分自身の中に移動することはできません。" + +-#: ../libnautilus-private/nautilus-file-operations.c:4578 +-#: ../libnautilus-private/nautilus-file-operations.c:5290 ++#: src/nautilus-file-operations.c:5092 src/nautilus-file-operations.c:5934 + msgid "You cannot copy a folder into itself." + msgstr "フォルダーを自分自身の中にコピーすることはできません。" + +-#: ../libnautilus-private/nautilus-file-operations.c:4579 +-#: ../libnautilus-private/nautilus-file-operations.c:5291 ++#: src/nautilus-file-operations.c:5093 src/nautilus-file-operations.c:5935 + msgid "The destination folder is inside the source folder." + msgstr "転送先のフォルダーが転送元のフォルダーの中にあります。" + + #. the run_warning() frees all strings passed in automatically +-#: ../libnautilus-private/nautilus-file-operations.c:4609 ++#: src/nautilus-file-operations.c:5131 + msgid "You cannot move a file over itself." + msgstr "ファイルを自分自身に移動することはできません。" + +-#: ../libnautilus-private/nautilus-file-operations.c:4610 ++#: src/nautilus-file-operations.c:5132 + msgid "You cannot copy a file over itself." + msgstr "ファイルを自分自身にコピーすることはできません。" + +-#: ../libnautilus-private/nautilus-file-operations.c:4611 ++#: src/nautilus-file-operations.c:5133 + msgid "The source file would be overwritten by the destination." + msgstr "転送元のファイルが転送先で上書きされます。" + +-#: ../libnautilus-private/nautilus-file-operations.c:4836 ++#: src/nautilus-file-operations.c:5428 + #, c-format + msgid "Could not remove the already existing file with the same name in %F." + msgstr "%F の中にある同名のファイルを削除できませんでした。" + +-#: ../libnautilus-private/nautilus-file-operations.c:4906 ++#: src/nautilus-file-operations.c:5507 + #, c-format + msgid "There was an error copying the file into %F." + msgstr "ファイルを %F へコピーする際にエラーが発生しました。" + +-#: ../libnautilus-private/nautilus-file-operations.c:5135 +-#: ../libnautilus-private/nautilus-file-operations.c:5172 ++#: src/nautilus-file-operations.c:5767 src/nautilus-file-operations.c:5805 + msgid "Copying Files" + msgstr "ファイルをコピーしています" + +-#: ../libnautilus-private/nautilus-file-operations.c:5199 ++#: src/nautilus-file-operations.c:5835 + msgid "Preparing to move to “%B”" + msgstr "“%B”へ移動する準備中です" + +-#: ../libnautilus-private/nautilus-file-operations.c:5203 ++#: src/nautilus-file-operations.c:5839 + #, c-format + msgid "Preparing to move %'d file" + msgid_plural "Preparing to move %'d files" + msgstr[0] "%'d 個のファイルを移動する準備中..." + +-#: ../libnautilus-private/nautilus-file-operations.c:5447 ++#: src/nautilus-file-operations.c:6126 + #, c-format + msgid "There was an error moving the file into %F." + msgstr "%F の中にファイルを移動する際にエラーが発生しました。" + +-#: ../libnautilus-private/nautilus-file-operations.c:5707 ++#: src/nautilus-file-operations.c:6412 + msgid "Moving Files" + msgstr "ファイルを移動中" + +-#: ../libnautilus-private/nautilus-file-operations.c:5741 ++#: src/nautilus-file-operations.c:6452 + msgid "Creating links in “%B”" + msgstr "“%B”でリンクの作成中" + +-#: ../libnautilus-private/nautilus-file-operations.c:5745 ++#: src/nautilus-file-operations.c:6456 + #, c-format + msgid "Making link to %'d file" + msgid_plural "Making links to %'d files" + msgstr[0] "%'d 個のファイルへのリンクの作成中" + +-#: ../libnautilus-private/nautilus-file-operations.c:5880 ++#: src/nautilus-file-operations.c:6611 + msgid "Error while creating link to %B." + msgstr "%B へリンクの作成中にエラーが発生しました。" + +-#: ../libnautilus-private/nautilus-file-operations.c:5882 ++#: src/nautilus-file-operations.c:6614 + msgid "Symbolic links only supported for local files" + msgstr "シンボリックリンクはローカルのファイルのみサポートしています。" + +-#: ../libnautilus-private/nautilus-file-operations.c:5885 ++#: src/nautilus-file-operations.c:6619 + msgid "The target doesn't support symbolic links." + msgstr "リンクの作成先はシンボリックリンクをサポートしていません。" + +-#: ../libnautilus-private/nautilus-file-operations.c:5888 ++#: src/nautilus-file-operations.c:6624 + #, c-format + msgid "There was an error creating the symlink in %F." + msgstr "%F でシンボリックリンクを作成する際にエラーが発生しました。" + +-#: ../libnautilus-private/nautilus-file-operations.c:6214 ++#: src/nautilus-file-operations.c:6978 + msgid "Setting permissions" + msgstr "アクセス権の設定中" + + #. localizers: the initial name of a new folder +-#: ../libnautilus-private/nautilus-file-operations.c:6473 ++#: src/nautilus-file-operations.c:7265 + msgid "Untitled Folder" + msgstr "無題のフォルダー" + + #. localizers: the initial name of a new empty document +-#: ../libnautilus-private/nautilus-file-operations.c:6485 ++#: src/nautilus-file-operations.c:7281 + msgid "Untitled Document" + msgstr "無題のドキュメント" + +-#: ../libnautilus-private/nautilus-file-operations.c:6701 ++#: src/nautilus-file-operations.c:7544 + msgid "Error while creating directory %B." + msgstr "%B というフォルダーの作成中にエラーが発生しました。" + +-#: ../libnautilus-private/nautilus-file-operations.c:6703 ++#: src/nautilus-file-operations.c:7548 + msgid "Error while creating file %B." + msgstr "%B というファイルの作成中にエラーが発生しました。" + +-#: ../libnautilus-private/nautilus-file-operations.c:6705 ++#: src/nautilus-file-operations.c:7550 + #, c-format + msgid "There was an error creating the directory in %F." + msgstr "%F にフォルダーを作成する際にエラーが発生しました。" + +-#: ../libnautilus-private/nautilus-file-operations.c:6965 ++#: src/nautilus-file-operations.c:7837 + msgid "Emptying Trash" + msgstr "ゴミ箱を空にしている" + +-#: ../libnautilus-private/nautilus-file-operations.c:7013 +-#: ../libnautilus-private/nautilus-file-operations.c:7054 +-#: ../libnautilus-private/nautilus-file-operations.c:7089 +-#: ../libnautilus-private/nautilus-file-operations.c:7124 ++#: src/nautilus-file-operations.c:7888 src/nautilus-file-operations.c:7939 ++#: src/nautilus-file-operations.c:7982 src/nautilus-file-operations.c:8026 + msgid "Unable to mark launcher trusted (executable)" + msgstr "ランチャー (実行形式) の安全性を確認できません" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:133 +-#: ../src/nautilus-window.c:461 ../src/resources/ui/nautilus-window.ui.h:2 +-msgid "Undo" +-msgstr "元に戻す" +- +-#: ../libnautilus-private/nautilus-file-undo-operations.c:136 +-msgid "Undo last action" +-msgstr "最後のアクションを元に戻す" +- +-#: ../libnautilus-private/nautilus-file-undo-operations.c:140 +-#: ../src/nautilus-window.c:462 +-msgid "Redo" +-msgstr "やり直す" ++#: src/nautilus-files-view.c:383 ++msgid "Searching…" ++msgstr "検索中…" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:143 +-msgid "Redo last undone action" +-msgstr "最後に元に戻したアクションをやり直す" ++#: src/nautilus-files-view.c:383 src/nautilus-image-properties-page.c:766 ++#: src/nautilus-list-model.c:450 src/nautilus-window-slot.c:781 ++msgid "Loading…" ++msgstr "読み込み中…" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:365 +-#, c-format +-msgid "Move %d item back to '%s'" +-msgid_plural "Move %d items back to '%s'" +-msgstr[0] "%d 件のアイテムを '%s' へ移動し直します" ++#: src/nautilus-files-view.c:1028 src/nautilus-mime-actions.c:1027 ++#: src/nautilus-mime-actions.c:1882 ++msgid "Are you sure you want to open all files?" ++msgstr "すべてのファイルを開いてもよろしいですか?" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:368 ++#: src/nautilus-files-view.c:1031 + #, c-format +-msgid "Move %d item to '%s'" +-msgid_plural "Move %d items to '%s'" +-msgstr[0] "%d 件のアイテムを '%s' へ移動します" ++msgid "This will open %'d separate tab." ++msgid_plural "This will open %'d separate tabs." ++msgstr[0] "%'d 個のタブを別々に開きます。" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:372 ++#: src/nautilus-files-view.c:1036 + #, c-format +-msgid "_Undo Move %d item" +-msgid_plural "_Undo Move %d items" +-msgstr[0] "元に戻す: %d 件の移動(_U)" ++msgid "This will open %'d separate window." ++msgid_plural "This will open %'d separate windows." ++msgstr[0] "%'d 個のウィンドウを別々に開きます。" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:375 +-#, c-format +-msgid "_Redo Move %d item" +-msgid_plural "_Redo Move %d items" +-msgstr[0] "やり直す: %d 件の移動(_R)" ++#: src/nautilus-files-view.c:1040 src/nautilus-location-entry.c:282 ++#: src/nautilus-mime-actions.c:1039 src/nautilus-mime-actions.c:1225 ++#: src/nautilus-mime-actions.c:1886 ++msgid "_OK" ++msgstr "OK(_O)" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:379 +-#, c-format +-msgid "Move '%s' back to '%s'" +-msgstr "'%s' を '%s' へ移動し直します" ++#: src/nautilus-files-view.c:1531 ++msgid "Select Items Matching" ++msgstr "パターンを指定してアイテムを選択" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:380 +-#, c-format +-msgid "Move '%s' to '%s'" +-msgstr "'%s' を '%s' へ移動します" ++#: src/nautilus-files-view.c:1536 src/nautilus-files-view.c:5385 ++msgid "_Select" ++msgstr "選択(_S)" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:382 +-msgid "_Undo Move" +-msgstr "元に戻す: 移動(_U)" ++#: src/nautilus-files-view.c:1544 ++msgid "_Pattern:" ++msgstr "パターン(_P):" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:383 +-msgid "_Redo Move" +-msgstr "やり直す: 移動(_R)" ++#: src/nautilus-files-view.c:1550 ++msgid "Examples: " ++msgstr "例: " + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:386 +-msgid "_Undo Restore from Trash" +-msgstr "元に戻す: ゴミ箱から元に戻す(_U)" ++#: src/nautilus-files-view.c:2392 ++msgid "" ++"Nautilus 3.6 deprecated this directory and tried migrating this " ++"configuration to ~/.local/share/nautilus" ++msgstr "" ++"Nautilus 3.6 ではこのディレクトリの使用は非推奨となり、~/.local/share/nautilus への設定内容の移行を試みました。" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:387 ++#: src/nautilus-files-view.c:2871 src/nautilus-files-view.c:2918 ++#, c-format ++msgid "“%s” selected" ++msgstr "“%s”を選択しました" ++ ++#: src/nautilus-files-view.c:2875 ++#, c-format ++msgid "%'d folder selected" ++msgid_plural "%'d folders selected" ++msgstr[0] "%'d 個のフォルダーを選択しました" ++ ++#: src/nautilus-files-view.c:2889 ++#, c-format ++msgid "(containing %'d item)" ++msgid_plural "(containing %'d items)" ++msgstr[0] "(%'d 個のアイテムを含む)" ++ ++#. translators: this is preceded with a string of form 'N folders' (N more than 1) ++#: src/nautilus-files-view.c:2904 ++#, c-format ++msgid "(containing a total of %'d item)" ++msgid_plural "(containing a total of %'d items)" ++msgstr[0] "(合計で %'d 個のアイテムを含む)" ++ ++#: src/nautilus-files-view.c:2923 ++#, c-format ++msgid "%'d item selected" ++msgid_plural "%'d items selected" ++msgstr[0] "%'d 個のアイテムを選択しました" ++ ++#. Folders selected also, use "other" terminology ++#: src/nautilus-files-view.c:2932 ++#, c-format ++msgid "%'d other item selected" ++msgid_plural "%'d other items selected" ++msgstr[0] "他に %'d 個のアイテムを選択しました" ++ ++#. This is marked for translation in case a localiser ++#. * needs to use something other than parentheses. The ++#. * the message in parentheses is the size of the selected items. ++#. ++#: src/nautilus-files-view.c:2947 ++#, c-format ++msgid "(%s)" ++msgstr "(%s)" ++ ++#. This is marked for translation in case a localizer ++#. * needs to change ", " to something else. The comma ++#. * is between the message about the number of folders ++#. * and the number of items in those folders and the ++#. * message about the number of other items and the ++#. * total size of those items. ++#. ++#: src/nautilus-files-view.c:2980 ++#, c-format ++msgid "%s %s, %s %s" ++msgstr "%s %s, %s %s" ++ ++#: src/nautilus-files-view.c:5372 ++msgid "Select Move Destination" ++msgstr "移動する宛先の選択" ++ ++#: src/nautilus-files-view.c:5376 ++msgid "Select Copy Destination" ++msgstr "コピーする宛先の選択" ++ ++#. Translators: %s is a file name formatted for display ++#: src/nautilus-files-view.c:5846 ++#, c-format ++msgid "Unable to remove “%s”" ++msgstr "%s を取り外せません" ++ ++#. Translators: %s is a file name formatted for display ++#: src/nautilus-files-view.c:5874 ++#, c-format ++msgid "Unable to eject “%s”" ++msgstr "“%s”を取り出せません" ++ ++#: src/nautilus-files-view.c:5897 ++msgid "Unable to stop drive" ++msgstr "ドライブを停止できません" ++ ++#. Translators: %s is a file name formatted for display ++#: src/nautilus-files-view.c:6009 ++#, c-format ++msgid "Unable to start “%s”" ++msgstr "“%s”を起動できません" ++ ++#: src/nautilus-files-view.c:6844 ++#, c-format ++msgid "New Folder with Selection (%'d Item)" ++msgid_plural "New Folder with Selection (%'d Items)" ++msgstr[0] "選択アイテム含む新しいフォルダーを作成 (%'d 件)" ++ ++#: src/nautilus-files-view.c:6900 ++#, c-format ++msgid "Open With %s" ++msgstr "%sで開く" ++ ++#: src/nautilus-files-view.c:6912 ++msgid "Run" ++msgstr "実行" ++ ++#: src/nautilus-files-view.c:6916 ++msgid "Open" ++msgstr "開く" ++ ++#: src/nautilus-files-view.c:6973 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:125 ++msgid "_Start" ++msgstr "開始(_S)" ++ ++#: src/nautilus-files-view.c:6979 src/gtk/nautilusgtkplacesview.c:1696 ++msgid "_Connect" ++msgstr "接続する(_C)" ++ ++#: src/nautilus-files-view.c:6985 ++msgid "_Start Multi-disk Drive" ++msgstr "マルチディスク・ドライブを起動(_S)" ++ ++#: src/nautilus-files-view.c:6991 ++msgid "U_nlock Drive" ++msgstr "ドライブのロック解除(_N)" ++ ++#: src/nautilus-files-view.c:7011 ++msgid "Stop Drive" ++msgstr "ドライブを停止する" ++ ++#: src/nautilus-files-view.c:7017 ++msgid "_Safely Remove Drive" ++msgstr "ドライブを安全に取り出す(_S)" ++ ++#: src/nautilus-files-view.c:7023 src/gtk/nautilusgtkplacesview.c:1686 ++msgid "_Disconnect" ++msgstr "切断(_D)" ++ ++#: src/nautilus-files-view.c:7029 ++msgid "_Stop Multi-disk Drive" ++msgstr "マルチディスク・ドライブの停止(_S)" ++ ++#: src/nautilus-files-view.c:7035 ++msgid "_Lock Drive" ++msgstr "ドライブのロック(_L)" ++ ++#: src/nautilus-files-view.c:8601 ++msgid "Content View" ++msgstr "内容表示" ++ ++#: src/nautilus-files-view.c:8602 ++msgid "View of the current folder" ++msgstr "このフォルダーを表示します" ++ ++#: src/nautilus-files-view-dnd.c:179 src/nautilus-files-view-dnd.c:221 ++#: src/nautilus-files-view-dnd.c:327 ++msgid "Drag and drop is not supported." ++msgstr "ドラッグ&ドロップはサポートしていません。" ++ ++#: src/nautilus-files-view-dnd.c:180 ++msgid "Drag and drop is only supported on local file systems." ++msgstr "ドラッグ&ドロップはローカルのファイルシステムでのみサポートしています。" ++ ++#: src/nautilus-files-view-dnd.c:222 src/nautilus-files-view-dnd.c:328 ++msgid "An invalid drag type was used." ++msgstr "使用したドラッグの種類は無効です。" ++ ++#. Translator: This is the filename used for when you dnd text to a directory ++#: src/nautilus-files-view-dnd.c:437 ++msgid "Dropped Text.txt" ++msgstr "ドロップしたテキスト.txt" ++ ++#. Translator: This is the filename used for when you dnd raw ++#. * data to a directory, if the source didn't supply a name. ++#. ++#: src/nautilus-files-view-dnd.c:543 ++msgid "dropped data" ++msgstr "ドロップしたデータ" ++ ++#: src/nautilus-file-undo-operations.c:166 ++#: src/resources/ui/nautilus-window.ui:89 ++msgid "Undo" ++msgstr "元に戻す" ++ ++#: src/nautilus-file-undo-operations.c:170 ++msgid "Undo last action" ++msgstr "最後のアクションを元に戻す" ++ ++#: src/nautilus-file-undo-operations.c:175 ++msgid "Redo" ++msgstr "やり直す" ++ ++#: src/nautilus-file-undo-operations.c:179 ++msgid "Redo last undone action" ++msgstr "最後に元に戻したアクションをやり直す" ++ ++#: src/nautilus-file-undo-operations.c:412 ++#, c-format ++msgid "Move %d item back to '%s'" ++msgid_plural "Move %d items back to '%s'" ++msgstr[0] "%d 件のアイテムを '%s' へ移動し直します" ++ ++#: src/nautilus-file-undo-operations.c:415 ++#, c-format ++msgid "Move %d item to '%s'" ++msgid_plural "Move %d items to '%s'" ++msgstr[0] "%d 件のアイテムを '%s' へ移動します" ++ ++#: src/nautilus-file-undo-operations.c:419 ++#, c-format ++msgid "_Undo Move %d item" ++msgid_plural "_Undo Move %d items" ++msgstr[0] "元に戻す: %d 件の移動(_U)" ++ ++#: src/nautilus-file-undo-operations.c:422 ++#, c-format ++msgid "_Redo Move %d item" ++msgid_plural "_Redo Move %d items" ++msgstr[0] "やり直す: %d 件の移動(_R)" ++ ++#: src/nautilus-file-undo-operations.c:428 ++#, c-format ++msgid "Move '%s' back to '%s'" ++msgstr "'%s' を '%s' へ移動し直します" ++ ++#: src/nautilus-file-undo-operations.c:429 ++#, c-format ++msgid "Move '%s' to '%s'" ++msgstr "'%s' を '%s' へ移動します" ++ ++#: src/nautilus-file-undo-operations.c:431 ++msgid "_Undo Move" ++msgstr "元に戻す: 移動(_U)" ++ ++#: src/nautilus-file-undo-operations.c:432 ++msgid "_Redo Move" ++msgstr "やり直す: 移動(_R)" ++ ++#: src/nautilus-file-undo-operations.c:437 ++msgid "_Undo Restore from Trash" ++msgstr "元に戻す: ゴミ箱から元に戻す(_U)" ++ ++#: src/nautilus-file-undo-operations.c:438 + msgid "_Redo Restore from Trash" + msgstr "やり直す: ゴミ箱から元に戻す(_R)" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:390 ++#: src/nautilus-file-undo-operations.c:442 + #, c-format + msgid "Move %d item back to trash" + msgid_plural "Move %d items back to trash" + msgstr[0] "%d 件のアイテムをゴミ箱へ移動し直します" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:393 +-#: ../libnautilus-private/nautilus-file-undo-operations.c:989 ++#: src/nautilus-file-undo-operations.c:445 ++#: src/nautilus-file-undo-operations.c:1331 + #, c-format + msgid "Restore %d item from trash" + msgid_plural "Restore %d items from trash" + msgstr[0] "%d 件のアイテムをゴミ箱から元に戻します" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:397 ++#: src/nautilus-file-undo-operations.c:451 + #, c-format + msgid "Move '%s' back to trash" + msgstr "'%s' をゴミ箱へ移動し直します" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:398 ++#: src/nautilus-file-undo-operations.c:452 + #, c-format + msgid "Restore '%s' from trash" + msgstr "'%s' をゴミ箱から元に戻します" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:402 ++#: src/nautilus-file-undo-operations.c:459 + #, c-format + msgid "Delete %d copied item" + msgid_plural "Delete %d copied items" + msgstr[0] "コピーされた %d 件のアイテムを削除します" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:405 ++#: src/nautilus-file-undo-operations.c:462 + #, c-format + msgid "Copy %d item to '%s'" + msgid_plural "Copy %d items to '%s'" + msgstr[0] "%d 件のアイテムを '%s' へコピーします" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:409 ++#: src/nautilus-file-undo-operations.c:466 + #, c-format + msgid "_Undo Copy %d item" + msgid_plural "_Undo Copy %d items" + msgstr[0] "元に戻す: %d 件のコピー(_U)" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:412 ++#: src/nautilus-file-undo-operations.c:469 + #, c-format + msgid "_Redo Copy %d item" + msgid_plural "_Redo Copy %d items" + msgstr[0] "やり直す: %d 件のコピー(_R)" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:416 +-#: ../libnautilus-private/nautilus-file-undo-operations.c:438 +-#: ../libnautilus-private/nautilus-file-undo-operations.c:671 ++#: src/nautilus-file-undo-operations.c:475 ++#: src/nautilus-file-undo-operations.c:502 ++#: src/nautilus-file-undo-operations.c:777 + #, c-format + msgid "Delete '%s'" + msgstr "'%s' を削除します" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:417 ++#: src/nautilus-file-undo-operations.c:476 + #, c-format + msgid "Copy '%s' to '%s'" + msgstr "'%s' を '%s' へコピーします" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:419 ++#: src/nautilus-file-undo-operations.c:478 + msgid "_Undo Copy" + msgstr "元に戻す: コピー(_U)" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:420 ++#: src/nautilus-file-undo-operations.c:479 + msgid "_Redo Copy" + msgstr "やり直す: コピー(_R)" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:424 ++#: src/nautilus-file-undo-operations.c:486 + #, c-format + msgid "Delete %d duplicated item" + msgid_plural "Delete %d duplicated items" + msgstr[0] "%d 件の複製したアイテムを削除します" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:427 ++#: src/nautilus-file-undo-operations.c:489 + #, c-format + msgid "Duplicate %d item in '%s'" + msgid_plural "Duplicate %d items in '%s'" + msgstr[0] "%d 件のアイテムを '%s' に複製します" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:431 ++#: src/nautilus-file-undo-operations.c:493 + #, c-format + msgid "_Undo Duplicate %d item" + msgid_plural "_Undo Duplicate %d items" + msgstr[0] "元に戻す: %d 件の複製(_U)" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:434 ++#: src/nautilus-file-undo-operations.c:496 + #, c-format + msgid "_Redo Duplicate %d item" + msgid_plural "_Redo Duplicate %d items" + msgstr[0] "やり直す: %d 件の複製(_R)" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:439 ++#: src/nautilus-file-undo-operations.c:503 + #, c-format + msgid "Duplicate '%s' in '%s'" + msgstr "'%s' を '%s' に複製します" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:442 ++#: src/nautilus-file-undo-operations.c:506 + msgid "_Undo Duplicate" + msgstr "元に戻す: 複製(_U)" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:443 ++#: src/nautilus-file-undo-operations.c:507 + msgid "_Redo Duplicate" + msgstr "やり直す: 複製(_R)" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:447 ++#: src/nautilus-file-undo-operations.c:514 + #, c-format + msgid "Delete links to %d item" + msgid_plural "Delete links to %d items" + msgstr[0] "%d 件のアイテムへのリンクを削除します" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:450 ++#: src/nautilus-file-undo-operations.c:517 + #, c-format + msgid "Create links to %d item" + msgid_plural "Create links to %d items" + msgstr[0] "%d 件のアイテムへのリンクを作成します" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:454 ++#: src/nautilus-file-undo-operations.c:523 + #, c-format + msgid "Delete link to '%s'" + msgstr "'%s' へのリンクを削除します" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:455 ++#: src/nautilus-file-undo-operations.c:524 + #, c-format + msgid "Create link to '%s'" + msgstr "'%s' へのリンクを作成します" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:457 ++#: src/nautilus-file-undo-operations.c:526 + msgid "_Undo Create Link" + msgstr "元に戻す: リンクの作成(_U)" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:458 ++#: src/nautilus-file-undo-operations.c:527 + msgid "_Redo Create Link" + msgstr "やり直す: リンクの作成(_R)" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:674 ++#: src/nautilus-file-undo-operations.c:781 + #, c-format + msgid "Create an empty file '%s'" + msgstr "空のファイル '%s' を作成します" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:676 ++#: src/nautilus-file-undo-operations.c:783 + msgid "_Undo Create Empty File" + msgstr "元に戻す: 空のファイルの作成(_U)" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:677 ++#: src/nautilus-file-undo-operations.c:784 + msgid "_Redo Create Empty File" + msgstr "やり直す: 空のファイルの作成(_R)" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:679 ++#: src/nautilus-file-undo-operations.c:788 + #, c-format + msgid "Create a new folder '%s'" + msgstr "新しいフォルダー '%s' を作成します" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:681 ++#: src/nautilus-file-undo-operations.c:790 + msgid "_Undo Create Folder" + msgstr "元に戻す: フォルダーの作成(_U)" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:682 ++#: src/nautilus-file-undo-operations.c:791 + msgid "_Redo Create Folder" + msgstr "やり直す: フォルダーの作成(_R)" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:684 ++#: src/nautilus-file-undo-operations.c:795 + #, c-format + msgid "Create new file '%s' from template " + msgstr "新しいファイル '%s' をテンプレートから作成します" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:686 ++#: src/nautilus-file-undo-operations.c:797 + msgid "_Undo Create from Template" + msgstr "元に戻す: テンプレートからの作成(_U)" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:687 ++#: src/nautilus-file-undo-operations.c:798 + msgid "_Redo Create from Template" + msgstr "やり直す: テンプレートからの作成(_R)" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:872 +-#: ../libnautilus-private/nautilus-file-undo-operations.c:873 ++#: src/nautilus-file-undo-operations.c:992 ++#: src/nautilus-file-undo-operations.c:993 + #, c-format + msgid "Rename '%s' as '%s'" + msgstr "'%s' の名前を '%s' に変更します" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:875 ++#: src/nautilus-file-undo-operations.c:995 + msgid "_Undo Rename" + msgstr "元に戻す: 名前の変更(_U)" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:876 ++#: src/nautilus-file-undo-operations.c:996 + msgid "_Redo Rename" + msgstr "やり直す: 名前の変更(_R)" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:992 ++#: src/nautilus-file-undo-operations.c:1112 ++#: src/nautilus-file-undo-operations.c:1116 ++#, c-format ++msgid "Batch rename %d file" ++msgid_plural "Batch rename %d files" ++msgstr[0] "%d ファイルの名前変更のバッチ処理" ++ ++#: src/nautilus-file-undo-operations.c:1121 ++msgid "_Undo Batch Rename" ++msgstr "元に戻す: 名前変更のバッチ処理(_U)" ++ ++#: src/nautilus-file-undo-operations.c:1122 ++msgid "_Redo Batch Rename" ++msgstr "やり直す: 名前変更のバッチ処理(_R)" ++ ++#: src/nautilus-file-undo-operations.c:1334 + #, c-format + msgid "Move %d item to trash" + msgid_plural "Move %d items to trash" + msgstr[0] "%d 件のアイテムをゴミ箱へ移動します" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:1004 ++#: src/nautilus-file-undo-operations.c:1348 + #, c-format + msgid "Restore '%s' to '%s'" + msgstr "'%s' を '%s' へ戻します" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:1011 ++#: src/nautilus-file-undo-operations.c:1355 + #, c-format + msgid "Move '%s' to trash" + msgstr "'%s' をゴミ箱へ移動します" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:1016 ++#: src/nautilus-file-undo-operations.c:1360 + msgid "_Undo Trash" + msgstr "元に戻す: ゴミ箱へ移動する(_U)" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:1017 ++#: src/nautilus-file-undo-operations.c:1361 + msgid "_Redo Trash" + msgstr "やり直す: ゴミ箱へ移動する(_R)" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:1310 ++#: src/nautilus-file-undo-operations.c:1656 + #, c-format + msgid "Restore original permissions of items enclosed in '%s'" + msgstr "'%s' 内のアイテムのアクセス権を元に戻します" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:1311 ++#: src/nautilus-file-undo-operations.c:1657 + #, c-format + msgid "Set permissions of items enclosed in '%s'" + msgstr "'%s' 内のアイテムのアクセス権を設定します" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:1313 +-#: ../libnautilus-private/nautilus-file-undo-operations.c:1464 ++#: src/nautilus-file-undo-operations.c:1659 ++#: src/nautilus-file-undo-operations.c:1813 + msgid "_Undo Change Permissions" + msgstr "元に戻す: アクセス権の変更(_U)" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:1314 +-#: ../libnautilus-private/nautilus-file-undo-operations.c:1465 ++#: src/nautilus-file-undo-operations.c:1660 ++#: src/nautilus-file-undo-operations.c:1814 + msgid "_Redo Change Permissions" + msgstr "やり直す: アクセス権の変更(_R)" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:1461 ++#: src/nautilus-file-undo-operations.c:1810 + #, c-format + msgid "Restore original permissions of '%s'" + msgstr "'%s' のアクセス権を元に戻します" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:1462 ++#: src/nautilus-file-undo-operations.c:1811 + #, c-format + msgid "Set permissions of '%s'" + msgstr "'%s' のアクセス権を設定します" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:1572 ++#: src/nautilus-file-undo-operations.c:1923 + #, c-format + msgid "Restore group of '%s' to '%s'" + msgstr "'%s' のグループを 元の '%s' に戻します" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:1574 ++#: src/nautilus-file-undo-operations.c:1925 + #, c-format + msgid "Set group of '%s' to '%s'" + msgstr "'%s' のグループを '%s' に設定します" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:1577 ++#: src/nautilus-file-undo-operations.c:1928 + msgid "_Undo Change Group" + msgstr "元に戻す: グループの変更(_U)" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:1578 ++#: src/nautilus-file-undo-operations.c:1929 + msgid "_Redo Change Group" + msgstr "やり直す: グループの変更(_R)" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:1580 ++#: src/nautilus-file-undo-operations.c:1933 + #, c-format + msgid "Restore owner of '%s' to '%s'" + msgstr "'%s' の所有者を元の '%s' に戻します" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:1582 ++#: src/nautilus-file-undo-operations.c:1935 + #, c-format + msgid "Set owner of '%s' to '%s'" + msgstr "'%s' の所有者を '%s' に設定します" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:1585 ++#: src/nautilus-file-undo-operations.c:1938 + msgid "_Undo Change Owner" + msgstr "元に戻す: 所有者の変更(_U)" + +-#: ../libnautilus-private/nautilus-file-undo-operations.c:1586 ++#: src/nautilus-file-undo-operations.c:1939 + msgid "_Redo Change Owner" + msgstr "やり直す: 所有者の変更(_R)" + +-#: ../libnautilus-private/nautilus-file-utilities.c:896 ++#: src/nautilus-file-utilities.c:1004 + #, c-format + msgid "Could not determine original location of “%s” " + msgstr "“%s”があった元の場所を特定できませんでした " + +-#: ../libnautilus-private/nautilus-file-utilities.c:900 ++#: src/nautilus-file-utilities.c:1008 + msgid "The item cannot be restored from trash" + msgstr "ゴミ箱からそのアイテムを戻せません。" + +-#: ../libnautilus-private/nautilus-file-utilities.c:1004 ++#: src/nautilus-file-utilities.c:1122 + msgid "Audio CD" + msgstr "オーディオCD" + +-#: ../libnautilus-private/nautilus-file-utilities.c:1006 ++#: src/nautilus-file-utilities.c:1126 + msgid "Audio DVD" + msgstr "オーディオDVD" + +-#: ../libnautilus-private/nautilus-file-utilities.c:1008 ++#: src/nautilus-file-utilities.c:1130 + msgid "Video DVD" + msgstr "ビデオDVD" + +-#: ../libnautilus-private/nautilus-file-utilities.c:1010 ++#: src/nautilus-file-utilities.c:1134 + msgid "Video CD" + msgstr "ビデオCD" + +-#: ../libnautilus-private/nautilus-file-utilities.c:1012 ++#: src/nautilus-file-utilities.c:1138 + msgid "Super Video CD" + msgstr "スーパービデオCD" + +-#: ../libnautilus-private/nautilus-file-utilities.c:1014 ++#: src/nautilus-file-utilities.c:1142 + msgid "Photo CD" + msgstr "フォトCD" + +-#: ../libnautilus-private/nautilus-file-utilities.c:1016 ++#: src/nautilus-file-utilities.c:1146 + msgid "Picture CD" + msgstr "ピクチャーCD" + +-#: ../libnautilus-private/nautilus-file-utilities.c:1018 +-#: ../libnautilus-private/nautilus-file-utilities.c:1051 ++#: src/nautilus-file-utilities.c:1150 src/nautilus-file-utilities.c:1194 + msgid "Contains digital photos" + msgstr "デジタル写真が含まれています" + +-#: ../libnautilus-private/nautilus-file-utilities.c:1020 ++#: src/nautilus-file-utilities.c:1154 + msgid "Contains music" + msgstr "音楽が含まれています" + +-#: ../libnautilus-private/nautilus-file-utilities.c:1022 ++#: src/nautilus-file-utilities.c:1158 + msgid "Contains software" + msgstr "ソフトウェアが含まれています" + + #. fallback to generic greeting +-#: ../libnautilus-private/nautilus-file-utilities.c:1025 ++#: src/nautilus-file-utilities.c:1163 + #, c-format + msgid "Detected as “%s”" + msgstr "“%s”を検出" + +-#: ../libnautilus-private/nautilus-file-utilities.c:1047 ++#: src/nautilus-file-utilities.c:1186 + msgid "Contains music and photos" + msgstr "音楽と写真が含まれています" + +-#: ../libnautilus-private/nautilus-file-utilities.c:1049 ++#: src/nautilus-file-utilities.c:1190 + msgid "Contains photos and music" + msgstr "写真と音楽が含まれています" + +-#: ../libnautilus-private/nautilus-mime-application-chooser.c:80 +-#, c-format +-msgid "Error while adding “%s”: %s" +-msgstr "“%s”の追加中にエラーが発生しました: %s" ++#: src/nautilus-image-properties-page.c:355 ++msgid "Image Type" ++msgstr "画像の種類" + +-#: ../libnautilus-private/nautilus-mime-application-chooser.c:82 +-msgid "Could not add application" +-msgstr "アプリケーションを追加できませんでした" ++#: src/nautilus-image-properties-page.c:357 ++#: src/nautilus-image-properties-page.c:363 ++#, c-format ++msgid "%d pixel" ++msgid_plural "%d pixels" ++msgstr[0] "%d ピクセル" + +-#: ../libnautilus-private/nautilus-mime-application-chooser.c:110 +-msgid "Could not forget association" +-msgstr "関連づけを消去できませんでした" ++#: src/nautilus-image-properties-page.c:361 ++msgid "Width" ++msgstr "幅" + +-#: ../libnautilus-private/nautilus-mime-application-chooser.c:134 +-msgid "Forget association" +-msgstr "関連づけを消去する" ++#: src/nautilus-image-properties-page.c:367 ++msgid "Height" ++msgstr "高さ" + +-#: ../libnautilus-private/nautilus-mime-application-chooser.c:172 +-#, c-format +-msgid "Error while setting “%s” as default application: %s" +-msgstr "“%s”をデフォルトのアプリケーションに設定できませんでした: %s" ++#: src/nautilus-image-properties-page.c:386 ++#: src/nautilus-image-properties-page.c:388 ++msgid "Author" ++msgstr "作成者" + +-#: ../libnautilus-private/nautilus-mime-application-chooser.c:174 +-msgid "Could not set as default" +-msgstr "デフォルトに設定できませんでした" ++#: src/nautilus-image-properties-page.c:392 ++#: src/nautilus-image-properties-page.c:456 ++msgid "Copyright" ++msgstr "著作権" + +-#. Translators: the %s here is a file extension +-#: ../libnautilus-private/nautilus-mime-application-chooser.c:252 +-#, c-format +-msgid "%s document" +-msgstr "%s のドキュメント" ++#: src/nautilus-image-properties-page.c:393 ++msgid "Created On" ++msgstr "作成日時" + +-#. Translators; %s here is a mime-type description +-#: ../libnautilus-private/nautilus-mime-application-chooser.c:259 +-#, c-format +-msgid "Open all files of type “%s” with" +-msgstr "“%s”に属すすべてのファイルを以下のアプリケーションで開く" ++# "tEXt::Software"に対応する ++#: src/nautilus-image-properties-page.c:394 ++msgid "Created By" ++msgstr "ソフトウェア" + +-#. Translators: first %s is filename, second %s is mime-type description +-#: ../libnautilus-private/nautilus-mime-application-chooser.c:266 +-#, c-format +-msgid "Select an application to open “%s” and other files of type “%s”" +-msgstr "“%s”および“%s”に属すファイルを開くアプリケーションを選択" ++#. Translators: this refers to a legal disclaimer string embedded in ++#. * the metadata of an image ++#: src/nautilus-image-properties-page.c:397 ++msgid "Disclaimer" ++msgstr "免責事項" + +-#: ../libnautilus-private/nautilus-mime-application-chooser.c:325 +-msgid "_Add" +-msgstr "追加(_A)" ++#: src/nautilus-image-properties-page.c:398 ++msgid "Warning" ++msgstr "警告" + +-#: ../libnautilus-private/nautilus-mime-application-chooser.c:333 +-msgid "Set as default" +-msgstr "デフォルトに設定する" ++#: src/nautilus-image-properties-page.c:399 ++msgid "Source" ++msgstr "ソース" + +-#: ../libnautilus-private/nautilus-program-choosing.c:312 +-msgid "Sorry, but you cannot execute commands from a remote site." +-msgstr "リモートサイトからコマンドを実行することはできません。" ++#: src/nautilus-image-properties-page.c:417 ++msgid "Camera Brand" ++msgstr "カメラのブランド" + +-#: ../libnautilus-private/nautilus-program-choosing.c:314 +-msgid "This is disabled due to security considerations." +-msgstr "セキュリティを考慮してこれを無効にします。" +- +-#: ../libnautilus-private/nautilus-program-choosing.c:325 +-#: ../libnautilus-private/nautilus-program-choosing.c:393 +-msgid "There was an error launching the application." +-msgstr "アプリケーションを起動する際にエラーが発生しました。" +- +-#: ../libnautilus-private/nautilus-program-choosing.c:350 +-#: ../libnautilus-private/nautilus-program-choosing.c:361 +-msgid "This drop target only supports local files." +-msgstr "アイテムのドロップはローカルのファイルシステムでのみサポートしています。" +- +-#: ../libnautilus-private/nautilus-program-choosing.c:351 +-msgid "To open non-local files copy them to a local folder and then drop them again." +-msgstr "そのファイルを一度ローカルフォルダーにコピーしてから再ドロップしてください。" +- +-#: ../libnautilus-private/nautilus-program-choosing.c:362 +-msgid "To open non-local files copy them to a local folder and then drop them again. The local files you dropped have already been opened." +-msgstr "そのファイルを一度ローカルフォルダーにコピーしてから再ドロップしてください。ドロップしたローカルファイルは既に開かれています。" +- +-#: ../libnautilus-private/nautilus-program-choosing.c:391 +-msgid "Details: " +-msgstr "詳細: " +- +-#: ../libnautilus-private/nautilus-progress-info.c:297 +-msgid "Cancelled" +-msgstr "キャンセルしました" +- +-#: ../libnautilus-private/nautilus-progress-info.c:360 +-#: ../libnautilus-private/nautilus-progress-info.c:378 +-msgid "Preparing" +-msgstr "準備中" +- +-#: ../libnautilus-private/nautilus-query.c:470 +-#: ../libnautilus-private/nautilus-search-directory-file.c:159 +-#: ../libnautilus-private/nautilus-search-directory-file.c:211 +-#: ../libnautilus-private/nautilus-search-directory-file.c:256 +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:51 +-#: ../src/resources/ui/nautilus-search-popover.ui.h:12 +-#: ../src/resources/ui/nautilus-toolbar.ui.h:5 +-msgid "Search" +-msgstr "検索" +- +-#: ../libnautilus-private/nautilus-query.c:473 +-#, c-format +-msgid "Search for “%s”" +-msgstr "“%s”の検索" +- +-#: ../libnautilus-private/nautilus-search-engine.c:201 +-msgid "Unable to complete the requested search" +-msgstr "要求された検索を完了できません" +- +-# 検索オプションの XXX ago はすべて since XXX ago の意味である +-# 指定のXXX 前以降のファイルがヒットする +-# 確認バージョン: 3.20 +-#. days +-#: ../libnautilus-private/nautilus-ui-utilities.c:365 +-#, c-format +-msgid "%d day ago" +-msgid_plural "%d days ago" +-msgstr[0] "%d 日前以降" +- +-#. weeks +-#: ../libnautilus-private/nautilus-ui-utilities.c:370 +-#, c-format +-msgid "Last week" +-msgid_plural "%d weeks ago" +-msgstr[0] "%d 週前以降" +- +-#. months +-#: ../libnautilus-private/nautilus-ui-utilities.c:375 +-#, c-format +-msgid "Last month" +-msgid_plural "%d months ago" +-msgstr[0] "%d か月前以降" +- +-#. years +-#: ../libnautilus-private/nautilus-ui-utilities.c:380 +-#, c-format +-msgid "Last year" +-msgid_plural "%d years ago" +-msgstr[0] "%d 年前以降" +- +-#: ../nautilus-sendto-extension/nautilus-nste.c:96 +-#: ../nautilus-sendto-extension/nautilus-nste.c:101 +-msgid "Send to…" +-msgstr "送る…" +- +-#: ../nautilus-sendto-extension/nautilus-nste.c:97 +-msgid "Send file by mail…" +-msgstr "ファイルをメールで送ります…" +- +-#: ../nautilus-sendto-extension/nautilus-nste.c:102 +-msgid "Send files by mail…" +-msgstr "ファイルをメールで送ります…" +- +-#. Some sort of failure occurred. How 'bout we tell the user? +-#: ../src/nautilus-application.c:160 ../src/nautilus-window-slot.c:1144 +-msgid "Oops! Something went wrong." +-msgstr "うわっ! 何か問題が発生しました。" +- +-#: ../src/nautilus-application.c:162 +-#, c-format +-msgid "" +-"Unable to create a required folder. Please create the following folder, or set permissions such that it can be created:\n" +-"%s" +-msgstr "" +-"必要なフォルダーが作成できません。以下のフォルダーを作成するか、フォルダーを作成できるように適切なパーミッションを設定してください:\n" +-"%s" +- +-#: ../src/nautilus-application.c:167 +-#, c-format +-msgid "" +-"Unable to create required folders. Please create the following folders, or set permissions such that they can be created:\n" +-"%s" +-msgstr "" +-"必要なフォルダーを作成できません。以下のフォルダーを作成するか、フォルダーを作成できるように適切なパーミッションを設定してください:\n" +-"%s" +- +-#: ../src/nautilus-application.c:552 +-msgid "--check cannot be used with other options." +-msgstr "--check オプションには他のオプションを指定できません。" +- +-#: ../src/nautilus-application.c:559 +-msgid "--quit cannot be used with URIs." +-msgstr "--quit オプションには URI を指定できません。" +- +-#: ../src/nautilus-application.c:567 +-msgid "--select must be used with at least an URI." +-msgstr "--select オプションにはひとつ以上の URI を指定してください。" +- +-#: ../src/nautilus-application.c:574 +-msgid "--no-desktop and --force-desktop cannot be used together." +-msgstr "--no-desktop と --force-desktop は同時に指定できません。" +- +-#: ../src/nautilus-application.c:687 +-#, c-format +-msgid "" +-"There was an error displaying help: \n" +-"%s" +-msgstr "" +-"ヘルプを表示する際にエラーが発生しました: \n" +-"%s" +- +-#: ../src/nautilus-application.c:826 +-msgid "Perform a quick set of self-check tests." +-msgstr "簡易自己診断テストセットを実行する" +- +-#: ../src/nautilus-application.c:833 +-msgid "Create the initial window with the given geometry." +-msgstr "指定した大きさでウィンドウを起動する" +- +-#: ../src/nautilus-application.c:833 +-msgid "GEOMETRY" +-msgstr "GEOMETRY" +- +-#: ../src/nautilus-application.c:835 +-msgid "Show the version of the program." +-msgstr "バージョンを表示する" +- +-#: ../src/nautilus-application.c:837 +-msgid "Always open a new window for browsing specified URIs" +-msgstr "指定した URI を常に新しいウィンドウで開く" +- +-#: ../src/nautilus-application.c:839 +-msgid "Only create windows for explicitly specified URIs." +-msgstr "明示的に指定した URI のウィンドウだけを起動する" +- +-#: ../src/nautilus-application.c:841 +-msgid "Never manage the desktop (ignore the GSettings preference)." +-msgstr "デスクトップを管理しない (GSettings の設定を無視する)" +- +-#: ../src/nautilus-application.c:843 +-msgid "Always manage the desktop (ignore the GSettings preference)." +-msgstr "デスクトップを管理する (GSettings の設定を無視する)" +- +-#: ../src/nautilus-application.c:845 +-msgid "Quit Nautilus." +-msgstr "Nautilus を強制終了する" +- +-#: ../src/nautilus-application.c:847 +-msgid "Select specified URI in parent folder." +-msgstr "指定した URI の親フォルダーを選択する" +- +-#: ../src/nautilus-application.c:848 +-msgid "[URI...]" +-msgstr "[URI...]" +- +-#: ../src/nautilus-autorun-software.c:142 +-#: ../src/nautilus-autorun-software.c:145 +-#, c-format +-msgid "" +-"Unable to start the program:\n" +-"%s" +-msgstr "" +-"プログラムを起動できません:\n" +-"%s" +- +-#: ../src/nautilus-autorun-software.c:148 +-#, c-format +-msgid "Unable to locate the program" +-msgstr "プログラムを見つけることができません" +- +-#: ../src/nautilus-autorun-software.c:170 +-msgid "Oops! There was a problem running this software." +-msgstr "うわっ! このソフトウェアの実行で問題が発生しました。" +- +-#: ../src/nautilus-autorun-software.c:201 +-#, c-format +-msgid "“%s” contains software intended to be automatically started. Would you like to run it?" +-msgstr "“%s”には自動的に起動することを意図したソフトウェアが含まれています。実行してみますか?" +- +-#: ../src/nautilus-autorun-software.c:205 +-msgid "If you don't trust this location or aren't sure, press Cancel." +-msgstr "もしこの場所が信用できるものではないか、よくわからない時はキャンセルを押してください。" +- +-#: ../src/nautilus-autorun-software.c:240 ../src/nautilus-mime-actions.c:636 +-msgid "_Run" +-msgstr "実行する(_R)" +- +-#: ../src/nautilus-canvas-view-container.c:444 +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:7 +-msgid "Icon View" +-msgstr "アイコン表示" +- +-#: ../src/nautilus-desktop-item-properties.c:404 +-#: ../src/nautilus-desktop-item-properties.c:414 +-#: ../src/nautilus-image-properties-page.c:370 +-msgid "Comment" +-msgstr "コメント" +- +-#: ../src/nautilus-desktop-item-properties.c:407 +-msgid "URL" +-msgstr "URL" +- +-#: ../src/nautilus-desktop-item-properties.c:410 +-#: ../src/nautilus-desktop-item-properties.c:420 +-#: ../src/nautilus-image-properties-page.c:361 +-#: ../src/nautilus-image-properties-page.c:416 +-msgid "Description" +-msgstr "説明" +- +-#: ../src/nautilus-desktop-item-properties.c:417 +-msgid "Command" +-msgstr "コマンド" +- +-#. hardcode "Desktop" +-#: ../src/nautilus-desktop-window.c:195 ../src/nautilus-desktop-window.c:364 +-msgid "Desktop" +-msgstr "デスクトップ" +- +-#: ../src/nautilus-error-reporting.c:67 +-#, c-format +-msgid "You do not have the permissions necessary to view the contents of “%s”." +-msgstr "“%s”の内容を表示するために必要な権限がありません。" +- +-#: ../src/nautilus-error-reporting.c:71 +-#, c-format +-msgid "“%s” could not be found. Perhaps it has recently been deleted." +-msgstr "“%s”が見つかりませんでした。最近削除されたようです。" +- +-#: ../src/nautilus-error-reporting.c:75 +-#, c-format +-msgid "Sorry, could not display all the contents of “%s”: %s" +-msgstr "“%s”のすべての内容を表示できませんでした: %s" +- +-#: ../src/nautilus-error-reporting.c:82 +-msgid "This location could not be displayed." +-msgstr "この場所は表示できませんでした。" +- +-#: ../src/nautilus-error-reporting.c:106 +-#, c-format +-msgid "You do not have the permissions necessary to change the group of “%s”." +-msgstr "“%s”のグループを変更するために必要な権限がありません。" +- +-#. fall through +-#: ../src/nautilus-error-reporting.c:119 +-#, c-format +-msgid "Sorry, could not change the group of “%s”: %s" +-msgstr "“%s”のグループを変更できませんでした: %s" +- +-#: ../src/nautilus-error-reporting.c:124 +-msgid "The group could not be changed." +-msgstr "グループを変更できませんでした。" +- +-#: ../src/nautilus-error-reporting.c:144 +-#, c-format +-msgid "Sorry, could not change the owner of “%s”: %s" +-msgstr "“%s”の所有者を変更できませんでした: %s" +- +-#: ../src/nautilus-error-reporting.c:146 +-msgid "The owner could not be changed." +-msgstr "所有者を変更できませんでした。" +- +-#: ../src/nautilus-error-reporting.c:166 +-#, c-format +-msgid "Sorry, could not change the permissions of “%s”: %s" +-msgstr "“%s”のアクセス権を変更できませんでした: %s" +- +-#: ../src/nautilus-error-reporting.c:168 +-msgid "The permissions could not be changed." +-msgstr "アクセス権を変更できませんでした。" +- +-#: ../src/nautilus-error-reporting.c:203 +-#, c-format +-msgid "The name “%s” is already used in this location. Please use a different name." +-msgstr "名前“%s”は既にこの場所で使われています。別の名前を使ってください。" +- +-#: ../src/nautilus-error-reporting.c:208 +-#, c-format +-msgid "There is no “%s” in this location. Perhaps it was just moved or deleted?" +-msgstr "この場所に“%s”はありません。おそらく移動したか削除したのではないでしょうか?" +- +-#: ../src/nautilus-error-reporting.c:213 +-#, c-format +-msgid "You do not have the permissions necessary to rename “%s”." +-msgstr "“%s”の名前を変更するために必要な権限がありません。" +- +-#: ../src/nautilus-error-reporting.c:218 +-#, c-format +-msgid "The name “%s” is not valid because it contains the character “/”. Please use a different name." +-msgstr "名前“%s”の中に文字“/”があるのは適切ではありません。別の名前を使ってください。" +- +-#: ../src/nautilus-error-reporting.c:222 +-#, c-format +-msgid "The name “%s” is not valid. Please use a different name." +-msgstr "名前“%s”は正しくありません。別の名前を使ってください。" +- +-#: ../src/nautilus-error-reporting.c:228 +-#, c-format +-msgid "The name “%s” is too long. Please use a different name." +-msgstr "名前“%s”が長すぎます。別の名前を使ってください。" +- +-#. fall through +-#: ../src/nautilus-error-reporting.c:242 +-#, c-format +-msgid "Sorry, could not rename “%s” to “%s”: %s" +-msgstr "“%s”から“%s”へ名前を変更できませんでした: %s" +- +-#: ../src/nautilus-error-reporting.c:250 +-msgid "The item could not be renamed." +-msgstr "アイテムの名前を変更できませんでした。" +- +-#: ../src/nautilus-error-reporting.c:347 +-#, c-format +-msgid "Renaming “%s” to “%s”." +-msgstr "“%s”から“%s”に変更中。" +- +-#: ../src/nautilus-files-view.c:403 +-msgid "Searching…" +-msgstr "検索中…" +- +-#: ../src/nautilus-files-view.c:403 ../src/nautilus-image-properties-page.c:708 +-#: ../src/nautilus-list-model.c:375 ../src/nautilus-window-slot.c:657 +-msgid "Loading…" +-msgstr "読み込み中…" +- +-#: ../src/nautilus-files-view.c:1073 ../src/nautilus-mime-actions.c:969 +-#: ../src/nautilus-mime-actions.c:1713 +-msgid "Are you sure you want to open all files?" +-msgstr "すべてのファイルを開いてもよろしいですか?" +- +-#: ../src/nautilus-files-view.c:1075 +-#, c-format +-msgid "This will open %'d separate tab." +-msgid_plural "This will open %'d separate tabs." +-msgstr[0] "%'d 個のタブを別々に開きます。" +- +-#: ../src/nautilus-files-view.c:1078 +-#, c-format +-msgid "This will open %'d separate window." +-msgid_plural "This will open %'d separate windows." +-msgstr[0] "%'d 個のウィンドウを別々に開きます。" +- +-#: ../src/nautilus-files-view.c:1082 ../src/nautilus-location-entry.c:270 +-#: ../src/nautilus-mime-actions.c:978 ../src/nautilus-mime-actions.c:1155 +-#: ../src/nautilus-mime-actions.c:1717 +-msgid "_OK" +-msgstr "OK(_O)" +- +-#: ../src/nautilus-files-view.c:1553 +-msgid "Select Items Matching" +-msgstr "パターンを指定してアイテムを選択" +- +-#: ../src/nautilus-files-view.c:1558 ../src/nautilus-files-view.c:5275 +-msgid "_Select" +-msgstr "選択(_S)" +- +-#: ../src/nautilus-files-view.c:1566 +-msgid "_Pattern:" +-msgstr "パターン(_P):" +- +-#: ../src/nautilus-files-view.c:1572 +-msgid "Examples: " +-msgstr "例: " +- +-#: ../src/nautilus-files-view.c:1813 +-msgid "A folder with that name already exists." +-msgstr "同じ名前のフォルダーが既に存在します。" +- +-#: ../src/nautilus-files-view.c:1815 +-msgid "A file with that name already exists." +-msgstr "同じ名前のファイルが既に存在します。" +- +-#: ../src/nautilus-files-view.c:1830 +-msgid "Folder names cannot contain “/”." +-msgstr "“/”は、フォルダー名に含められません。" +- +-#: ../src/nautilus-files-view.c:1832 +-msgid "Files names cannot contain “/”." +-msgstr "“/”は、ファイル名に含められません。" +- +-#: ../src/nautilus-files-view.c:1835 +-msgid "A folder can not be called “.”." +-msgstr "“.”という名前をフォルダーに付けられません。" +- +-#: ../src/nautilus-files-view.c:1837 +-msgid "A file can not be called “.”." +-msgstr "“.”という名前をファイルに付けられません。" +- +-#: ../src/nautilus-files-view.c:1840 +-msgid "A folder can not be called “..”." +-msgstr "“..”という名前をフォルダーに付けられません。" +- +-#: ../src/nautilus-files-view.c:1842 +-msgid "A file can not be called “..”." +-msgstr "“..”という名前をファイルに付けられません。" +- +-#: ../src/nautilus-files-view.c:2073 ../src/nautilus-files-view.c:2141 +-msgid "Folder name" +-msgstr "フォルダー名" +- +-#: ../src/nautilus-files-view.c:2075 +-msgid "File name" +-msgstr "ファイル名" +- +-#: ../src/nautilus-files-view.c:2140 +-msgid "Create" +-msgstr "作成" +- +-#: ../src/nautilus-files-view.c:2142 +-msgid "New Folder" +-msgstr "新しいフォルダー" +- +-#: ../src/nautilus-files-view.c:2583 +-msgid "Nautilus 3.6 deprecated this directory and tried migrating this configuration to ~/.local/share/nautilus" +-msgstr "Nautilus 3.6 ではこのディレクトリの使用は非推奨となり、~/.local/share/nautilus への設定内容の移行を試みました。" +- +-#: ../src/nautilus-files-view.c:3010 ../src/nautilus-files-view.c:3045 +-#, c-format +-msgid "“%s” selected" +-msgstr "“%s”を選択しました" +- +-#: ../src/nautilus-files-view.c:3012 +-#, c-format +-msgid "%'d folder selected" +-msgid_plural "%'d folders selected" +-msgstr[0] "%'d 個のフォルダーを選択しました" +- +-#: ../src/nautilus-files-view.c:3022 +-#, c-format +-msgid "(containing %'d item)" +-msgid_plural "(containing %'d items)" +-msgstr[0] "(%'d 個のアイテムを含む)" +- +-#. translators: this is preceded with a string of form 'N folders' (N more than 1) +-#: ../src/nautilus-files-view.c:3033 +-#, c-format +-msgid "(containing a total of %'d item)" +-msgid_plural "(containing a total of %'d items)" +-msgstr[0] "(合計で %'d 個のアイテムを含む)" +- +-#: ../src/nautilus-files-view.c:3048 +-#, c-format +-msgid "%'d item selected" +-msgid_plural "%'d items selected" +-msgstr[0] "%'d 個のアイテムを選択しました" +- +-#. Folders selected also, use "other" terminology +-#: ../src/nautilus-files-view.c:3055 +-#, c-format +-msgid "%'d other item selected" +-msgid_plural "%'d other items selected" +-msgstr[0] "他に %'d 個のアイテムを選択しました" +- +-#. This is marked for translation in case a localiser +-#. * needs to use something other than parentheses. The +-#. * the message in parentheses is the size of the selected items. +-#. +-#: ../src/nautilus-files-view.c:3069 +-#, c-format +-msgid "(%s)" +-msgstr "(%s)" +- +-#. This is marked for translation in case a localizer +-#. * needs to change ", " to something else. The comma +-#. * is between the message about the number of folders +-#. * and the number of items in those folders and the +-#. * message about the number of other items and the +-#. * total size of those items. +-#. +-#: ../src/nautilus-files-view.c:3093 +-#, c-format +-msgid "%s %s, %s %s" +-msgstr "%s %s, %s %s" +- +-#: ../src/nautilus-files-view.c:5264 +-msgid "Select Move Destination" +-msgstr "移動する宛先の選択" +- +-#: ../src/nautilus-files-view.c:5266 +-msgid "Select Copy Destination" +-msgstr "コピーする宛先の選択" +- +-#. Translators: %s is a file name formatted for display +-#: ../src/nautilus-files-view.c:5722 +-#, c-format +-msgid "Unable to remove “%s”" +-msgstr "%s を取り外せません" +- +-#. Translators: %s is a file name formatted for display +-#: ../src/nautilus-files-view.c:5749 +-#, c-format +-msgid "Unable to eject “%s”" +-msgstr "“%s”を取り出せません" +- +-#: ../src/nautilus-files-view.c:5771 +-msgid "Unable to stop drive" +-msgstr "ドライブを停止できません" +- +-#. Translators: %s is a file name formatted for display +-#: ../src/nautilus-files-view.c:5876 +-#, c-format +-msgid "Unable to start “%s”" +-msgstr "“%s”を起動できません" +- +-#: ../src/nautilus-files-view.c:6631 +-#, c-format +-msgid "New Folder with Selection (%'d Item)" +-msgid_plural "New Folder with Selection (%'d Items)" +-msgstr[0] "選択アイテム含む新しいフォルダーを作成 (%'d 件)" +- +-#: ../src/nautilus-files-view.c:6679 +-#, c-format +-msgid "Open With %s" +-msgstr "%sで開く" +- +-#: ../src/nautilus-files-view.c:6688 +-msgid "Run" +-msgstr "実行" +- +-#: ../src/nautilus-files-view.c:6690 +-msgid "Open" +-msgstr "開く" +- +-#: ../src/nautilus-files-view.c:6741 +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:19 +-msgid "_Start" +-msgstr "開始(_S)" +- +-#: ../src/nautilus-files-view.c:6744 ../src/gtk/nautilusgtkplacesview.c:1632 +-msgid "_Connect" +-msgstr "接続する(_C)" +- +-#: ../src/nautilus-files-view.c:6747 +-msgid "_Start Multi-disk Drive" +-msgstr "マルチディスク・ドライブを起動(_S)" +- +-#: ../src/nautilus-files-view.c:6750 +-msgid "U_nlock Drive" +-msgstr "ドライブのロック解除(_N)" +- +-#: ../src/nautilus-files-view.c:6766 +-msgid "Stop Drive" +-msgstr "ドライブを停止する" +- +-#: ../src/nautilus-files-view.c:6769 +-msgid "_Safely Remove Drive" +-msgstr "ドライブを安全に取り出す(_S)" +- +-#: ../src/nautilus-files-view.c:6772 ../src/gtk/nautilusgtkplacesview.c:1622 +-msgid "_Disconnect" +-msgstr "切断(_D)" +- +-#: ../src/nautilus-files-view.c:6775 +-msgid "_Stop Multi-disk Drive" +-msgstr "マルチディスク・ドライブの停止(_S)" +- +-#: ../src/nautilus-files-view.c:6778 +-msgid "_Lock Drive" +-msgstr "ドライブのロック(_L)" +- +-#: ../src/nautilus-files-view.c:8234 +-msgid "Content View" +-msgstr "内容表示" +- +-#: ../src/nautilus-files-view.c:8235 +-msgid "View of the current folder" +-msgstr "このフォルダーを表示します" +- +-#: ../src/nautilus-files-view-dnd.c:172 ../src/nautilus-files-view-dnd.c:206 +-#: ../src/nautilus-files-view-dnd.c:297 +-msgid "Drag and drop is not supported." +-msgstr "ドラッグ&ドロップはサポートしていません。" +- +-#: ../src/nautilus-files-view-dnd.c:173 +-msgid "Drag and drop is only supported on local file systems." +-msgstr "ドラッグ&ドロップはローカルのファイルシステムでのみサポートしています。" +- +-#: ../src/nautilus-files-view-dnd.c:207 ../src/nautilus-files-view-dnd.c:298 +-msgid "An invalid drag type was used." +-msgstr "使用したドラッグの種類は無効です。" +- +-#. Translator: This is the filename used for when you dnd text to a directory +-#: ../src/nautilus-files-view-dnd.c:385 +-msgid "Dropped Text.txt" +-msgstr "ドロップしたテキスト.txt" +- +-#. Translator: This is the filename used for when you dnd raw +-#. * data to a directory, if the source didn't supply a name. +-#. +-#: ../src/nautilus-files-view-dnd.c:483 +-msgid "dropped data" +-msgstr "ドロップしたデータ" +- +-#: ../src/nautilus-image-properties-page.c:331 +-msgid "Image Type" +-msgstr "画像の種類" +- +-#: ../src/nautilus-image-properties-page.c:333 +-#: ../src/nautilus-image-properties-page.c:339 +-#, c-format +-msgid "%d pixel" +-msgid_plural "%d pixels" +-msgstr[0] "%d ピクセル" +- +-#: ../src/nautilus-image-properties-page.c:337 +-msgid "Width" +-msgstr "幅" +- +-#: ../src/nautilus-image-properties-page.c:343 +-msgid "Height" +-msgstr "高さ" +- +-#: ../src/nautilus-image-properties-page.c:356 +-#: ../src/nautilus-image-properties-page.c:357 +-msgid "Title" +-msgstr "タイトル" +- +-#: ../src/nautilus-image-properties-page.c:358 +-#: ../src/nautilus-image-properties-page.c:359 +-msgid "Author" +-msgstr "作成者" +- +-#: ../src/nautilus-image-properties-page.c:362 +-#: ../src/nautilus-image-properties-page.c:419 +-msgid "Copyright" +-msgstr "著作権" +- +-#: ../src/nautilus-image-properties-page.c:363 +-msgid "Created On" +-msgstr "作成日時" +- +-# "tEXt::Software"に対応する +-#: ../src/nautilus-image-properties-page.c:364 +-msgid "Created By" +-msgstr "ソフトウェア" +- +-#. Translators: this refers to a legal disclaimer string embedded in +-#. * the metadata of an image +-#: ../src/nautilus-image-properties-page.c:367 +-msgid "Disclaimer" +-msgstr "免責事項" +- +-#: ../src/nautilus-image-properties-page.c:368 +-msgid "Warning" +-msgstr "警告" +- +-#: ../src/nautilus-image-properties-page.c:369 +-msgid "Source" +-msgstr "ソース" +- +-#: ../src/nautilus-image-properties-page.c:384 +-msgid "Camera Brand" +-msgstr "カメラのブランド" +- +-#: ../src/nautilus-image-properties-page.c:385 +-msgid "Camera Model" +-msgstr "カメラのモデル" ++#: src/nautilus-image-properties-page.c:418 ++#: src/resources/ui/nautilus-batch-rename-dialog.ui:434 ++msgid "Camera Model" ++msgstr "カメラのモデル" + + #. Choose which date to show in order of relevance +-#: ../src/nautilus-image-properties-page.c:388 ++#: src/nautilus-image-properties-page.c:421 + msgid "Date Taken" + msgstr "撮影日時" + +-#: ../src/nautilus-image-properties-page.c:389 ++#: src/nautilus-image-properties-page.c:423 + msgid "Date Digitized" + msgstr "保存日時" + +-#: ../src/nautilus-image-properties-page.c:390 ++#: src/nautilus-image-properties-page.c:425 + msgid "Date Modified" + msgstr "更新日時" + +-#: ../src/nautilus-image-properties-page.c:394 ++#: src/nautilus-image-properties-page.c:429 + msgid "Exposure Time" + msgstr "露出時間" + +-#: ../src/nautilus-image-properties-page.c:395 ++#: src/nautilus-image-properties-page.c:430 + msgid "Aperture Value" + msgstr "口径" + +-#: ../src/nautilus-image-properties-page.c:396 ++#: src/nautilus-image-properties-page.c:431 + msgid "ISO Speed Rating" + msgstr "ISO スピード率" + +-#: ../src/nautilus-image-properties-page.c:397 ++#: src/nautilus-image-properties-page.c:432 + msgid "Flash Fired" + msgstr "フラッシュあり" + +-#: ../src/nautilus-image-properties-page.c:398 ++#: src/nautilus-image-properties-page.c:433 + msgid "Metering Mode" + msgstr "測量モード" + +-#: ../src/nautilus-image-properties-page.c:399 ++#: src/nautilus-image-properties-page.c:434 + msgid "Exposure Program" + msgstr "露出プログラム" + +-#: ../src/nautilus-image-properties-page.c:400 ++#: src/nautilus-image-properties-page.c:435 + msgid "Focal Length" + msgstr "焦点距離" + +-#: ../src/nautilus-image-properties-page.c:401 ++#: src/nautilus-image-properties-page.c:436 + msgid "Software" + msgstr "ソフトウェア" + +-#: ../src/nautilus-image-properties-page.c:417 ++#: src/nautilus-image-properties-page.c:454 + msgid "Keywords" + msgstr "キーワード" + +-#: ../src/nautilus-image-properties-page.c:418 ++#: src/nautilus-image-properties-page.c:455 + msgid "Creator" + msgstr "作成者" + +-#: ../src/nautilus-image-properties-page.c:420 ++#: src/nautilus-image-properties-page.c:457 + msgid "Rating" + msgstr "評価" + +-#: ../src/nautilus-image-properties-page.c:443 ++#: src/nautilus-image-properties-page.c:484 + msgid "Failed to load image information" + msgstr "画像情報の読み込みに失敗しました" + +-#: ../src/nautilus-list-model.c:373 ++#: src/nautilus-list-model.c:446 + msgid "(Empty)" + msgstr "(空)" + +-#: ../src/nautilus-list-view.c:1267 ++#: src/nautilus-list-view.c:1450 + msgid "Use Default" + msgstr "デフォルトに戻す" + +-#: ../src/nautilus-list-view.c:1821 +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:8 ++#: src/nautilus-list-view.c:2058 ++#: src/resources/ui/nautilus-preferences-window.ui:49 ++#: src/resources/ui/nautilus-preferences-window.ui:244 + msgid "List View" + msgstr "一覧表示" + +-#: ../src/nautilus-list-view.c:2642 ++#: src/nautilus-list-view.c:2956 + #, c-format + msgid "%s Visible Columns" + msgstr "%s で表示する項目" + +-#: ../src/nautilus-list-view.c:2662 ++#: src/nautilus-list-view.c:2976 + msgid "Choose the order of information to appear in this folder:" + msgstr "このフォルダーで表示する項目の順番を選択してください:" + +-#: ../src/nautilus-location-entry.c:255 ++#: src/nautilus-location-entry.c:267 + #, c-format + msgid "Do you want to view %d location?" + msgid_plural "Do you want to view %d locations?" + msgstr[0] " %d 個の場所を表示しますか?" + +-#: ../src/nautilus-location-entry.c:259 ../src/nautilus-mime-actions.c:974 ++#: src/nautilus-location-entry.c:271 src/nautilus-mime-actions.c:1035 + #, c-format + msgid "This will open %d separate window." + msgid_plural "This will open %d separate windows." + msgstr[0] "%d 個のウィンドウを別々に開きます。" + +-#: ../src/nautilus-mime-actions.c:95 +-#: ../src/resources/ui/nautilus-search-popover.ui.h:11 ++#: src/nautilus-mime-actions.c:98 ++#: src/resources/ui/nautilus-search-popover.ui:275 + msgid "Anything" + msgstr "指定なし" + +-#: ../src/nautilus-mime-actions.c:106 ../src/nautilus-properties-window.c:4200 ++#: src/nautilus-mime-actions.c:108 src/nautilus-properties-window.c:4631 + msgid "Folders" + msgstr "フォルダー" + +-#: ../src/nautilus-mime-actions.c:111 ++#: src/nautilus-mime-actions.c:112 + msgid "Documents" + msgstr "ドキュメント" + +-#: ../src/nautilus-mime-actions.c:129 ++#: src/nautilus-mime-actions.c:128 + msgid "Illustration" + msgstr "絵/イラスト" + +-#: ../src/nautilus-mime-actions.c:143 ++#: src/nautilus-mime-actions.c:140 + msgid "Music" + msgstr "楽曲" + +-#: ../src/nautilus-mime-actions.c:158 ++#: src/nautilus-mime-actions.c:153 + msgid "PDF / PostScript" + msgstr "PDF/PostScript" + +-#: ../src/nautilus-mime-actions.c:166 ++#: src/nautilus-mime-actions.c:159 + msgid "Picture" + msgstr "写真" + +-#: ../src/nautilus-mime-actions.c:211 ++#: src/nautilus-mime-actions.c:198 + msgid "Text File" + msgstr "テキストファイル" + +-#: ../src/nautilus-mime-actions.c:544 ++#: src/nautilus-mime-actions.c:547 + #, c-format + msgid "The link “%s” is broken. Move it to Trash?" + msgstr "このリンク“%s”は壊れています。ごみ箱に移動しますか?" + +-#: ../src/nautilus-mime-actions.c:546 ++#: src/nautilus-mime-actions.c:551 + #, c-format + msgid "The link “%s” is broken." + msgstr "このリンク“%s”は壊れています。" + +-#: ../src/nautilus-mime-actions.c:552 ++#: src/nautilus-mime-actions.c:558 + msgid "This link cannot be used because it has no target." + msgstr "このリンクはリンク先が存在しないので使用できません。" + +-#: ../src/nautilus-mime-actions.c:554 ++#: src/nautilus-mime-actions.c:562 ++#, c-format ++msgid "This link cannot be used because its target “%s” doesn't exist." ++msgstr "このリンクはリンク先である“%s”が存在しないので使用できません。" ++ ++#: src/nautilus-mime-actions.c:573 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:174 ++msgid "Mo_ve to Trash" ++msgstr "ゴミ箱へ移動する(_V)" ++ ++#: src/nautilus-mime-actions.c:644 ++#, c-format ++msgid "Do you want to run “%s”, or display its contents?" ++msgstr "“%s”を実行しますか? それとも内容を表示しますか?" ++ ++#: src/nautilus-mime-actions.c:646 ++#, c-format ++msgid "“%s” is an executable text file." ++msgstr "“%s”は実行可能なテキストファイルです。" ++ ++#: src/nautilus-mime-actions.c:652 ++msgid "Run in _Terminal" ++msgstr "端末内で実行する(_T)" ++ ++#: src/nautilus-mime-actions.c:653 ++msgid "_Display" ++msgstr "表示する(_D)" ++ ++#: src/nautilus-mime-actions.c:1030 ++#, c-format ++msgid "This will open %d separate tab." ++msgid_plural "This will open %d separate tabs." ++msgstr[0] "%d 個のタブを別々に開きます。" ++ ++#: src/nautilus-mime-actions.c:1102 ++#, c-format ++msgid "Could not display “%s”." ++msgstr "“%s”を表示できませんでした。" ++ ++#: src/nautilus-mime-actions.c:1205 ++msgid "The file is of an unknown type" ++msgstr "そのファイルの種類を特定できません" ++ ++#: src/nautilus-mime-actions.c:1210 ++#, c-format ++msgid "There is no application installed for “%s” files" ++msgstr "“%s”の種類のファイルを扱うことが可能なアプリケーションはインストールされていません" ++ ++#: src/nautilus-mime-actions.c:1223 ++msgid "_Select Application" ++msgstr "アプリケーションの選択(_S)" ++ ++#: src/nautilus-mime-actions.c:1261 ++msgid "There was an internal error trying to search for applications:" ++msgstr "アプリケーションを検索している最中に Nautilus の内部エラーが発生しました:" ++ ++#: src/nautilus-mime-actions.c:1263 ++msgid "Unable to search for application" ++msgstr "アプリケーションを検索できません" ++ ++#: src/nautilus-mime-actions.c:1394 ++#, c-format ++msgid "" ++"There is no application installed for “%s” files.\n" ++"Do you want to search for an application to open this file?" ++msgstr "" ++"“%s”の種類のファイルを扱えるアプリケーションがインストールされていません。\n" ++"この種類のファイルを開くことができるアプリケーションを探しますか?" ++ ++#: src/nautilus-mime-actions.c:1561 ++msgid "Untrusted application launcher" ++msgstr "信用できないアプリケーションのランチャー" ++ ++#: src/nautilus-mime-actions.c:1564 ++#, c-format ++msgid "" ++"The application launcher “%s” has not been marked as trusted. If you do not " ++"know the source of this file, launching it may be unsafe." ++msgstr "“%s”というランチャーの安全が確認されていません。ファイルの提供元が不明な場合、そのファイルを起動するのは安全ではありません。" ++ ++#: src/nautilus-mime-actions.c:1579 ++msgid "_Launch Anyway" ++msgstr "とにかく起動する(_L)" ++ ++#: src/nautilus-mime-actions.c:1583 ++msgid "Mark as _Trusted" ++msgstr "信用できるアプリにする(_T)" ++ ++#: src/nautilus-mime-actions.c:1883 ++#, c-format ++msgid "This will open %d separate application." ++msgid_plural "This will open %d separate applications." ++msgstr[0] "%d 個のアプリケーションを別々に開きます。" ++ ++#. if it wasn't cancelled show a dialog ++#: src/nautilus-mime-actions.c:1969 src/nautilus-mime-actions.c:2264 ++#: src/gtk/nautilusgtkplacesview.c:1190 src/gtk/nautilusgtkplacesview.c:1265 ++msgid "Unable to access location" ++msgstr "要求された場所にアクセスできません" ++ ++#: src/nautilus-mime-actions.c:2353 ++msgid "Unable to start location" ++msgstr "場所を起動できません" ++ ++#: src/nautilus-mime-actions.c:2444 ++#, c-format ++msgid "Opening “%s”." ++msgstr "“%s”を開いています。" ++ ++#: src/nautilus-mime-actions.c:2449 ++#, c-format ++msgid "Opening %d item." ++msgid_plural "Opening %d items." ++msgstr[0] "%d 個のアイテムを開いています。" ++ ++#: src/nautilus-mime-application-chooser.c:85 ++#, c-format ++msgid "Error while adding “%s”: %s" ++msgstr "“%s”の追加中にエラーが発生しました: %s" ++ ++#: src/nautilus-mime-application-chooser.c:87 ++msgid "Could not add application" ++msgstr "アプリケーションを追加できませんでした" ++ ++#: src/nautilus-mime-application-chooser.c:119 ++msgid "Could not forget association" ++msgstr "関連づけを消去できませんでした" ++ ++#: src/nautilus-mime-application-chooser.c:143 ++msgid "Forget association" ++msgstr "関連づけを消去する" ++ ++#: src/nautilus-mime-application-chooser.c:182 ++#, c-format ++msgid "Error while setting “%s” as default application: %s" ++msgstr "“%s”をデフォルトのアプリケーションに設定できませんでした: %s" ++ ++#: src/nautilus-mime-application-chooser.c:184 ++msgid "Could not set as default" ++msgstr "デフォルトに設定できませんでした" ++ ++#. Translators: the %s here is a file extension ++#: src/nautilus-mime-application-chooser.c:266 ++#, c-format ++msgid "%s document" ++msgstr "%s のドキュメント" ++ ++#. Translators; %s here is a mime-type description ++#: src/nautilus-mime-application-chooser.c:276 ++#, c-format ++msgid "Open all files of type “%s” with" ++msgstr "“%s”に属すすべてのファイルを以下のアプリケーションで開く" ++ ++#. Translators: first %s is filename, second %s is mime-type description ++#: src/nautilus-mime-application-chooser.c:285 ++#, c-format ++msgid "Select an application to open “%s” and other files of type “%s”" ++msgstr "“%s”および“%s”に属すファイルを開くアプリケーションを選択" ++ ++#: src/nautilus-mime-application-chooser.c:344 ++msgid "_Add" ++msgstr "追加(_A)" ++ ++#: src/nautilus-mime-application-chooser.c:352 ++msgid "Set as default" ++msgstr "デフォルトに設定する" ++ ++#: src/nautilus-new-folder-dialog-controller.c:52 ++#: src/nautilus-rename-file-popover-controller.c:81 ++msgid "Folder names cannot contain “/”." ++msgstr "“/”は、フォルダー名に含められません。" ++ ++#: src/nautilus-new-folder-dialog-controller.c:56 ++#: src/nautilus-rename-file-popover-controller.c:92 ++msgid "A folder cannot be called “.”." ++msgstr "“.”という名前をフォルダーに付けられません。" ++ ++#: src/nautilus-new-folder-dialog-controller.c:60 ++#: src/nautilus-rename-file-popover-controller.c:103 ++msgid "A folder cannot be called “..”." ++msgstr "“..”という名前をフォルダーに付けられません。" ++ ++#: src/nautilus-new-folder-dialog-controller.c:128 ++msgid "Create" ++msgstr "作成" ++ ++#: src/nautilus-new-folder-dialog-controller.c:129 ++#: src/nautilus-rename-file-popover-controller.c:190 ++msgid "Folder name" ++msgstr "フォルダー名" ++ ++#: src/nautilus-new-folder-dialog-controller.c:130 ++msgid "New Folder" ++msgstr "新しいフォルダー" ++ ++#: src/nautilus-notebook.c:335 ++msgid "Close tab" ++msgstr "タブを閉じます" ++ ++#: src/nautilus-operations-ui-manager.c:142 ++#, c-format ++msgid "Merge folder “%s”?" ++msgstr "フォルダー“%s”をマージしますか?" ++ ++#: src/nautilus-operations-ui-manager.c:145 ++msgid "" ++"Merging will ask for confirmation before replacing any files in the folder " ++"that conflict with the files being copied." ++msgstr "マージする際に、コピーするファイルと衝突するフォルダー中のファイルを置き換える時に確認します。" ++ ++#: src/nautilus-operations-ui-manager.c:150 ++#, c-format ++msgid "An older folder with the same name already exists in “%s”." ++msgstr "同じ名前の古いフォルダーが既に“%s”にあります。" ++ ++#: src/nautilus-operations-ui-manager.c:155 ++#, c-format ++msgid "A newer folder with the same name already exists in “%s”." ++msgstr "同じ名前の新しいフォルダーが既に“%s”にあります。" ++ ++#: src/nautilus-operations-ui-manager.c:160 ++#, c-format ++msgid "Another folder with the same name already exists in “%s”." ++msgstr "同じ名前の他のフォルダーが“%s”にあります。" ++ ++#: src/nautilus-operations-ui-manager.c:166 ++#, c-format ++msgid "Replace folder “%s”?" ++msgstr "フォルダー“%s”を置き換えますか?" ++ ++#: src/nautilus-operations-ui-manager.c:168 ++msgid "Replacing it will remove all files in the folder." ++msgstr "置き換えるとフォルダー中のすべてのファイルが削除されます。" ++ ++#: src/nautilus-operations-ui-manager.c:169 ++#, c-format ++msgid "A folder with the same name already exists in “%s”." ++msgstr "同じ名前のフォルダーが既に“%s”にあります。" ++ ++#: src/nautilus-operations-ui-manager.c:175 ++#, c-format ++msgid "Replace file “%s”?" ++msgstr "ファイル“%s”を置き換えますか?" ++ ++#: src/nautilus-operations-ui-manager.c:178 ++msgid "Replacing it will overwrite its content." ++msgstr "置き換えると内容が上書きされます。" ++ ++#: src/nautilus-operations-ui-manager.c:182 + #, c-format +-msgid "This link cannot be used because its target “%s” doesn't exist." +-msgstr "このリンクはリンク先である“%s”が存在しないので使用できません。" +- +-#: ../src/nautilus-mime-actions.c:564 +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:27 +-msgid "Mo_ve to Trash" +-msgstr "ゴミ箱へ移動する(_V)" ++msgid "An older file with the same name already exists in “%s”." ++msgstr "同じ名前の古いファイルが既に“%s”にあります。" + +-#: ../src/nautilus-mime-actions.c:624 ++#: src/nautilus-operations-ui-manager.c:187 + #, c-format +-msgid "Do you want to run “%s”, or display its contents?" +-msgstr "“%s”を実行しますか? それとも内容を表示しますか?" ++msgid "A newer file with the same name already exists in “%s”." ++msgstr "同じ名前の新しいファイルが既に“%s”にあります。" + +-#: ../src/nautilus-mime-actions.c:626 ++#: src/nautilus-operations-ui-manager.c:192 + #, c-format +-msgid "“%s” is an executable text file." +-msgstr "“%s”は実行可能なテキストファイルです。" ++msgid "Another file with the same name already exists in “%s”." ++msgstr "同じ名前の他のファイルが既に“%s”にあります。" + +-#: ../src/nautilus-mime-actions.c:632 +-msgid "Run in _Terminal" +-msgstr "端末内で実行する(_T)" ++#: src/nautilus-operations-ui-manager.c:267 ++msgid "Original folder" ++msgstr "元のフォルダー" + +-#: ../src/nautilus-mime-actions.c:633 +-msgid "_Display" +-msgstr "表示する(_D)" ++#: src/nautilus-operations-ui-manager.c:268 ++#: src/nautilus-operations-ui-manager.c:300 ++msgid "Items:" ++msgstr "アイテム数:" + +-#: ../src/nautilus-mime-actions.c:971 +-#, c-format +-msgid "This will open %d separate tab." +-msgid_plural "This will open %d separate tabs." +-msgstr[0] "%d 個のタブを別々に開きます。" ++#: src/nautilus-operations-ui-manager.c:272 ++msgid "Original file" ++msgstr "元のファイル" + +-#: ../src/nautilus-mime-actions.c:1036 +-#, c-format +-msgid "Could not display “%s”." +-msgstr "“%s”を表示できませんでした。" ++#: src/nautilus-operations-ui-manager.c:273 ++#: src/nautilus-operations-ui-manager.c:305 ++#: src/nautilus-properties-window.c:3242 ++msgid "Size:" ++msgstr "サイズ:" + +-#: ../src/nautilus-mime-actions.c:1134 +-msgid "The file is of an unknown type" +-msgstr "そのファイルの種類を特定できません" ++#: src/nautilus-operations-ui-manager.c:278 ++#: src/nautilus-operations-ui-manager.c:310 ++#: src/nautilus-properties-window.c:3220 ++msgid "Type:" ++msgstr "種類:" + +-#: ../src/nautilus-mime-actions.c:1138 +-#, c-format +-msgid "There is no application installed for “%s” files" +-msgstr "“%s”の種類のファイルを扱うことが可能なアプリケーションはインストールされていません" ++#: src/nautilus-operations-ui-manager.c:281 ++#: src/nautilus-operations-ui-manager.c:313 ++msgid "Last modified:" ++msgstr "最終更新日時:" + +-#: ../src/nautilus-mime-actions.c:1153 +-msgid "_Select Application" +-msgstr "アプリケーションの選択(_S)" ++#: src/nautilus-operations-ui-manager.c:299 ++msgid "Merge with" ++msgstr "マージするフォルダー" + +-#: ../src/nautilus-mime-actions.c:1189 +-msgid "There was an internal error trying to search for applications:" +-msgstr "アプリケーションを検索している最中に Nautilus の内部エラーが発生しました:" ++#: src/nautilus-operations-ui-manager.c:299 ++#: src/nautilus-operations-ui-manager.c:304 ++msgid "Replace with" ++msgstr "置き換え後のファイル" + +-#: ../src/nautilus-mime-actions.c:1191 +-msgid "Unable to search for application" +-msgstr "アプリケーションを検索できません" ++#: src/nautilus-operations-ui-manager.c:345 ++msgid "Merge" ++msgstr "マージする" + +-#: ../src/nautilus-mime-actions.c:1314 +-#, c-format +-msgid "" +-"There is no application installed for “%s” files.\n" +-"Do you want to search for an application to open this file?" +-msgstr "" +-"“%s”の種類のファイルを扱えるアプリケーションがインストールされていません。\n" +-"この種類のファイルを開くことができるアプリケーションを探しますか?" ++#: src/nautilus-operations-ui-manager.c:368 ++msgid "Merge Folder" ++msgstr "フォルダーのマージ" + +-#: ../src/nautilus-mime-actions.c:1464 +-msgid "Untrusted application launcher" +-msgstr "信用できないアプリケーションのランチャー" ++#: src/nautilus-operations-ui-manager.c:369 ++#: src/nautilus-operations-ui-manager.c:374 ++msgid "File and Folder conflict" ++msgstr "ファイルとフォルダーの衝突" + +-#: ../src/nautilus-mime-actions.c:1467 +-#, c-format +-msgid "The application launcher “%s” has not been marked as trusted. If you do not know the source of this file, launching it may be unsafe." +-msgstr "“%s”というランチャーの安全が確認されていません。ファイルの提供元が不明な場合、そのファイルを起動するのは安全ではありません。" ++#: src/nautilus-operations-ui-manager.c:375 ++msgid "File conflict" ++msgstr "ファイルの衝突" + +-#: ../src/nautilus-mime-actions.c:1482 +-msgid "_Launch Anyway" +-msgstr "とにかく起動する(_L)" ++#. Translators: this is referred to captions under icons. ++#: src/nautilus-preferences-window.c:155 src/nautilus-properties-window.c:4127 ++#: src/nautilus-properties-window.c:4157 ++msgid "None" ++msgstr "なし" + +-#: ../src/nautilus-mime-actions.c:1485 +-msgid "Mark as _Trusted" +-msgstr "信用できるアプリにする(_T)" ++#: src/nautilus-program-choosing.c:329 ++msgid "Sorry, but you cannot execute commands from a remote site." ++msgstr "リモートサイトからコマンドを実行することはできません。" + +-#: ../src/nautilus-mime-actions.c:1714 +-#, c-format +-msgid "This will open %d separate application." +-msgid_plural "This will open %d separate applications." +-msgstr[0] "%d 個のアプリケーションを別々に開きます。" ++#: src/nautilus-program-choosing.c:331 ++msgid "This is disabled due to security considerations." ++msgstr "セキュリティを考慮してこれを無効にします。" + +-#. if it wasn't cancelled show a dialog +-#: ../src/nautilus-mime-actions.c:1791 ../src/nautilus-mime-actions.c:2055 +-#: ../src/gtk/nautilusgtkplacesview.c:1162 +-#: ../src/gtk/nautilusgtkplacesview.c:1235 +-msgid "Unable to access location" +-msgstr "要求された場所にアクセスできません" ++#: src/nautilus-program-choosing.c:343 src/nautilus-program-choosing.c:421 ++msgid "There was an error launching the application." ++msgstr "アプリケーションを起動する際にエラーが発生しました。" + +-#: ../src/nautilus-mime-actions.c:2134 +-msgid "Unable to start location" +-msgstr "場所を起動できません" ++#: src/nautilus-program-choosing.c:372 src/nautilus-program-choosing.c:385 ++msgid "This drop target only supports local files." ++msgstr "アイテムのドロップはローカルのファイルシステムでのみサポートしています。" + +-#: ../src/nautilus-mime-actions.c:2218 +-#, c-format +-msgid "Opening “%s”." +-msgstr "“%s”を開いています。" ++#: src/nautilus-program-choosing.c:373 ++msgid "" ++"To open non-local files copy them to a local folder and then drop them again." ++"" ++msgstr "そのファイルを一度ローカルフォルダーにコピーしてから再ドロップしてください。" + +-#: ../src/nautilus-mime-actions.c:2221 +-#, c-format +-msgid "Opening %d item." +-msgid_plural "Opening %d items." +-msgstr[0] "%d 個のアイテムを開いています。" ++#: src/nautilus-program-choosing.c:386 ++msgid "" ++"To open non-local files copy them to a local folder and then drop them again." ++" The local files you dropped have already been opened." ++msgstr "そのファイルを一度ローカルフォルダーにコピーしてから再ドロップしてください。ドロップしたローカルファイルは既に開かれています。" + +-#: ../src/nautilus-notebook.c:340 +-msgid "Close tab" +-msgstr "タブを閉じます" ++#: src/nautilus-program-choosing.c:419 ++msgid "Details: " ++msgstr "詳細: " + +-#. Translators: this is referred to captions under icons. +-#: ../src/nautilus-preferences-window.c:151 +-#: ../src/nautilus-properties-window.c:3773 +-#: ../src/nautilus-properties-window.c:3800 +-msgid "None" +-msgstr "なし" ++#: src/nautilus-progress-info.c:317 ++msgid "Canceled" ++msgstr "キャンセル済み" + +-#: ../src/nautilus-progress-persistence-handler.c:130 +-#: ../src/nautilus-progress-persistence-handler.c:201 ++#: src/nautilus-progress-info.c:383 src/nautilus-progress-info.c:404 ++msgid "Preparing" ++msgstr "準備中" ++ ++#: src/nautilus-progress-persistence-handler.c:104 ++#: src/nautilus-progress-persistence-handler.c:145 + msgid "File Operations" + msgstr "ファイルの操作" + +-#: ../src/nautilus-progress-persistence-handler.c:132 ++#: src/nautilus-progress-persistence-handler.c:106 + msgid "Show Details" + msgstr "詳細を表示" + +-#: ../src/nautilus-progress-persistence-handler.c:135 +-#: ../src/nautilus-progress-persistence-handler.c:155 ++#: src/nautilus-progress-persistence-handler.c:109 + #, c-format + msgid "%'d file operation active" + msgid_plural "%'d file operations active" + msgstr[0] "%'d 個のファイル操作を実行中です" + +-#: ../src/nautilus-progress-persistence-handler.c:203 ++#: src/nautilus-progress-persistence-handler.c:147 + msgid "All file operations have been successfully completed" + msgstr "すべてのファイル操作が正常に完了しました" + +-#: ../src/nautilus-properties-window.c:492 ++#: src/nautilus-properties-window.c:502 + msgid "You cannot assign more than one custom icon at a time!" + msgstr "独自アイコンは同時に二つ以上割り当てられません。" + +-#: ../src/nautilus-properties-window.c:493 ++#: src/nautilus-properties-window.c:503 + msgid "Please drop just one image to set a custom icon." + msgstr "独自アイコンを使用するには画像を一つだけドロップしてください。" + +-#: ../src/nautilus-properties-window.c:504 ++#: src/nautilus-properties-window.c:520 + msgid "The file that you dropped is not local." + msgstr "ドロップしたファイルはローカルのものではありません。" + +-#: ../src/nautilus-properties-window.c:505 +-#: ../src/nautilus-properties-window.c:511 ++#: src/nautilus-properties-window.c:521 src/nautilus-properties-window.c:528 + msgid "You can only use local images as custom icons." + msgstr "カスタマイズするアイコンに指定できるのはローカルの画像だけです。" + +-#: ../src/nautilus-properties-window.c:510 ++#: src/nautilus-properties-window.c:527 + msgid "The file that you dropped is not an image." + msgstr "ドロップしたファイルは画像ではありません。" + +-#: ../src/nautilus-properties-window.c:625 ++#: src/nautilus-properties-window.c:652 + msgid "_Name:" + msgid_plural "_Names:" + msgstr[0] "名前(_N):" + +-#: ../src/nautilus-properties-window.c:820 +-#, c-format ++#: src/nautilus-properties-window.c:900 + msgid "Properties" + msgstr "プロパティ" + + #. To translators: %s is the name of the folder. +-#: ../src/nautilus-properties-window.c:830 ++#: src/nautilus-properties-window.c:913 + #, c-format + msgctxt "folder" + msgid "%s Properties" + msgstr "%s のプロパティ" + + #. To translators: %s is the name of the file. +-#: ../src/nautilus-properties-window.c:833 ++#: src/nautilus-properties-window.c:918 + #, c-format + msgctxt "file" + msgid "%s Properties" + msgstr "%s のプロパティ" + +-#: ../src/nautilus-properties-window.c:1227 ++#: src/nautilus-properties-window.c:1360 + #, c-format + msgctxt "MIME type description (MIME type)" + msgid "%s (%s)" + msgstr "%s (%s)" + +-#: ../src/nautilus-properties-window.c:1429 ++#: src/nautilus-properties-window.c:1578 + msgid "Cancel Group Change?" + msgstr "グループの変更をキャンセルしますか?" + +-#: ../src/nautilus-properties-window.c:1826 ++#: src/nautilus-properties-window.c:1999 + msgid "Cancel Owner Change?" + msgstr "所有者の変更をキャンセルしますか?" + +-#: ../src/nautilus-properties-window.c:2125 ++#: src/nautilus-properties-window.c:2329 + msgid "nothing" + msgstr "なし" + +-#: ../src/nautilus-properties-window.c:2127 ++#: src/nautilus-properties-window.c:2333 + msgid "unreadable" + msgstr "読み込み不可" + +-#: ../src/nautilus-properties-window.c:2135 ++#: src/nautilus-properties-window.c:2345 + #, c-format + msgid "%'d item, with size %s" + msgid_plural "%'d items, totalling %s" + msgstr[0] "%'d 個のアイテム、サイズは %s" + +-#: ../src/nautilus-properties-window.c:2144 ++#: src/nautilus-properties-window.c:2355 + msgid "(some contents unreadable)" + msgstr "(いくつかのファイルは読み込み不可です)" + +@@ -3374,338 +3587,405 @@ msgstr "(いくつかのファイルは読み込み不可です)" + #. * "Contents:" title to line up with the first line of the + #. * 2-line value. Maybe there's a better way to do this, but I + #. * couldn't think of one. +-#. +-#: ../src/nautilus-properties-window.c:2161 ++#. ++#: src/nautilus-properties-window.c:2372 + msgid "Contents:" + msgstr "内容:" + + #. Translators: "used" refers to the capacity of the filesystem +-#: ../src/nautilus-properties-window.c:2771 ++#: src/nautilus-properties-window.c:3005 + msgid "used" + msgstr "使用中" + + #. Translators: "free" refers to the capacity of the filesystem +-#: ../src/nautilus-properties-window.c:2781 ++#: src/nautilus-properties-window.c:3015 + msgid "free" + msgstr "空き" + +-#: ../src/nautilus-properties-window.c:2783 ++#: src/nautilus-properties-window.c:3017 + msgid "Total capacity:" + msgstr "合計:" + +-#: ../src/nautilus-properties-window.c:2786 ++#: src/nautilus-properties-window.c:3020 + msgid "Filesystem type:" + msgstr "ファイルシステムの種類:" + +-#: ../src/nautilus-properties-window.c:2922 ++#: src/nautilus-properties-window.c:3164 + msgid "Basic" + msgstr "基本" + +-#: ../src/nautilus-properties-window.c:2987 ++#: src/nautilus-properties-window.c:3229 + msgid "Link target:" + msgstr "リンク先:" + +-#: ../src/nautilus-properties-window.c:3006 ++#: src/nautilus-properties-window.c:3252 + msgid "Parent Folder:" + msgstr "親フォルダー:" + +-#: ../src/nautilus-properties-window.c:3014 ++#: src/nautilus-properties-window.c:3261 + msgid "Volume:" + msgstr "ボリューム:" + +-#: ../src/nautilus-properties-window.c:3023 ++#: src/nautilus-properties-window.c:3271 + msgid "Accessed:" + msgstr "アクセス日時:" + +-#: ../src/nautilus-properties-window.c:3027 ++#: src/nautilus-properties-window.c:3275 + msgid "Modified:" + msgstr "更新日時:" + +-#: ../src/nautilus-properties-window.c:3037 ++#: src/nautilus-properties-window.c:3286 + msgid "Free space:" + msgstr "空き容量:" + + #. translators: this gets concatenated to "no read", + #. * "no access", etc. (see following strings) +-#. +-#: ../src/nautilus-properties-window.c:3690 +-#: ../src/nautilus-properties-window.c:3701 +-#: ../src/nautilus-properties-window.c:3713 ++#. ++#: src/nautilus-properties-window.c:4029 src/nautilus-properties-window.c:4044 ++#: src/nautilus-properties-window.c:4061 + msgid "no " + msgstr "無し: " + +-#: ../src/nautilus-properties-window.c:3693 ++#: src/nautilus-properties-window.c:4033 + msgid "list" + msgstr "一覧" + +-#: ../src/nautilus-properties-window.c:3695 ++#: src/nautilus-properties-window.c:4037 + msgid "read" + msgstr "読み込み" + +-#: ../src/nautilus-properties-window.c:3704 ++#: src/nautilus-properties-window.c:4048 + msgid "create/delete" + msgstr "作成/削除" + +-#: ../src/nautilus-properties-window.c:3706 ++#: src/nautilus-properties-window.c:4052 + msgid "write" + msgstr "書き込み" + +-#: ../src/nautilus-properties-window.c:3715 ++#: src/nautilus-properties-window.c:4063 + msgid "access" + msgstr "アクセス" + +-#: ../src/nautilus-properties-window.c:3780 ++#: src/nautilus-properties-window.c:4134 + msgid "List files only" + msgstr "表示のみ" + +-#: ../src/nautilus-properties-window.c:3786 ++#: src/nautilus-properties-window.c:4140 + msgid "Access files" + msgstr "アクセスのみ" + +-#: ../src/nautilus-properties-window.c:3792 ++#: src/nautilus-properties-window.c:4146 + msgid "Create and delete files" + msgstr "作成と削除" + +-#: ../src/nautilus-properties-window.c:3807 ++#: src/nautilus-properties-window.c:4164 + msgid "Read-only" + msgstr "読み込み専用" + +-#: ../src/nautilus-properties-window.c:3813 ++#: src/nautilus-properties-window.c:4170 + msgid "Read and write" + msgstr "読み書き" + +-#: ../src/nautilus-properties-window.c:3840 ++#: src/nautilus-properties-window.c:4198 + msgid "Access:" + msgstr "アクセス:" + +-#: ../src/nautilus-properties-window.c:3842 ++#: src/nautilus-properties-window.c:4202 + msgid "Folder access:" + msgstr "フォルダーのアクセス権:" + +-#: ../src/nautilus-properties-window.c:3844 ++#: src/nautilus-properties-window.c:4206 + msgid "File access:" + msgstr "ファイルのアクセス権:" + +-#: ../src/nautilus-properties-window.c:3933 ++#: src/nautilus-properties-window.c:4302 + msgid "_Owner:" + msgstr "所有者(_O):" + +-#: ../src/nautilus-properties-window.c:3941 +-#: ../src/nautilus-properties-window.c:4203 ++#: src/nautilus-properties-window.c:4312 src/nautilus-properties-window.c:4634 + msgid "Owner:" + msgstr "所有者:" + +-#: ../src/nautilus-properties-window.c:3963 ++#: src/nautilus-properties-window.c:4338 + msgid "_Group:" + msgstr "グループ(_G):" + +-#: ../src/nautilus-properties-window.c:3971 +-#: ../src/nautilus-properties-window.c:4217 ++#: src/nautilus-properties-window.c:4348 src/nautilus-properties-window.c:4648 + msgid "Group:" + msgstr "グループ:" + +-#: ../src/nautilus-properties-window.c:3992 ++#: src/nautilus-properties-window.c:4372 + msgid "Others" + msgstr "その他" + +-#: ../src/nautilus-properties-window.c:4007 ++#: src/nautilus-properties-window.c:4391 + msgid "Execute:" + msgstr "実行:" + +-#: ../src/nautilus-properties-window.c:4010 ++#: src/nautilus-properties-window.c:4394 + msgid "Allow _executing file as program" + msgstr "プログラムとして実行できる(_E)" + +-#: ../src/nautilus-properties-window.c:4186 ++#: src/nautilus-properties-window.c:4617 + msgid "Change Permissions for Enclosed Files" + msgstr "フォルダー内のすべてのファイルの権限を変更する" + +-#: ../src/nautilus-properties-window.c:4190 ++#: src/nautilus-properties-window.c:4621 + msgid "Change" + msgstr "変更" + +-#: ../src/nautilus-properties-window.c:4231 ++#: src/nautilus-properties-window.c:4662 + msgid "Others:" + msgstr "その他:" + +-#: ../src/nautilus-properties-window.c:4272 ++#: src/nautilus-properties-window.c:4705 + msgid "You are not the owner, so you cannot change these permissions." + msgstr "あなたは所有者ではありません (これらのアクセス権を変更することはできません)。" + +-#: ../src/nautilus-properties-window.c:4287 ++#: src/nautilus-properties-window.c:4720 + msgid "Security context:" + msgstr "セキュリティコンテキスト:" + +-#: ../src/nautilus-properties-window.c:4302 ++#: src/nautilus-properties-window.c:4736 + msgid "Change Permissions for Enclosed Files…" + msgstr "フォルダー内のすべてのファイルの権限を変更する…" + +-#: ../src/nautilus-properties-window.c:4312 ++#: src/nautilus-properties-window.c:4749 + #, c-format + msgid "The permissions of “%s” could not be determined." + msgstr "“%s”のアクセス権を確定できませんでした。" + +-#: ../src/nautilus-properties-window.c:4315 ++#: src/nautilus-properties-window.c:4754 + msgid "The permissions of the selected file could not be determined." + msgstr "指定したファイルのアクセス権を決定できませんでした。" + +-#: ../src/nautilus-properties-window.c:4565 ++#: src/nautilus-properties-window.c:5026 + msgid "Open With" + msgstr "開き方" + +-#: ../src/nautilus-properties-window.c:4894 ++#: src/nautilus-properties-window.c:5385 + msgid "Creating Properties window." + msgstr "プロパティウィンドウを作成しています" + +-#: ../src/nautilus-properties-window.c:5178 ++#: src/nautilus-properties-window.c:5716 + msgid "Select Custom Icon" + msgstr "アイコンの選択" + +-#: ../src/nautilus-properties-window.c:5180 ++#: src/nautilus-properties-window.c:5718 + msgid "_Revert" + msgstr "元に戻す(_R)" + + #. Open item is always present +-#: ../src/nautilus-properties-window.c:5182 +-#: ../src/gtk/nautilusgtkplacesview.c:1577 ++#: src/nautilus-properties-window.c:5720 src/gtk/nautilusgtkplacesview.c:1641 + msgid "_Open" + msgstr "開く(_O)" + +-#: ../src/nautilus-query-editor.c:122 ++#: src/nautilus-query.c:517 src/nautilus-search-directory-file.c:167 ++#: src/nautilus-search-directory-file.c:222 ++#: src/nautilus-search-directory-file.c:268 ++#: src/resources/ui/nautilus-preferences-window.ui:907 ++#: src/resources/ui/nautilus-search-popover.ui:341 ++#: src/resources/ui/nautilus-toolbar.ui:143 ++msgid "Search" ++msgstr "検索" ++ ++#: src/nautilus-query.c:520 ++#, c-format ++msgid "Search for “%s”" ++msgstr "“%s”の検索" ++ ++#: src/nautilus-query-editor.c:133 + msgid "Searching locations only" + msgstr "指定の場所のみ検索します" + +-#: ../src/nautilus-query-editor.c:124 ++#: src/nautilus-query-editor.c:137 + msgid "Searching devices only" + msgstr "指定のデバイスのみ検索します" + +-#: ../src/nautilus-query-editor.c:126 ++#: src/nautilus-query-editor.c:141 + msgid "Searching network locations only" + msgstr "指定のネットワークの場所のみ検索します" + +-#: ../src/nautilus-query-editor.c:129 ++#: src/nautilus-query-editor.c:146 + msgid "Remote location - only searching the current folder" + msgstr "リモートの場所 — 現在のフォルダーのみ検索します" + +-#: ../src/nautilus-query-editor.c:131 ++#: src/nautilus-query-editor.c:150 + msgid "Only searching the current folder" + msgstr " 現在のフォルダーのみ検索します" + +-#: ../src/nautilus-search-popover.c:284 ++#: src/nautilus-rename-file-popover-controller.c:191 ++msgid "File name" ++msgstr "ファイル名" ++ ++#: src/nautilus-search-engine.c:238 ++msgid "Unable to complete the requested search" ++msgstr "要求された検索を完了できません" ++ ++#: src/nautilus-search-popover.c:288 + msgid "Show a list to select the date" + msgstr "期間のリストを表示して日付を選択する" + +-#: ../src/nautilus-search-popover.c:290 +-#: ../src/resources/ui/nautilus-search-popover.ui.h:5 ++#: src/nautilus-search-popover.c:294 ++#: src/resources/ui/nautilus-search-popover.ui:96 + msgid "Show a calendar to select the date" + msgstr "カレンダーを表示して日付を選択する" + + #. Add the no date filter element first +-#: ../src/nautilus-search-popover.c:387 ++#: src/nautilus-search-popover.c:390 + msgid "Any time" + msgstr "指定なし" + + #. Other types +-#: ../src/nautilus-search-popover.c:476 ++#: src/nautilus-search-popover.c:487 + msgid "Other Type…" + msgstr "他の種類…" + +-#: ../src/nautilus-search-popover.c:536 ++#: src/nautilus-search-popover.c:547 + msgid "Select type" + msgstr "種類の選択" + +-#: ../src/nautilus-search-popover.c:540 ++#: src/nautilus-search-popover.c:551 + msgid "Select" + msgstr "選択" + +-#: ../src/nautilus-search-popover.c:625 +-#: ../src/resources/ui/nautilus-search-popover.ui.h:3 ++#: src/nautilus-search-popover.c:636 ++#: src/resources/ui/nautilus-search-popover.ui:51 + msgid "Select Dates…" + msgstr "日付を選択する…" + + #. trash +-#: ../src/nautilus-shell-search-provider.c:297 ../src/nautilus-trash-bar.c:198 +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:45 ++#: src/nautilus-shell-search-provider.c:320 src/nautilus-trash-bar.c:208 ++#: src/resources/ui/nautilus-preferences-window.ui:706 + msgid "Trash" + msgstr "ゴミ箱" + +-#: ../src/nautilus-special-location-bar.c:51 +-msgid "Files in this folder will appear in the New Document menu." +-msgstr "このフォルダーにあるファイルが [新しいドキュメント] メニューに表示されます。" ++#: src/nautilus-special-location-bar.c:56 ++msgid "Put files in this folder to use them as templates for new documents." ++msgstr "このフォルダーにファイルを格納し、新規ドキュメントのテンプレートとして使用します。" ++ ++#: src/nautilus-special-location-bar.c:57 ++msgid "" ++"Learn more…" ++msgstr "" ++"詳細はこちら…" + +-#: ../src/nautilus-special-location-bar.c:54 ++#: src/nautilus-special-location-bar.c:63 + msgid "Executable files in this folder will appear in the Scripts menu." + msgstr "このフォルダーにある実行可能なファイルが [スクリプト] メニューに表示されます。" + +-#: ../src/nautilus-trash-bar.c:206 ++#. Set the label of the undo and redo menu items, and activate them appropriately ++#. ++#: src/nautilus-toolbar.c:884 src/resources/ui/nautilus-toolbar-menu.ui:103 ++msgid "_Undo" ++msgstr "元に戻す(_U)" ++ ++#: src/nautilus-toolbar.c:887 src/resources/ui/nautilus-toolbar-menu.ui:111 ++msgid "_Redo" ++msgstr "やり直す(_R)" ++ ++#: src/nautilus-trash-bar.c:216 + msgid "_Restore" +-msgstr "元に戻す(_R)" ++msgstr "復元する(_R)" + +-#: ../src/nautilus-trash-bar.c:209 ++#: src/nautilus-trash-bar.c:219 + msgid "Restore selected items to their original position" + msgstr "選択したアイテムを元あった場所に戻します" + + #. Translators: "Empty" is an action (for the trash) , not a state +-#: ../src/nautilus-trash-bar.c:213 ++#: src/nautilus-trash-bar.c:223 + msgid "_Empty" + msgstr "空にする(_E)" + +-#: ../src/nautilus-trash-bar.c:216 ++#: src/nautilus-trash-bar.c:226 + msgid "Delete all items in the Trash" + msgstr "ゴミ箱にあるすべてのアイテムを削除します" + +-#: ../src/nautilus-window.c:1319 ++# 検索オプションの XXX ago はすべて since XXX ago の意味である ++# 指定のXXX 前以降のファイルがヒットする ++# 確認バージョン: 3.20 ++#. days ++#: src/nautilus-ui-utilities.c:377 ++#, c-format ++msgid "%d day ago" ++msgid_plural "%d days ago" ++msgstr[0] "%d 日前以降" ++ ++#. weeks ++#: src/nautilus-ui-utilities.c:382 ++#, c-format ++msgid "Last week" ++msgid_plural "%d weeks ago" ++msgstr[0] "%d 週前以降" ++ ++#. months ++#: src/nautilus-ui-utilities.c:387 ++#, c-format ++msgid "Last month" ++msgid_plural "%d months ago" ++msgstr[0] "%d か月前以降" ++ ++#. years ++#: src/nautilus-ui-utilities.c:392 ++#, c-format ++msgid "Last year" ++msgid_plural "%d years ago" ++msgstr[0] "%d 年前以降" ++ ++#: src/nautilus-window.c:1406 + msgid "_Properties" + msgstr "プロパティ(_P)" + +-#: ../src/nautilus-window.c:1329 ++#: src/nautilus-window.c:1418 + msgid "_Format…" + msgstr "フォーマット(_F)…" + + #. Translators: only one item has been deleted and %s is its name. +-#: ../src/nautilus-window.c:1585 ++#: src/nautilus-window.c:1688 + #, c-format + msgid "“%s” deleted" + msgstr "“%s”を削除" + + #. Translators: one or more items might have been deleted, and %d + #. * is the count. +-#: ../src/nautilus-window.c:1590 ++#: src/nautilus-window.c:1695 + #, c-format + msgid "%d file deleted" + msgid_plural "%d files deleted" + msgstr[0] "%d 件のファイルを削除" + +-#: ../src/nautilus-window.c:1692 ++#: src/nautilus-window.c:1806 + #, c-format + msgid "Open %s" + msgstr "%s を開く" + +-#: ../src/nautilus-window.c:1780 ++#: src/nautilus-window.c:1897 + msgid "_New Tab" + msgstr "新しいタブ(_N)" + +-#: ../src/nautilus-window.c:1790 ++#: src/nautilus-window.c:1907 + msgid "Move Tab _Left" + msgstr "タブを左へ移動(_L)" + +-#: ../src/nautilus-window.c:1798 ++#: src/nautilus-window.c:1915 + msgid "Move Tab _Right" + msgstr "タブを右へ移動(_R)" + +-#: ../src/nautilus-window.c:1809 ++#: src/nautilus-window.c:1926 + msgid "_Close Tab" + msgstr "タブを閉じる(_C)" + +-#: ../src/nautilus-window.c:2729 ++#: src/nautilus-window.c:2910 + msgid "Access and organize your files." + msgstr "ファイルへアクセスしたり整理したりします。" + + #. Translators should localize the following string + #. * which will be displayed at the bottom of the about + #. * box to give credit to the translator(s). +-#. +-#: ../src/nautilus-window.c:2738 ++#. ++#: src/nautilus-window.c:2919 + msgid "translator-credits" + msgstr "" + "相花毅 \n" +@@ -3722,32 +4002,33 @@ msgstr "" + "Akira Tanaka \n" + "日本GNOMEユーザー会 " + +-#: ../src/nautilus-window-slot.c:1148 ++#: src/nautilus-window-slot.c:1354 + msgid "Unable to display the contents of this folder." + msgstr "このフォルダーの内容を表示できません。" + +-#: ../src/nautilus-window-slot.c:1150 ++#: src/nautilus-window-slot.c:1358 + msgid "This location doesn't appear to be a folder." + msgstr "この場所はフォルダーではないようです。" + +-#: ../src/nautilus-window-slot.c:1155 +-msgid "Unable to find the requested file. Please check the spelling and try again." ++#: src/nautilus-window-slot.c:1367 ++msgid "" ++"Unable to find the requested file. Please check the spelling and try again." + msgstr "要求されたファイルを見つけられませんでした。つづりを確認して再試行してください。" + +-#: ../src/nautilus-window-slot.c:1160 ++#: src/nautilus-window-slot.c:1376 + #, c-format + msgid "“%s” locations are not supported." + msgstr "“%s”の場所はサポートされていません。" + +-#: ../src/nautilus-window-slot.c:1163 ++#: src/nautilus-window-slot.c:1381 + msgid "Unable to handle this kind of location." + msgstr "この種類の場所を扱えません。" + +-#: ../src/nautilus-window-slot.c:1168 ++#: src/nautilus-window-slot.c:1389 + msgid "Unable to access the requested location." + msgstr "要求された場所にアクセスできません。" + +-#: ../src/nautilus-window-slot.c:1171 ++#: src/nautilus-window-slot.c:1395 + msgid "Don't have permission to access the requested location." + msgstr "要求された場所へアクセスする権限がありません。" + +@@ -3755,1044 +4036,1171 @@ msgstr "要求された場所へアクセスする権限がありません。" + #. * the code that guesses web addresses when there's no initial "/". + #. * But this case is also hit for legitimate web addresses when + #. * the proxy is set up wrong. +-#. +-#: ../src/nautilus-window-slot.c:1179 +-msgid "Unable to find the requested location. Please check the spelling or the network settings." ++#. ++#: src/nautilus-window-slot.c:1406 ++msgid "" ++"Unable to find the requested location. Please check the spelling or the " ++"network settings." + msgstr "要求された場所を見つけることができません。つづりやネットワークの設定を確認してください。" + +-#: ../src/nautilus-window-slot.c:1190 ++#: src/nautilus-window-slot.c:1425 + #, c-format + msgid "Unhandled error message: %s" + msgstr "扱えないエラーメッセージ: %s" + +-#: ../src/nautilus-window-slot.c:1338 +-#, c-format ++#: src/nautilus-window-slot.c:1596 + msgid "Unable to load location" + msgstr "場所を読み込みできません" + +-#: ../src/nautilus-x-content-bar.c:124 ++#: src/nautilus-x-content-bar.c:141 + msgid "Open with:" + msgstr "開き方:" + +-#: ../src/resources/gtk/help-overlay.ui.h:1 ++#: src/resources/gtk/help-overlay.ui:13 + msgctxt "shortcut window" + msgid "General" + msgstr "全般" + +-#: ../src/resources/gtk/help-overlay.ui.h:2 ++#: src/resources/gtk/help-overlay.ui:17 + msgctxt "shortcut window" + msgid "New window" + msgstr "新しいウィンドウ" + +-#: ../src/resources/gtk/help-overlay.ui.h:3 ++#: src/resources/gtk/help-overlay.ui:24 + msgctxt "shortcut window" + msgid "Close window or tab" + msgstr "ウィンドウやタブを閉じる" + +-#: ../src/resources/gtk/help-overlay.ui.h:4 ++#: src/resources/gtk/help-overlay.ui:31 + msgctxt "shortcut window" + msgid "Search" + msgstr "検索する" + +-#: ../src/resources/gtk/help-overlay.ui.h:5 +-msgctxt "shortcut window" +-msgid "Bookmarks" +-msgstr "ブックマークウィンドウを開く" +- +-#: ../src/resources/gtk/help-overlay.ui.h:6 ++#: src/resources/gtk/help-overlay.ui:38 + msgctxt "shortcut window" + msgid "Bookmark current location" + msgstr "現在の場所をブックマークする" + +-#: ../src/resources/gtk/help-overlay.ui.h:7 ++#: src/resources/gtk/help-overlay.ui:45 + msgctxt "shortcut window" + msgid "Show help" + msgstr "ヘルプを表示する" + +-#: ../src/resources/gtk/help-overlay.ui.h:8 ++#: src/resources/gtk/help-overlay.ui:52 + msgctxt "shortcut window" + msgid "Shortcuts" + msgstr "ショートカット一覧を表示する" + +-#: ../src/resources/gtk/help-overlay.ui.h:9 ++#: src/resources/gtk/help-overlay.ui:61 + msgctxt "shortcut window" + msgid "Opening" + msgstr "開き方" + +-#: ../src/resources/gtk/help-overlay.ui.h:10 ++#: src/resources/gtk/help-overlay.ui:65 + msgctxt "shortcut window" + msgid "Open" + msgstr "開く" + +-#: ../src/resources/gtk/help-overlay.ui.h:11 ++#: src/resources/gtk/help-overlay.ui:72 + msgctxt "shortcut window" + msgid "Open in new tab" + msgstr "新しいタブで開く" + +-#: ../src/resources/gtk/help-overlay.ui.h:12 ++#: src/resources/gtk/help-overlay.ui:79 + msgctxt "shortcut window" + msgid "Open in new window" + msgstr "新しいウィンドウで開く" + +-#: ../src/resources/gtk/help-overlay.ui.h:13 ++#: src/resources/gtk/help-overlay.ui:86 + msgctxt "shortcut window" + msgid "Open item location (search and recent only)" + msgstr "アイテムの場所を開く (検索と最近のファイルのみ)" + +-#: ../src/resources/gtk/help-overlay.ui.h:14 ++#: src/resources/gtk/help-overlay.ui:93 + msgctxt "shortcut window" + msgid "Open file and close window" + msgstr "ファイルを開いてウィンドウを閉じる" + +-#: ../src/resources/gtk/help-overlay.ui.h:15 ++#: src/resources/gtk/help-overlay.ui:100 + msgctxt "shortcut window" + msgid "Open with default application" + msgstr "デフォルトのアプリケーションで開く" + +-#: ../src/resources/gtk/help-overlay.ui.h:16 ++#: src/resources/gtk/help-overlay.ui:109 + msgctxt "shortcut window" + msgid "Tabs" + msgstr "タブ" + +-#: ../src/resources/gtk/help-overlay.ui.h:17 ++#: src/resources/gtk/help-overlay.ui:113 + msgctxt "shortcut window" + msgid "New tab" + msgstr "新しいタブを開く" + +-#: ../src/resources/gtk/help-overlay.ui.h:18 ++#: src/resources/gtk/help-overlay.ui:120 + msgctxt "shortcut window" + msgid "Go to previous tab" + msgstr "前のタブに切り替える" + +-#: ../src/resources/gtk/help-overlay.ui.h:19 ++#: src/resources/gtk/help-overlay.ui:127 + msgctxt "shortcut window" + msgid "Go to next tab" + msgstr "次のタブに切り替える" + +-#: ../src/resources/gtk/help-overlay.ui.h:20 ++#: src/resources/gtk/help-overlay.ui:134 + msgctxt "shortcut window" + msgid "Open tab" + msgstr "指定位置のタブに切り替える" + +-#: ../src/resources/gtk/help-overlay.ui.h:21 ++#: src/resources/gtk/help-overlay.ui:141 + msgctxt "shortcut window" + msgid "Move tab left" + msgstr "タブを左へ移動する" + +-#: ../src/resources/gtk/help-overlay.ui.h:22 ++#: src/resources/gtk/help-overlay.ui:148 + msgctxt "shortcut window" + msgid "Move tab right" + msgstr "タブを右へ移動する" + +-#: ../src/resources/gtk/help-overlay.ui.h:23 ++#: src/resources/gtk/help-overlay.ui:157 + msgctxt "shortcut window" + msgid "Navigation" + msgstr "移動" + +-#: ../src/resources/gtk/help-overlay.ui.h:24 ++#: src/resources/gtk/help-overlay.ui:161 + msgctxt "shortcut window" + msgid "Go back" + msgstr "左へ移動する" + +-#: ../src/resources/gtk/help-overlay.ui.h:25 ++#: src/resources/gtk/help-overlay.ui:168 + msgctxt "shortcut window" + msgid "Go forward" + msgstr "右へ移動する" + +-#: ../src/resources/gtk/help-overlay.ui.h:26 ++#: src/resources/gtk/help-overlay.ui:175 + msgctxt "shortcut window" + msgid "Go up" + msgstr "上へ移動する" + +-#: ../src/resources/gtk/help-overlay.ui.h:27 ++#: src/resources/gtk/help-overlay.ui:182 + msgctxt "shortcut window" + msgid "Go down" + msgstr "下へ移動する" + +-#: ../src/resources/gtk/help-overlay.ui.h:28 ++#: src/resources/gtk/help-overlay.ui:189 + msgctxt "shortcut window" + msgid "Go to home folder" + msgstr "ホームフォルダーへ移動する" + +-#: ../src/resources/gtk/help-overlay.ui.h:29 ++#: src/resources/gtk/help-overlay.ui:196 + msgctxt "shortcut window" + msgid "Enter location" + msgstr "場所を入力する" + +-#: ../src/resources/gtk/help-overlay.ui.h:30 ++#: src/resources/gtk/help-overlay.ui:203 + msgctxt "shortcut window" + msgid "Location bar with root location" + msgstr "ロケーションバーを開いてルートフォルダーを入力する" + +-#: ../src/resources/gtk/help-overlay.ui.h:31 ++#: src/resources/gtk/help-overlay.ui:210 + msgctxt "shortcut window" + msgid "Location bar with home location" + msgstr "ロケーションバーを開いてホームフォルダーを入力する" + +-#: ../src/resources/gtk/help-overlay.ui.h:32 ++#: src/resources/gtk/help-overlay.ui:219 + msgctxt "shortcut window" + msgid "View" + msgstr "表示" + +-#: ../src/resources/gtk/help-overlay.ui.h:33 ++#: src/resources/gtk/help-overlay.ui:223 + msgctxt "shortcut window" + msgid "Zoom in" + msgstr "拡大する" + +-#: ../src/resources/gtk/help-overlay.ui.h:34 ++#: src/resources/gtk/help-overlay.ui:230 + msgctxt "shortcut window" + msgid "Zoom out" + msgstr "縮小する" + +-#: ../src/resources/gtk/help-overlay.ui.h:35 ++#: src/resources/gtk/help-overlay.ui:237 + msgctxt "shortcut window" + msgid "Reset zoom" + msgstr "サイズをリセットする" + +-#: ../src/resources/gtk/help-overlay.ui.h:36 ++#: src/resources/gtk/help-overlay.ui:244 + msgctxt "shortcut window" + msgid "Refresh view" + msgstr "表示を更新する" + +-#: ../src/resources/gtk/help-overlay.ui.h:37 ++#: src/resources/gtk/help-overlay.ui:251 + msgctxt "shortcut window" + msgid "Show/hide hidden files" + msgstr "隠しファイルの表示/非表示を切り替える" + +-#: ../src/resources/gtk/help-overlay.ui.h:38 ++#: src/resources/gtk/help-overlay.ui:258 + msgctxt "shortcut window" + msgid "Show/hide sidebar" + msgstr "サイドバーの表示/非表示を切り替える" + +-#: ../src/resources/gtk/help-overlay.ui.h:39 ++#: src/resources/gtk/help-overlay.ui:265 + msgctxt "shortcut window" + msgid "Show/hide action menu" + msgstr "アクションメニューの表示/非表示を切り替える" + +-#: ../src/resources/gtk/help-overlay.ui.h:40 ++#: src/resources/gtk/help-overlay.ui:272 + msgctxt "shortcut window" + msgid "List view" + msgstr "一覧表示に切り替える" + +-#: ../src/resources/gtk/help-overlay.ui.h:41 ++#: src/resources/gtk/help-overlay.ui:279 + msgctxt "shortcut window" + msgid "Grid view" + msgstr "グリッド表示に切り替える" + +-#: ../src/resources/gtk/help-overlay.ui.h:42 ++#: src/resources/gtk/help-overlay.ui:288 + msgctxt "shortcut window" + msgid "Editing" + msgstr "編集" + +-#: ../src/resources/gtk/help-overlay.ui.h:43 ++#: src/resources/gtk/help-overlay.ui:292 + msgctxt "shortcut window" + msgid "Create folder" + msgstr "フォルダーを作成する" + +-#: ../src/resources/gtk/help-overlay.ui.h:44 ++#: src/resources/gtk/help-overlay.ui:299 + msgctxt "shortcut window" + msgid "Rename" + msgstr "名前を変更する" + +-#: ../src/resources/gtk/help-overlay.ui.h:45 ++#: src/resources/gtk/help-overlay.ui:306 + msgctxt "shortcut window" + msgid "Move to trash" + msgstr "ゴミ箱へ移動する" + +-#: ../src/resources/gtk/help-overlay.ui.h:46 ++#: src/resources/gtk/help-overlay.ui:313 + msgctxt "shortcut window" + msgid "Delete permanently" + msgstr "完全に削除する" + +-#: ../src/resources/gtk/help-overlay.ui.h:47 ++#: src/resources/gtk/help-overlay.ui:320 ++msgctxt "shortcut window" ++msgid "Cut" ++msgstr "切り取る" ++ ++#: src/resources/gtk/help-overlay.ui:327 + msgctxt "shortcut window" + msgid "Copy" + msgstr "コピーする" + +-#: ../src/resources/gtk/help-overlay.ui.h:48 ++#: src/resources/gtk/help-overlay.ui:334 + msgctxt "shortcut window" + msgid "Paste" + msgstr "貼り付ける" + +-#: ../src/resources/gtk/help-overlay.ui.h:49 ++#: src/resources/gtk/help-overlay.ui:341 + msgctxt "shortcut window" + msgid "Select all" + msgstr "すべて選択する" + +-#: ../src/resources/gtk/help-overlay.ui.h:50 ++#: src/resources/gtk/help-overlay.ui:348 + msgctxt "shortcut window" + msgid "Invert selection" + msgstr "選択を反転する" + +-#: ../src/resources/gtk/help-overlay.ui.h:51 ++#: src/resources/gtk/help-overlay.ui:355 + msgctxt "shortcut window" + msgid "Select items matching" + msgstr "パターンを指定してアイテムを選択する" + +-#: ../src/resources/gtk/help-overlay.ui.h:52 ++#: src/resources/gtk/help-overlay.ui:362 + msgctxt "shortcut window" + msgid "Undo" + msgstr "操作を元に戻す" + +-#: ../src/resources/gtk/help-overlay.ui.h:53 ++#: src/resources/gtk/help-overlay.ui:369 + msgctxt "shortcut window" + msgid "Redo" + msgstr "操作をやり直す" + +-#: ../src/resources/gtk/help-overlay.ui.h:54 ++#: src/resources/gtk/help-overlay.ui:376 + msgctxt "shortcut window" + msgid "Show item properties" + msgstr "アイテムのプロパティを表示する" + +-#: ../src/resources/gtk/menus.ui.h:1 ++#: src/resources/gtk/menus.ui:6 + msgid "New _Window" + msgstr "新しいウィンドウ(_W)" + +-#: ../src/resources/gtk/menus.ui.h:2 ++#: src/resources/gtk/menus.ui:13 + msgid "Sidebar" + msgstr "サイドバー" + +-#: ../src/resources/gtk/menus.ui.h:3 ++#: src/resources/gtk/menus.ui:21 + msgid "Prefere_nces" + msgstr "設定(_N)" + +-#: ../src/resources/gtk/menus.ui.h:4 ++#: src/resources/gtk/menus.ui:27 + msgid "_Keyboard Shortcuts" + msgstr "キーボードショートカット(_K)" + +-#: ../src/resources/gtk/menus.ui.h:5 ++#: src/resources/gtk/menus.ui:31 + msgid "_Help" + msgstr "ヘルプ(_H)" + +-#: ../src/resources/gtk/menus.ui.h:6 ++#: src/resources/gtk/menus.ui:36 + msgid "_About" + msgstr "このアプリケーションについて(_A)" + +-#: ../src/resources/gtk/menus.ui.h:7 ++#: src/resources/gtk/menus.ui:40 + msgid "_Quit" + msgstr "終了(_Q)" + +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:1 +-#: ../src/resources/ui/nautilus-toolbar-action-menu.ui.h:1 ++#: src/resources/ui/nautilus-batch-rename-dialog.ui:20 ++#: src/resources/ui/nautilus-rename-file-popover.ui:39 ++msgid "_Rename" ++msgstr "変更(_R)" ++ ++#: src/resources/ui/nautilus-batch-rename-dialog.ui:54 ++msgid "Rename _using a template" ++msgstr "テンプレートを使って名前を変更(_U)" ++ ++#: src/resources/ui/nautilus-batch-rename-dialog.ui:65 ++msgid "Find and replace _text" ++msgstr "テキストを検索して置換(_T)" ++ ++#: src/resources/ui/nautilus-batch-rename-dialog.ui:138 ++msgid "Add" ++msgstr "追加する" ++ ++#: src/resources/ui/nautilus-batch-rename-dialog.ui:168 ++msgid "Automatic Numbering Order" ++msgstr "自動段落番号" ++ ++#. Translators: This is a noun, not a verb ++#: src/resources/ui/nautilus-batch-rename-dialog.ui:213 ++msgid "Format" ++msgstr "フォーマット" ++ ++#: src/resources/ui/nautilus-batch-rename-dialog.ui:228 ++msgid "Existing Text" ++msgstr "既存テキスト" ++ ++#: src/resources/ui/nautilus-batch-rename-dialog.ui:257 ++msgid "Replace With" ++msgstr "置き換える" ++ ++#: src/resources/ui/nautilus-batch-rename-dialog.ui:284 ++msgctxt "title" ++msgid "Replace" ++msgstr "置き換え" ++ ++#: src/resources/ui/nautilus-batch-rename-dialog.ui:412 ++msgid "Automatic Numbers" ++msgstr "自動番号" ++ ++#: src/resources/ui/nautilus-batch-rename-dialog.ui:414 ++msgid "1, 2, 3, 4" ++msgstr "1, 2, 3, 4" ++ ++#: src/resources/ui/nautilus-batch-rename-dialog.ui:418 ++msgid "01, 02, 03, 04" ++msgstr "01, 02, 03, 04" ++ ++#: src/resources/ui/nautilus-batch-rename-dialog.ui:422 ++msgid "001, 002, 003, 004" ++msgstr "001, 002, 003, 004" ++ ++#: src/resources/ui/nautilus-batch-rename-dialog.ui:427 ++msgid "Metadata" ++msgstr "メタデータ" ++ ++#: src/resources/ui/nautilus-batch-rename-dialog.ui:429 ++msgid "Creation Date" ++msgstr "作成日" ++ ++#: src/resources/ui/nautilus-batch-rename-dialog.ui:439 ++msgid "Season Number" ++msgstr "シーズン番号" ++ ++#: src/resources/ui/nautilus-batch-rename-dialog.ui:444 ++msgid "Episode Number" ++msgstr "エピソード番号" ++ ++#: src/resources/ui/nautilus-batch-rename-dialog.ui:449 ++msgid "Track Number" ++msgstr "トラック番号" ++ ++#: src/resources/ui/nautilus-batch-rename-dialog.ui:454 ++msgid "Artist Name" ++msgstr "アーチスト名" ++ ++#: src/resources/ui/nautilus-batch-rename-dialog.ui:464 ++msgid "Album Name" ++msgstr "アルバム名" ++ ++#: src/resources/ui/nautilus-batch-rename-dialog.ui:471 ++msgid "Original File Name" ++msgstr "元のファイル名" ++ ++#: src/resources/ui/nautilus-files-view-context-menus.ui:5 + msgid "New _Folder" + msgstr "新しいフォルダー(_F)" + +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:2 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:10 + msgid "New _Document" + msgstr "新しいドキュメント(_D)" + +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:3 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:16 + msgid "_Paste" + msgstr "貼り付け(_P)" + +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:4 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:22 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:151 + msgid "Create _Link" + msgstr "リンクを作成する(_L)" + +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:5 +-#: ../src/resources/ui/nautilus-toolbar-action-menu.ui.h:3 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:29 + msgid "Select _All" + msgstr "すべて選択(_A)" + +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:6 +-#: ../src/resources/ui/nautilus-pathbar-context-menu.ui.h:3 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:35 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:256 ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:18 + msgid "P_roperties" + msgstr "プロパティ(_R)" + +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:7 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:42 + msgid "_Keep aligned" + msgstr "配置を維持する(_K)" + +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:8 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:47 + msgid "Organize _Desktop by Name" + msgstr "デスクトップを名前順に整理する(_D)" + +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:9 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:54 + msgid "Change _Background" + msgstr "背景を変更する(_B)" + +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:10 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:72 + msgid "_Scripts" + msgstr "スクリプト(_S)" + +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:11 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:77 + msgid "_Open Scripts Folder" + msgstr "このフォルダーを開く(_O)" + +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:12 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:85 + msgid "_Open Item Location" + msgstr "このアイテムの場所を開く(_O)" + +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:13 +-#: ../src/resources/ui/nautilus-pathbar-context-menu.ui.h:1 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:90 ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:6 + msgid "Open In New _Tab" + msgstr "新しいタブで開く(_T)" + +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:14 +-#: ../src/resources/ui/nautilus-pathbar-context-menu.ui.h:2 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:95 ++#: src/resources/ui/nautilus-pathbar-context-menu.ui:11 + msgid "Open In New _Window" + msgstr "新しいウィンドウで開く(_W)" + +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:15 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:102 + msgid "Open With Other _Application" + msgstr "別のアプリケーションで開く(_A)" + +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:16 +-#: ../src/gtk/nautilusgtkplacesview.c:1632 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:110 ++#: src/gtk/nautilusgtkplacesview.c:1696 + msgid "_Mount" + msgstr "マウント(_M)" + +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:17 +-#: ../src/gtk/nautilusgtkplacesview.c:1622 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:115 ++#: src/gtk/nautilusgtkplacesview.c:1686 + msgid "_Unmount" + msgstr "アンマウント(_U)" + +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:18 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:120 + msgid "_Eject" + msgstr "取り出す(_E)" + +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:20 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:130 + msgid "_Stop" + msgstr "停止(_S)" + +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:21 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:135 + msgid "_Detect Media" + msgstr "メディアを検出(_D)" + +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:22 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:142 + msgid "Cu_t" + msgstr "切り取り(_T)" + +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:23 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:146 + msgid "_Copy" + msgstr "コピー(_C)" + +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:24 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:157 + msgid "_Paste Into Folder" + msgstr "フォルダーへ貼り付け(_P)" + +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:25 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:164 + msgid "Move to…" + msgstr "指定先に移動…" + +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:26 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:168 + msgid "Copy to…" + msgstr "指定先にコピー…" + +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:28 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:179 + msgid "_Delete from Trash" + msgstr "ゴミ箱から削除する(_D)" + +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:29 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:184 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:189 + msgid "_Delete Permanently" + msgstr "完全に削除する(_D)" + +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:30 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:194 + msgid "Empty Trash" + msgstr "ゴミ箱を空にする" + +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:31 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:199 + msgid "_Restore From Trash" + msgstr "ゴミ箱から元に戻す(_R)" + +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:32 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:206 + msgid "Resize Icon…" + msgstr "アイコンのサイズを変更…" + +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:33 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:211 + msgid "Restore Icon's Original Size" + msgstr "アイコンを元のサイズに戻す" + +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:34 +-msgid "Rena_me" ++#: src/resources/ui/nautilus-files-view-context-menus.ui:218 ++msgid "Rena_me…" + msgstr "名前の変更(_M)" + +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:35 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:224 + msgid "Set As Wallpaper" + msgstr "壁紙に設定する" + +-#: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:36 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:231 + msgid "_Remove from Recent" + msgstr "最近開いたファイル一覧から削除(_R)" + +-#: ../src/resources/ui/nautilus-folder-is-empty.ui.h:1 ++#: src/resources/ui/nautilus-files-view-context-menus.ui:239 ++msgid "_Extract Here" ++msgstr "ここに展開する(_E)" ++ ++#: src/resources/ui/nautilus-files-view-context-menus.ui:244 ++msgid "E_xtract to…" ++msgstr "展開する(_X)…" ++ ++#: src/resources/ui/nautilus-files-view-context-menus.ui:249 ++msgid "C_ompress…" ++msgstr "圧縮する(_O)" ++ ++#: src/resources/ui/nautilus-folder-is-empty.ui:30 + msgid "Folder is Empty" + msgstr "フォルダーが空です" + +-#: ../src/resources/ui/nautilus-move-to-trash-shortcut-changed.ui.h:1 ++#: src/resources/ui/nautilus-move-to-trash-shortcut-changed.ui:11 + msgid "Delete Shortcuts Have Changed" + msgstr "ファイル削除のショートカットを変更しました" + +-#: ../src/resources/ui/nautilus-move-to-trash-shortcut-changed.ui.h:2 +-msgid "With the latest version of Files, you no longer need to hold Ctrl to delete — the Delete key will work when pressed on its own." ++#: src/resources/ui/nautilus-move-to-trash-shortcut-changed.ui:12 ++msgid "" ++"With the latest version of Files, you no longer need to hold Ctrl to delete " ++"— the Delete key will work when pressed on its own." + msgstr "最新のファイルマネージャーでは、ファイルを削除するために Ctrl キーを押す必要はありません。Delete キーだけで削除できます。" + +-#: ../src/resources/ui/nautilus-move-to-trash-shortcut-changed.ui.h:3 ++#: src/resources/ui/nautilus-move-to-trash-shortcut-changed.ui:15 + msgid "Got it" + msgstr "OK" + +-#: ../src/resources/ui/nautilus-no-search-results.ui.h:1 ++#: src/resources/ui/nautilus-no-search-results.ui:30 + msgid "No Results Found" + msgstr "見つかりませんでした" + +-#: ../src/resources/ui/nautilus-no-search-results.ui.h:2 +-#: ../src/gtk/nautilusgtkplacesview.ui.h:5 ++#: src/resources/ui/nautilus-no-search-results.ui:44 ++#: src/gtk/nautilusgtkplacesview.ui:406 + msgid "Try a different search" + msgstr "他のキーワードを試してください" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:1 ++#: src/resources/ui/nautilus-preferences-window.ui:12 ++#: src/resources/ui/nautilus-preferences-window.ui:60 ++#: src/resources/ui/nautilus-preferences-window.ui:120 + msgid "Always" + msgstr "常に" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:2 ++#: src/resources/ui/nautilus-preferences-window.ui:15 ++#: src/resources/ui/nautilus-preferences-window.ui:63 ++#: src/resources/ui/nautilus-preferences-window.ui:123 + msgid "Local Files Only" + msgstr "ローカルファイルのみ" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:3 ++#: src/resources/ui/nautilus-preferences-window.ui:18 ++#: src/resources/ui/nautilus-preferences-window.ui:66 ++#: src/resources/ui/nautilus-preferences-window.ui:126 + msgid "Never" + msgstr "しない" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:4 ++#: src/resources/ui/nautilus-preferences-window.ui:29 ++#: src/resources/ui/nautilus-preferences-window.ui:103 + msgid "Small" + msgstr "小" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:5 ++#: src/resources/ui/nautilus-preferences-window.ui:32 ++#: src/resources/ui/nautilus-preferences-window.ui:106 + msgid "Standard" + msgstr "中" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:6 ++#: src/resources/ui/nautilus-preferences-window.ui:35 ++#: src/resources/ui/nautilus-preferences-window.ui:109 + msgid "Large" + msgstr "大" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:9 ++#: src/resources/ui/nautilus-preferences-window.ui:77 + msgid "By Name" + msgstr "名前順" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:10 ++#: src/resources/ui/nautilus-preferences-window.ui:80 + msgid "By Size" + msgstr "サイズ順" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:11 ++#: src/resources/ui/nautilus-preferences-window.ui:83 + msgid "By Type" + msgstr "種類順" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:12 ++#: src/resources/ui/nautilus-preferences-window.ui:86 + msgid "By Modification Date" + msgstr "更新日時順" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:13 ++#: src/resources/ui/nautilus-preferences-window.ui:89 + msgid "By Access Date" + msgstr "アクセス日時順" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:14 ++#: src/resources/ui/nautilus-preferences-window.ui:92 + msgid "By Trashed Date" + msgstr "ゴミ箱への移動日時順" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:15 ++#: src/resources/ui/nautilus-preferences-window.ui:137 + msgid "100 KB" + msgstr "100 KB" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:16 ++#: src/resources/ui/nautilus-preferences-window.ui:140 + msgid "500 KB" + msgstr "500 KB" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:17 ++#: src/resources/ui/nautilus-preferences-window.ui:143 + msgid "1 MB" + msgstr "1 MB" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:18 ++#: src/resources/ui/nautilus-preferences-window.ui:146 + msgid "3 MB" + msgstr "3 MB" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:19 ++#: src/resources/ui/nautilus-preferences-window.ui:149 + msgid "5 MB" + msgstr "5 MB" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:20 ++#: src/resources/ui/nautilus-preferences-window.ui:152 + msgid "10 MB" + msgstr "10 MB" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:21 ++#: src/resources/ui/nautilus-preferences-window.ui:155 + msgid "100 MB" + msgstr "100 MB" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:22 ++#: src/resources/ui/nautilus-preferences-window.ui:158 + msgid "1 GB" + msgstr "1 GB" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:23 ++#: src/resources/ui/nautilus-preferences-window.ui:161 + msgid "2 GB" + msgstr "2 GB" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:24 ++#: src/resources/ui/nautilus-preferences-window.ui:164 + msgid "4 GB" + msgstr "4 GB" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:25 ++#: src/resources/ui/nautilus-preferences-window.ui:170 + msgid "Preferences" + msgstr "設定" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:26 +-#: ../src/resources/ui/nautilus-toolbar-view-menu.ui.h:1 ++#: src/resources/ui/nautilus-preferences-window.ui:198 ++#: src/resources/ui/nautilus-toolbar-view-menu.ui:98 + msgid "Sort" + msgstr "並べ替え" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:27 ++#: src/resources/ui/nautilus-preferences-window.ui:212 + msgid "Sort _folders before files" + msgstr "フォルダーをファイルより前に配置する(_F)" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:28 ++#: src/resources/ui/nautilus-preferences-window.ui:258 + msgid "Allow folders to be _expanded" + msgstr "フォルダーを展開可能にする(_E)" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:29 ++#: src/resources/ui/nautilus-preferences-window.ui:290 + msgid "Icon View Captions" + msgstr "アイコン表示のキャプション" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:30 ++#: src/resources/ui/nautilus-preferences-window.ui:306 + msgid "" + "Add information to be displayed beneath file and folder names.\n" + "More information will appear when zooming closer." +-msgstr "" +-"ファイル/フォルダー名の下に表示する表示する情報を追加できます。\n" ++msgstr "ファイル/フォルダー名の下に表示する表示する情報を追加できます。\n" + "拡大するとより多くの情報が表示されます。" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:32 ++#. Translators: This is an ordinal number ++#: src/resources/ui/nautilus-preferences-window.ui:425 + msgctxt "the n-th position of an icon caption" + msgid "Second" + msgstr "2番目" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:33 ++#. Translators: This is an ordinal number ++#: src/resources/ui/nautilus-preferences-window.ui:440 + msgctxt "the n-th position of an icon caption" + msgid "Third" + msgstr "3番目" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:34 ++#. Translators: This is an ordinal number ++#: src/resources/ui/nautilus-preferences-window.ui:455 + msgctxt "the n-th position of an icon caption" + msgid "First" + msgstr "1番目" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:35 ++#: src/resources/ui/nautilus-preferences-window.ui:489 + msgid "Views" + msgstr "表示" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:36 ++#: src/resources/ui/nautilus-preferences-window.ui:512 + msgid "Open Action" + msgstr "開き方" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:37 ++#: src/resources/ui/nautilus-preferences-window.ui:526 + msgid "_Single click to open items" + msgstr "シングルクリックでアイテムを開く(_S)" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:38 ++#: src/resources/ui/nautilus-preferences-window.ui:544 + msgid "_Double click to open items" + msgstr "ダブルクリックでアイテムを開く(_D)" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:39 ++#: src/resources/ui/nautilus-preferences-window.ui:577 + msgid "Link Creation" + msgstr "リンクの作成" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:40 ++#: src/resources/ui/nautilus-preferences-window.ui:591 + msgid "Show action to create symbolic _links" + msgstr "シンボリックリンクを作成するアクションを表示する(_L)" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:41 ++#: src/resources/ui/nautilus-preferences-window.ui:623 + msgid "Executable Text Files" + msgstr "実行可能なテキストファイル" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:42 ++#: src/resources/ui/nautilus-preferences-window.ui:637 + msgid "_Display them" + msgstr "内容を表示する(_D)" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:43 ++#: src/resources/ui/nautilus-preferences-window.ui:655 + msgid "_Run them" + msgstr "実行する(_R)" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:44 ++#: src/resources/ui/nautilus-preferences-window.ui:673 + msgid "_Ask what to do" + msgstr "どうするか確認する(_A)" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:46 ++#: src/resources/ui/nautilus-preferences-window.ui:720 + msgid "Ask before _emptying the Trash" + msgstr "ゴミ箱を空にする前に確認する(_E)" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:47 ++#: src/resources/ui/nautilus-preferences-window.ui:737 + msgid "Show action to _permanently delete files and folders" + msgstr "ファイルやフォルダーを完全に削除するアクションを表示する(_P)" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:48 ++#: src/resources/ui/nautilus-preferences-window.ui:769 ++msgid "Compressed Files" ++msgstr "圧縮ファイル" ++ ++#: src/resources/ui/nautilus-preferences-window.ui:783 ++msgid "E_xtract the files on open" ++msgstr "ファイルを展開し開く(_X)" ++ ++#: src/resources/ui/nautilus-preferences-window.ui:815 + msgid "Behavior" + msgstr "動作" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:49 ++#: src/resources/ui/nautilus-preferences-window.ui:845 + msgid "Choose the order of information to appear in the list view." + msgstr "一覧表示で表示する情報の順番を選択してください。" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:50 ++#: src/resources/ui/nautilus-preferences-window.ui:883 + msgid "List Columns" + msgstr "一覧の項目" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:52 ++#: src/resources/ui/nautilus-preferences-window.ui:923 + msgid "Search in subfolders:" + msgstr "サブフォルダー内の検索:" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:53 ++#: src/resources/ui/nautilus-preferences-window.ui:934 + msgid "_On this computer only" + msgstr "このコンピューターのフォルダーのみ(_O)" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:54 ++#: src/resources/ui/nautilus-preferences-window.ui:951 + msgid "_All locations" + msgstr "すべての場所(_A)" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:55 ++#: src/resources/ui/nautilus-preferences-window.ui:968 + msgid "_Never" + msgstr "しない(_N)" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:56 ++#: src/resources/ui/nautilus-preferences-window.ui:1000 + msgid "Thumbnails" + msgstr "サムネイル" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:57 ++#: src/resources/ui/nautilus-preferences-window.ui:1016 + msgid "Show thumbnails:" + msgstr "サムネイルの表示:" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:58 ++#: src/resources/ui/nautilus-preferences-window.ui:1027 + msgid "_Files on this computer only" + msgstr "このコンピューターのファイルのみ(_F)" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:59 ++#: src/resources/ui/nautilus-preferences-window.ui:1044 + msgid "A_ll files" + msgstr "すべてのファイル(_L)" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:60 ++#: src/resources/ui/nautilus-preferences-window.ui:1061 + msgid "N_ever" + msgstr "しない(_E)" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:61 ++#: src/resources/ui/nautilus-preferences-window.ui:1085 + msgid "Onl_y for files smaller than:" + msgstr "表示するファイルの最大サイズ(_Y):" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:62 ++#: src/resources/ui/nautilus-preferences-window.ui:1138 + msgid "File count" + msgstr "ファイル数の算出" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:63 ++#: src/resources/ui/nautilus-preferences-window.ui:1154 + msgid "Count number of files in folders:" + msgstr "フォルダー内のファイル数の算出:" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:64 ++#: src/resources/ui/nautilus-preferences-window.ui:1165 + msgid "F_olders in this computer only" + msgstr "このコンピューターのフォルダーのみ(_O)" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:65 ++#: src/resources/ui/nautilus-preferences-window.ui:1182 + msgid "All folder_s" + msgstr "すべてのフォルダー(_S)" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:66 ++#: src/resources/ui/nautilus-preferences-window.ui:1199 + msgid "Ne_ver" + msgstr "しない(_V)" + +-#: ../src/resources/ui/nautilus-preferences-window.ui.h:67 ++#: src/resources/ui/nautilus-preferences-window.ui:1231 + msgid "Search & Preview" + msgstr "検索とプレビュー" + +-#: ../src/resources/ui/nautilus-rename-file-popover.ui.h:2 +-msgid "_Rename" +-msgstr "変更(_R)" +- +-#: ../src/resources/ui/nautilus-search-popover.ui.h:1 ++#: src/resources/ui/nautilus-search-popover.ui:18 + msgid "When" + msgstr "日付" + +-#: ../src/resources/ui/nautilus-search-popover.ui.h:2 ++#: src/resources/ui/nautilus-search-popover.ui:45 + msgid "Select a date" + msgstr "日付を選択する" + +-#: ../src/resources/ui/nautilus-search-popover.ui.h:4 ++#: src/resources/ui/nautilus-search-popover.ui:67 + msgid "Clear the currently selected date" + msgstr "選択中の日付をクリアする" + +-#: ../src/resources/ui/nautilus-search-popover.ui.h:6 ++#: src/resources/ui/nautilus-search-popover.ui:127 + msgid "Since…" + msgstr "期間…" + +-#: ../src/resources/ui/nautilus-search-popover.ui.h:7 ++#: src/resources/ui/nautilus-search-popover.ui:194 + msgid "Last _modified" + msgstr "最終更新日時(_M)" + +-#: ../src/resources/ui/nautilus-search-popover.ui.h:8 ++#: src/resources/ui/nautilus-search-popover.ui:211 + msgid "Last _used" + msgstr "最終使用日時(_U)" + +-#: ../src/resources/ui/nautilus-search-popover.ui.h:9 ++#: src/resources/ui/nautilus-search-popover.ui:240 + msgid "What" + msgstr "種類" + +-#: ../src/resources/ui/nautilus-search-popover.ui.h:10 ++#: src/resources/ui/nautilus-search-popover.ui:264 + msgid "Which file types will be searched" + msgstr "検索対象のファイルの種類を選択する" + +-#: ../src/resources/ui/nautilus-search-popover.ui.h:13 ++#: src/resources/ui/nautilus-search-popover.ui:359 + msgid "Full Text" + msgstr "フルテキスト" + +-#: ../src/resources/ui/nautilus-search-popover.ui.h:14 ++#: src/resources/ui/nautilus-search-popover.ui:363 + msgid "Search on the file content and name" + msgstr "ファイルの内容とファイル名を検索する" + +-#: ../src/resources/ui/nautilus-search-popover.ui.h:15 ++#: src/resources/ui/nautilus-search-popover.ui:377 + msgid "File Name" + msgstr "ファイル名" + +-#: ../src/resources/ui/nautilus-search-popover.ui.h:16 ++#: src/resources/ui/nautilus-search-popover.ui:381 + msgid "Search only on the file name" + msgstr "ファイル名のみ検索する" + +-#: ../src/resources/ui/nautilus-toolbar-action-menu.ui.h:2 +-msgid "New _Tab" +-msgstr "新しいタブ(_T)" ++#: src/resources/ui/nautilus-toolbar-menu.ui:23 ++msgid "New folder" ++msgstr "新しいフォルダー" + +-#: ../src/resources/ui/nautilus-toolbar-action-menu.ui.h:4 +-msgid "Enter _Location" +-msgstr "場所を入力(_L)" ++#: src/resources/ui/nautilus-toolbar-menu.ui:42 ++msgid "Bookmark this location" ++msgstr "この場所をブックマーク" + +-#: ../src/resources/ui/nautilus-toolbar-action-menu.ui.h:5 +-msgid "_Bookmark this Location" +-msgstr "この場所をブックマーク(_B)" ++#: src/resources/ui/nautilus-toolbar-menu.ui:61 ++msgid "New tab" ++msgstr "新しいタブ" + +-#: ../src/resources/ui/nautilus-toolbar.ui.h:1 ++#: src/resources/ui/nautilus-toolbar.ui:92 + msgid "Action menu" + msgstr "アクションメニュー" + +-#: ../src/resources/ui/nautilus-toolbar.ui.h:2 ++#: src/resources/ui/nautilus-toolbar.ui:93 + msgid "Open action menu" + msgstr "アクションメニューを開きます" + +-#: ../src/resources/ui/nautilus-toolbar.ui.h:3 +-msgid "View menu" +-msgstr "表示メニュー" ++#: src/resources/ui/nautilus-toolbar.ui:117 ++msgid "View mode toggle" ++msgstr "表示モードの切り替え" + +-#: ../src/resources/ui/nautilus-toolbar.ui.h:4 +-msgid "Open view menu" +-msgstr "表示メニューを開きます" ++#: src/resources/ui/nautilus-toolbar.ui:118 ++msgid "Toggle between grid and list view" ++msgstr "グリッド表示と一覧表示の切り替え" + +-#: ../src/resources/ui/nautilus-toolbar.ui.h:6 ++#: src/resources/ui/nautilus-toolbar.ui:144 + msgid "Search files" + msgstr "ファイルを検索します" + +-#: ../src/resources/ui/nautilus-toolbar.ui.h:7 ++#: src/resources/ui/nautilus-toolbar.ui:176 + msgid "Operations in progress" + msgstr "処理中です" + +-#: ../src/resources/ui/nautilus-toolbar.ui.h:8 ++#: src/resources/ui/nautilus-toolbar.ui:177 + msgid "Open operations in progress" + msgstr "アイテムを開いています" + ++#: src/resources/ui/nautilus-toolbar-view-menu.ui:21 ++msgid "Zoom out" ++msgstr "ズームアウト" ++ ++#: src/resources/ui/nautilus-toolbar-view-menu.ui:40 ++msgid "Reset zoom" ++msgstr "ズームをリセットする" ++ ++#: src/resources/ui/nautilus-toolbar-view-menu.ui:58 ++msgid "Zoom in" ++msgstr "ズームイン" ++ + #. This is used to sort by name in the toolbar view menu +-#: ../src/resources/ui/nautilus-toolbar-view-menu.ui.h:3 ++#: src/resources/ui/nautilus-toolbar-view-menu.ui:109 + msgctxt "Sort Criterion" +-msgid "_Name" +-msgstr "名前(_N)" ++msgid "_A-Z" ++msgstr "昇順(_A)" + +-#: ../src/resources/ui/nautilus-toolbar-view-menu.ui.h:4 ++#. This is used to sort by name, in descending order in the toolbar view menu ++#: src/resources/ui/nautilus-toolbar-view-menu.ui:118 ++msgctxt "Sort Criterion" ++msgid "_Z-A" ++msgstr "降順(_Z)" ++ ++#: src/resources/ui/nautilus-toolbar-view-menu.ui:127 ++msgid "Last _Modified" ++msgstr "最終更新日時(_M)" ++ ++#: src/resources/ui/nautilus-toolbar-view-menu.ui:136 ++msgid "_First Modified" ++msgstr "初回更新日時(_F)" ++ ++#: src/resources/ui/nautilus-toolbar-view-menu.ui:145 + msgid "_Size" + msgstr "サイズ(_S)" + +-#: ../src/resources/ui/nautilus-toolbar-view-menu.ui.h:5 ++#: src/resources/ui/nautilus-toolbar-view-menu.ui:154 + msgid "_Type" + msgstr "種類(_T)" + +-#: ../src/resources/ui/nautilus-toolbar-view-menu.ui.h:6 +-msgid "Last _Modified" +-msgstr "最終更新日時(_M)" +- +-#: ../src/resources/ui/nautilus-toolbar-view-menu.ui.h:7 ++#: src/resources/ui/nautilus-toolbar-view-menu.ui:163 + msgid "Last _Trashed" + msgstr "削除日時(_T)" + +-#: ../src/resources/ui/nautilus-toolbar-view-menu.ui.h:8 +-msgid "Search _Relevance" +-msgstr "検索の関連度(_R)" +- +-#: ../src/resources/ui/nautilus-toolbar-view-menu.ui.h:9 +-msgid "Re_verse Order" +-msgstr "逆順(_V)" +- +-#: ../src/resources/ui/nautilus-toolbar-view-menu.ui.h:10 ++#: src/resources/ui/nautilus-toolbar-view-menu.ui:182 + msgid "_Visible Columns…" + msgstr "表示する項目(_V)" + +-#: ../src/resources/ui/nautilus-toolbar-view-menu.ui.h:11 ++#: src/resources/ui/nautilus-toolbar-view-menu.ui:190 + msgid "Show _Hidden Files" + msgstr "隠しファイルを表示する(_H)" + +-#: ../src/resources/ui/nautilus-toolbar-view-menu.ui.h:12 +-msgid "_Reload" +-msgstr "再読み込み(_R)" ++#: src/resources/ui/nautilus-toolbar-view-menu.ui:198 ++msgid "R_eload" ++msgstr "リロード(_E)" + +-#: ../src/resources/ui/nautilus-toolbar-view-menu.ui.h:13 ++#: src/resources/ui/nautilus-toolbar-view-menu.ui:206 + msgid "St_op" + msgstr "停止(_O)" + + # これはWindowタイトルらしいのでニーモニック不要? + # そもそもUIとして表示できるかどうかも不明 +-#: ../src/resources/ui/nautilus-window.ui.h:1 ++#: src/resources/ui/nautilus-window.ui:5 + msgid "_Files" + msgstr "ファイル" + +-#: ../src/gtk/nautilusgtkplacesview.c:880 ++#: src/gtk/nautilusgtkplacesview.c:891 + msgid "Searching for network locations" + msgstr "ネットワークの場所を探しています" + +-#: ../src/gtk/nautilusgtkplacesview.c:887 ++#: src/gtk/nautilusgtkplacesview.c:898 + msgid "No network locations found" + msgstr "ネットワークの場所が見つかりませんでした" + +-#: ../src/gtk/nautilusgtkplacesview.c:1052 ++#: src/gtk/nautilusgtkplacesview.c:1079 + msgid "Computer" + msgstr "コンピューター" + + #. Restore from Cancel to Connect +-#: ../src/gtk/nautilusgtkplacesview.c:1179 +-#: ../src/gtk/nautilusgtkplacesview.ui.h:7 ++#: src/gtk/nautilusgtkplacesview.c:1208 src/gtk/nautilusgtkplacesview.ui:449 + msgid "Con_nect" + msgstr "接続する(_N)" + + #. if it wasn't cancelled show a dialog +-#: ../src/gtk/nautilusgtkplacesview.c:1298 ++#: src/gtk/nautilusgtkplacesview.c:1328 + msgid "Unable to unmount volume" + msgstr "ボリュームをアンマウントできません" + + #. Allow to cancel the operation +-#: ../src/gtk/nautilusgtkplacesview.c:1380 ++#: src/gtk/nautilusgtkplacesview.c:1429 + msgid "Cance_l" + msgstr "キャンセル(_L)" + +-#: ../src/gtk/nautilusgtkplacesview.c:1587 ++#: src/gtk/nautilusgtkplacesview.c:1651 + msgid "Open in New _Tab" + msgstr "新しいタブで開く(_T)" + +-#: ../src/gtk/nautilusgtkplacesview.c:1598 ++#: src/gtk/nautilusgtkplacesview.c:1662 + msgid "Open in New _Window" + msgstr "新しいウィンドウで開く(_W)" + +-#: ../src/gtk/nautilusgtkplacesview.c:1797 ++#: src/gtk/nautilusgtkplacesview.c:1837 + msgid "Unable to get remote server location" + msgstr "指定したリモートサーバーの場所にアクセスできません" + +-#: ../src/gtk/nautilusgtkplacesview.c:1934 +-#: ../src/gtk/nautilusgtkplacesview.c:1943 ++#: src/gtk/nautilusgtkplacesview.c:1976 src/gtk/nautilusgtkplacesview.c:1985 + msgid "Networks" + msgstr "ネットワーク" + +-#: ../src/gtk/nautilusgtkplacesview.c:1934 +-#: ../src/gtk/nautilusgtkplacesview.c:1943 ++#: src/gtk/nautilusgtkplacesview.c:1976 src/gtk/nautilusgtkplacesview.c:1985 + msgid "On This Computer" + msgstr "このコンピューター" + + #. Translators: respectively, free and total space of the drive. The plural form + #. * should be based on the free space available. + #. * i.e. 1 GB / 24 GB available. +-#. +-#: ../src/gtk/nautilusgtkplacesviewrow.c:134 ++#. ++#: src/gtk/nautilusgtkplacesviewrow.c:136 + #, c-format + msgid "%s / %s available" + msgid_plural "%s / %s available" + msgstr[0] "%s / %s の空き容量" + +-#: ../src/gtk/nautilusgtkplacesviewrow.c:472 ++#: src/gtk/nautilusgtkplacesviewrow.c:483 + msgid "Disconnect" + msgstr "切断" + +-#: ../src/gtk/nautilusgtkplacesviewrow.c:472 +-#: ../src/gtk/nautilusgtkplacesviewrow.ui.h:1 ++#: src/gtk/nautilusgtkplacesviewrow.c:483 ++#: src/gtk/nautilusgtkplacesviewrow.ui:72 + msgid "Unmount" + msgstr "アンマウント" + +-#. Translators: Server as any successfully connected network address +-#: ../src/gtk/nautilusgtkplacesview.ui.h:2 +-msgid "No recent servers found" +-msgstr "最近使用したサーバーなし" +- +-#: ../src/gtk/nautilusgtkplacesview.ui.h:3 +-msgid "Recent Servers" +-msgstr "最近使用したサーバー" +- +-#: ../src/gtk/nautilusgtkplacesview.ui.h:4 +-msgid "No results found" +-msgstr "見つかりませんでした" +- +-#: ../src/gtk/nautilusgtkplacesview.ui.h:6 +-msgid "Connect to _Server" +-msgstr "サーバーへ接続(_S)" +- +-#: ../src/gtk/nautilusgtkplacesview.ui.h:8 +-msgid "Enter server address…" +-msgstr "サーバーのアドレスを入力…" +- +-#~ msgid "The mime type of the file." +-#~ msgstr "ファイルの MIME 型" +- +-#~ msgid "Unable to rename desktop file" +-#~ msgstr "デスクトップのファイル名を変更できません" ++#: src/gtk/nautilusgtkplacesview.ui:30 ++msgid "Server Addresses" ++msgstr "サーバーのアドレス" + +-#~ msgid "Untitled %s" +-#~ msgstr "無題の%s" ++#: src/gtk/nautilusgtkplacesview.ui:43 ++msgid "" ++"Server addresses are made up of a protocol prefix and an address. Examples:" ++msgstr "サーバーのアドレスは、プロトコルのプレフィックスとアドレスで構成されます。例:" + +-#~ msgid "Nautilus 3.0 deprecated this directory and tried migrating this configuration to ~/.config/nautilus" +-#~ msgstr "Nautilus 3.0 ではこのディレクトリの使用は非推奨となりました。~/.config/nautilus への設定内容の移行を試みました。" ++#: src/gtk/nautilusgtkplacesview.ui:57 ++msgid "smb://foo.example.com, ssh://192.168.0.1" ++msgstr "smb://foo.example.com, ssh://192.168.0.1" + +-#~ msgid "No bookmarks defined" +-#~ msgstr "ブックマークは定義されていません" ++#: src/gtk/nautilusgtkplacesview.ui:78 ++msgid "Available Protocols" ++msgstr "利用可能なプロトコル" + +-#~ msgid "Remove" +-#~ msgstr "削除" ++#: src/gtk/nautilusgtkplacesview.ui:92 ++msgid "AppleTalk" ++msgstr "AppleTalk" + +-#~ msgid "Move Up" +-#~ msgstr "上げる" ++#: src/gtk/nautilusgtkplacesview.ui:103 ++msgid "File Transfer Protocol" ++msgstr "File Transfer Protocol" + +-#~ msgid "Move Down" +-#~ msgstr "下げる" ++#: src/gtk/nautilusgtkplacesview.ui:114 ++msgid "Network File System" ++msgstr "Network File System" + +-#~ msgctxt "Bookmark" +-#~ msgid "_Name" +-#~ msgstr "名前(_N)" ++#: src/gtk/nautilusgtkplacesview.ui:125 ++msgid "Samba" ++msgstr "Samba" + +-#~ msgid "Files Preferences" +-#~ msgstr "設定" ++#: src/gtk/nautilusgtkplacesview.ui:136 ++msgid "SSH File Transfer Protocol" ++msgstr "SSH File Transfer Protocol" + +-#~ msgid "Default View" +-#~ msgstr "デフォルトの表示" ++#: src/gtk/nautilusgtkplacesview.ui:147 ++msgid "WebDAV" ++msgstr "WebDAV" + +-#~ msgid "_Arrange items:" +-#~ msgstr "アイテムの並び順(_A):" ++#: src/gtk/nautilusgtkplacesview.ui:158 ++msgid "Prefix" ++msgstr "プレフィックス" + +-#~ msgid "_Run executable text files when they are opened" +-#~ msgstr "開いたら実行可能なテキストファイルを実行する(_R)" ++#. Translators: do not translate ftp:// and ftps:// ++#: src/gtk/nautilusgtkplacesview.ui:183 ++msgid "ftp:// or ftps://" ++msgstr "ftp:// または ftps://" + +-#~ msgid "_View executable text files when they are opened" +-#~ msgstr "開いたら実行可能なテキストファイルの中身を表示する(_V)" ++#: src/gtk/nautilusgtkplacesview.ui:205 ++msgid "smb://" ++msgstr "smb://" + +-#~ msgid "_Ask each time" +-#~ msgstr "毎回確認する(_A)" ++#. Translators: do not translate sftp:// and ssh:// ++#: src/gtk/nautilusgtkplacesview.ui:216 ++msgid "sftp:// or ssh://" ++msgstr "sftp:// または ssh://" + +-#~ msgid "Navigate folders in a tree" +-#~ msgstr "ツリー形式でフォルダーを表示する" ++#. Translators: do not translate dav:// and davs:// ++#: src/gtk/nautilusgtkplacesview.ui:227 ++msgid "dav:// or davs://" ++msgstr "dav:// または davs://" + +-#~ msgid "Display" +-#~ msgstr "アイテム" ++#. Translators: Server as any successfully connected network address ++#: src/gtk/nautilusgtkplacesview.ui:267 ++msgid "No recent servers found" ++msgstr "最近使用したサーバーなし" + +-#~ msgid "File Type" +-#~ msgstr "ファイルの種類" ++#: src/gtk/nautilusgtkplacesview.ui:290 ++msgid "Recent Servers" ++msgstr "最近使用したサーバー" + +-#~ msgid "Any" +-#~ msgstr "任意" ++#: src/gtk/nautilusgtkplacesview.ui:393 ++msgid "No results found" ++msgstr "見つかりませんでした" + +-#~ msgid "Remove this criterion from the search" +-#~ msgstr "この検索条件を削除します" ++#: src/gtk/nautilusgtkplacesview.ui:439 ++msgid "Connect to _Server" ++msgstr "サーバーへ接続(_S)" + +-#~ msgid "Current" +-#~ msgstr "現在" ++#: src/gtk/nautilusgtkplacesview.ui:472 ++msgid "Enter server address…" ++msgstr "サーバーのアドレスを入力…" + +-#~ msgid "Add a new criterion to this search" +-#~ msgstr "この検索に新しい条件を追加します" +-- +2.12.0 + diff --git a/SPECS/nautilus.spec b/SPECS/nautilus.spec new file mode 100644 index 0000000..87138d6 --- /dev/null +++ b/SPECS/nautilus.spec @@ -0,0 +1,1839 @@ +%global glib2_version 2.49.1 +%global gnome_desktop3_version 3.0.0 +%global gtk3_version 3.21.6 +%global libxml2_version 2.7.8 +%global libexif_version 0.6.20 +%global exempi_version 2.1.0 +%global gsettings_desktop_schemas_version 3.8.0 + +Name: nautilus +Version: 3.22.3 +Release: 4%{?dist} +Summary: File manager for GNOME + +License: GPLv2+ +URL: https://wiki.gnome.org/Apps/Nautilus +Source0: https://download.gnome.org/sources/%{name}/3.22/%{name}-%{version}.tar.xz + +# Don't use gnome-autoar which we don't currently have in RHEL 7.4 +Patch0: 0001-general-remove-gnome-autoar.patch +Patch1: 0001-translation-Add-Japanese.patch +Patch2: 0001-mime-actions-use-file-metadata-for-trusting-desktop-.patch + +BuildRequires: pkgconfig(exempi-2.0) >= %{exempi_version} +BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} +BuildRequires: pkgconfig(gnome-desktop-3.0) >= %{gnome_desktop3_version} +BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: pkgconfig(gsettings-desktop-schemas) >= %{gsettings_desktop_schemas_version} +BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version} +BuildRequires: pkgconfig(libexif) >= %{libexif_version} +BuildRequires: pkgconfig(libxml-2.0) >= %{libxml2_version} +BuildRequires: pkgconfig(tracker-sparql-1.0) +BuildRequires: pkgconfig(x11) +BuildRequires: /usr/bin/appstream-util +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: intltool >= 0.40.6-2 +BuildRequires: libselinux-devel +# For patch0 +BuildRequires: autoconf automake libtool +BuildRequires: autoconf-archive +BuildRequires: gettext-devel +BuildRequires: gtk-doc + +Requires: glib2%{_isa} >= %{glib2_version} +Requires: gsettings-desktop-schemas%{_isa} >= %{gsettings_desktop_schemas_version} +Requires: gtk3%{_isa} >= %{gtk3_version} +Requires: gvfs%{_isa} +Requires: libexif%{_isa} >= %{libexif_version} +# the main binary links against libnautilus-extension.so +# don't depend on soname, rather on exact version +Requires: %{name}-extensions%{_isa} = %{version}-%{release} + +# Explicitly conflict with older gedit for "enable-delete" setting removal +Conflicts: gedit < 2:3.16.0 + +%description +Nautilus is the file manager and graphical shell for the GNOME desktop +that makes it easy to manage your files and the rest of your system. +It allows to browse directories on local and remote filesystems, preview +files and launch applications associated with them. +It is also responsible for handling the icons on the GNOME desktop. + +%package extensions +Summary: Nautilus extensions library +License: LGPLv2+ + +%description extensions +This package provides the libraries used by nautilus extensions. + +%package devel +Summary: Support for developing nautilus extensions +License: LGPLv2+ +Requires: %{name}%{_isa} = %{version}-%{release} +Requires: %{name}-extensions%{_isa} = %{version}-%{release} + +%description devel +This package provides libraries and header files needed +for developing nautilus extensions. + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 + +%build +# For patch0 +autoreconf -fi + +%configure + +# drop unneeded direct library deps with --as-needed +# libtool doesn't make this easy, so we do it the hard way +sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool + +make %{?_smp_mflags} V=1 + +%install +%make_install + +find $RPM_BUILD_ROOT -name '*.la' -delete + +# Update the screenshot shown in the software center +# +# NOTE: It would be *awesome* if this file was pushed upstream. +# +# See http://people.freedesktop.org/~hughsient/appdata/#screenshots for more details. +# +appstream-util replace-screenshots $RPM_BUILD_ROOT%{_datadir}/appdata/org.gnome.Nautilus.appdata.xml \ + https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/org.gnome.Nautilus/a.png \ + https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/org.gnome.Nautilus/b.png \ + https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/org.gnome.Nautilus/c.png + +%find_lang %name + +%check +appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/appdata/org.gnome.Nautilus.appdata.xml +desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop + +%postun +if [ $1 -eq 0 ]; then + glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || : +fi + +%posttrans +glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || : + +%post extensions -p /sbin/ldconfig + +%postun extensions -p /sbin/ldconfig + +%files -f %{name}.lang +%doc AUTHORS NEWS README +%license COPYING +%{_datadir}/appdata/org.gnome.Nautilus.appdata.xml +%{_datadir}/applications/* +%{_bindir}/* +%{_datadir}/dbus-1/services/org.gnome.Nautilus.service +%{_datadir}/dbus-1/services/org.freedesktop.FileManager1.service +%{_datadir}/gnome-shell/search-providers/nautilus-search-provider.ini +%{_datadir}/icons/hicolor/*/apps/org.gnome.Nautilus.png +%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Nautilus-symbolic.svg +%{_mandir}/man1/nautilus.1* +%{_datadir}/glib-2.0/schemas/org.gnome.nautilus.gschema.xml +%dir %{_libdir}/nautilus +%dir %{_libdir}/nautilus/extensions-3.0 +%{_libdir}/nautilus/extensions-3.0/libnautilus-sendto.so +%{_sysconfdir}/xdg/autostart/nautilus-autostart.desktop + +%files extensions +%license COPYING.EXTENSIONS COPYING.LIB +%{_libdir}/libnautilus-extension.so.* +%{_libdir}/girepository-1.0/*.typelib +%dir %{_libdir}/nautilus + +%files devel +%{_includedir}/nautilus +%{_libdir}/pkgconfig/* +%{_libdir}/*.so +%{_datadir}/gir-1.0/*.gir +%dir %{_datadir}/gtk-doc/ +%dir %{_datadir}/gtk-doc/html/ +%doc %{_datadir}/gtk-doc/html/libnautilus-extension/ + +%changelog +* Thu Nov 02 2017 Carlos Soriano 3.22.3-4 +- Fix desktop files security issue (upstream bugzilla.gnome.org/777991) + Resolves: #1490949 + +* Mon May 29 2017 Carlos Soriano 3.22.3-3 +- Add Japanese translation + Resolves: #1382632 + +* Wed May 17 2017 Carlos Soriano 3.22.3-2 +- Fix translation files for the remove-autoar patch + Resolves: #1382632 + +* Wed Mar 08 2017 Kalev Lember 3.22.3-1 +- Update to 3.22.3 +- Resolves: #1387026 + +* Wed Jul 20 2016 Carlos Soriano 3.14.3-12 +- Update icons on primary patch + Resolves: #1353613 + +* Wed Jul 20 2016 Carlos Soriano 3.14.3-11 +- Update icons on primary patch + Resolves: #1353613 + +* Tue Jul 12 2016 Carlos Soriano 3.14.3-10 +- Update icons on primary patch + Resolves: #1353613 + +* Fri Jul 01 2016 Carlos Soriano 3.14.3-9 +- Apply downstream translations +- Restrict icons on desktop to the primary monitor + Resolves: #1207646 #1046876 #1272881 + +* Thu Apr 28 2016 Carlos Soriano 3.14.3-8 +- Backport fix for jp2 images crashing nautilus +- Apply downstream translations + Resolves: #1271297 #1272881 + +* Tue Oct 6 2015 Carlos Soriano 3.14.3-7 +- Backport two patches from upstream and remove a wrong patch + Resolves: #1254161 #1266477 + +* Wed Sep 23 2015 Ray Strode 3.14.3-6 +- Add more goo to the compat desktop file to prevent it + from getting exposed in control-center + Related: #1259292 + +* Mon Sep 14 2015 David King - 3.14.3-5 +- Refresh patches to fix regression after undo changes (#1252434) + +* Thu Sep 03 2015 David King - 3.14.3-4 +- Backport fix for crash with file bookmarks (#1115338) + +* Wed Jul 15 2015 David King - 3.14.3-3 +- Backport delete keyboard shortcut improvements (#1102849) + +* Fri Jun 26 2015 Ray Strode 3.14.3-2 +- Add backward compatible nautilus.desktop for user defined mime associations + Related: #1174562 1235413 + +* Wed Jun 17 2015 David King - 3.14.3-1 +- Update to 3.14.3 (#1174562) + +* Wed May 06 2015 Ray Strode 3.14.2-2 +- Rebuild against new gnome-desktop3 + Related: #1174562 + +* Thu Mar 19 2015 Richard Hughes - 3.14.2-1 +- Update to 3.14.2 +- Resolves: #1174562 + +* Tue Nov 11 2014 David King - 3.8.2-10 +- Handle desktop link file DND (#1080484) +- Drop symlink renaming patches + +* Wed Oct 08 2014 David King - 3.8.2-9 +- Handle renaming symlinks in the current view (#1059684) + +* Thu Aug 21 2014 Alexander Larsson - 3.8.2-8 +- Fix crash when chowning + Resolves: #1090999 + +* Tue Mar 25 2014 David King - 3.8.2-7 +- Add Requires on gnome-icon-theme-legacy (#1077278) + +* Fri Mar 21 2014 Debarshi Ray - 3.8.2-6 +- Search provider does not show any results + Resolves: #853987 + +* Tue Mar 11 2014 Ray Strode - 3.8.2-5 +- Fix race that prevents icons from showing on desktop + Resolves: #1075054 + +* Fri Jan 24 2014 Daniel Mach - 3.8.2-4 +- Mass rebuild 2014-01-24 + +* Fri Dec 27 2013 Daniel Mach - 3.8.2-3 +- Mass rebuild 2013-12-27 + +* Thu Nov 7 2013 Zeeshan Ali - 3.8.2-2 +- Fix background rendering. + +* Sun Jun 16 2013 Matthias Clasen - 3.8.2-1 +- Update to 3.8.2 + +* Tue Apr 16 2013 Kalev Lember - 3.8.1-1 +- Update to 3.8.1 + +* Tue Mar 26 2013 Kalev Lember - 3.8.0-1 +- Update to 3.8.0 + +* Wed Mar 20 2013 Richard Hughes - 3.7.92-1 +- Update to 3.7.92 + +* Thu Mar 7 2013 Matthias Clasen - 3.7.91-1 +- Update to 3.7.91 + +* Wed Feb 20 2013 Kalev Lember - 3.7.90-2 +- Rebuilt for libgnome-desktop soname bump + +* Tue Feb 19 2013 Richard Hughes - 3.7.90-1 +- Update to 3.7.90 + +* Fri Feb 8 2013 Tomas Bzatek - 3.7.5-2 +- Disable smp build to fix intltool issues + +* Thu Feb 07 2013 Richard Hughes - 3.7.5-1 +- Update to 3.7.5 + +* Sun Jan 27 2013 Kalev Lember - 3.7.4-2 +- Rebuilt for tracker 0.16 ABI + +* Wed Jan 16 2013 Richard Hughes - 3.7.4-1 +- Update to 3.7.4 + +* Fri Dec 21 2012 Kalev Lember - 3.7.3-1 +- Update to 3.7.3 + +* Thu Dec 6 2012 Tomas Bzatek - 3.7.2-2 +- nautilus-devel should require nautilus-extensions + +* Tue Nov 20 2012 Richard Hughes - 3.7.2-1 +- Update to 3.7.2 + +* Fri Nov 09 2012 Kalev Lember - 3.7.1-1 +- Update to 3.7.1 +- Own the gtk-doc directories + +* Mon Oct 15 2012 Cosimo Cecchi - 3.6.1-1 +- Update to 3.6.1 + +* Tue Sep 25 2012 Cosimo Cecchi - 3.6.0-1 +- Update to 3.6.0 + +* Tue Sep 18 2012 Cosimo Cecchi - 3.5.92-1 +- Update to 3.5.92 + +* Tue Sep 04 2012 Cosimo Cecchi - 3.5.91-1 +- Update to 3.5.91 + +* Tue Aug 21 2012 Cosimo Cecchi - 3.5.90-1 +- Update to 3.5.90 + +* Fri Aug 10 2012 Cosimo Cecchi - 3.5.5-1 +- Update to 3.5.5 + +* Fri Jul 27 2012 Fedora Release Engineering - 3.5.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Jul 17 2012 Cosimo Cecchi - 3.5.4-2 +- Enable tracker support + +* Tue Jul 17 2012 Richard Hughes - 3.5.4-1 +- Update to 3.5.4 + +* Sat Jul 14 2012 Ville Skyttä - 3.5.3-2 +- Move ldconfig calls from main package to -extensions. + +* Tue Jun 26 2012 Richard Hughes - 3.5.3-1 +- Update to 3.5.3 + +* Thu Jun 07 2012 Richard Hughes - 3.5.2-1 +- Update to 3.5.2 + +* Sat May 05 2012 Kalev Lember - 3.5.1-1 +- Update to 3.5.1 + +* Tue Apr 24 2012 Kalev Lember - 3.4.1-2 +- Silence rpm scriptlet output + +* Mon Apr 16 2012 Richard Hughes - 3.4.1-1 +- Update to 3.4.1 + +* Mon Mar 26 2012 Cosimo Cecchi - 3.4.0-1 +- Update to 3.4.0 + +* Tue Mar 20 2012 Cosimo Cecchi - 3.3.92-1 +- Update to 3.3.92 + +* Tue Mar 06 2012 Cosimo Cecchi - 3.3.91-1 +- Update to 3.3.91 + +* Sun Feb 26 2012 Matthias Clasen - 3.3.90-1 +- Update to 3.3.90 + +* Tue Feb 7 2012 Cosimo Cecchi - 3.3.5-1 +- Update to 3.3.5 + +* Tue Jan 17 2012 Matthias Clasen - 3.3.4-1 +- Update to 3.3.4 + +* Fri Jan 13 2012 Fedora Release Engineering - 3.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Dec 20 2011 Matthias Clasen - 3.3.3-1 +- Update to 3.3.3 + +* Wed Nov 2 2011 Matthias Clasen - 3.3.1.1-1 +- Update to 3.3.1.1 + +* Wed Oct 26 2011 Fedora Release Engineering - 3.2.1-2 +- Rebuilt for glibc bug#747377 + +* Tue Oct 18 2011 Cosimo Cecchi - 3.2.1-1 +- Update to 3.2.1 + +* Tue Sep 27 2011 Cosimo Cecchi - 3.2.0-1 +- Update to 3.2.0 + +* Mon Sep 19 2011 Cosimo Cecchi - 3.1.92-1 +- Update to 3.1.92 + +* Wed Aug 31 2011 Matthias Clasen 3.1.90-1 +- Update to 3.1.90 + +* Mon Jul 25 2011 Matthias Clasen 3.1.4-1 +- Update to 3.1.4 + +* Mon Jul 04 2011 Bastien Nocera 3.1.3-1 +- Update to 3.1.3 + +* Tue Jun 14 2011 Cosimo Cecchi - 3.1.2-1 +- Update to 3.1.2 + +* Wed May 11 2011 Matthias Clasen - 3.1.1-1 +- Update to 3.1.1 + +* Mon Apr 25 2011 Matthias Clasen - 3.0.1-1 +- Update to 3.0.1 + +* Mon Apr 04 2011 Cosimo Cecchi - 3.0.0-1 +- Update to 3.0.0 + +* Wed Mar 30 2011 Cosimo Cecchi - 2.91.94-1 +- Update to 2.91.94 + +* Sun Mar 27 2011 Colin Walters - 2.91.93-2 +- Drop --vendor from nautilus.desktop + Vendor prefixes are pointless, and in this case breaks upstream + components trying to reference each other via .desktop file, such + as GNOME Shell having nautilus.desktop in its default favorite + list. + +* Fri Mar 25 2011 Matthias Clasen - 2.91.93-1 +- Update to 2.91.93 + +* Mon Mar 21 2011 Cosimo Cecchi - 2.91.92-1 +- Update to 2.91.92 + +* Mon Mar 07 2011 Cosimo Cecchi 2.91.91-1 +- Update to 2.91.91 + +* Tue Feb 22 2011 Cosimo Cecchi 2.91.90.1-1 +- Update to 2.91.90.1 + +* Mon Feb 21 2011 Cosimo Cecchi 2.91.90-1 +- Update to 2.91.90 + +* Thu Feb 10 2011 Matthias Clasen 2.91.9-4 +- Rebuild against newer gtk + +* Tue Feb 08 2011 Fedora Release Engineering - 2.91.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Feb 7 2011 Cosimo Cecchi - 2.91.9-2 +- Add a patch from upstream for missing bookmark names + +* Fri Feb 4 2011 Cosimo Cecchi - 2.91.9-1 +- Update to 2.91.9 + +* Tue Feb 2 2011 Matthias Clasen - 2.91.8-4 +- Rebuild against new gtk + +* Tue Feb 1 2011 Tomas Bzatek - 2.91.8-3 +- Remove last traces of gconf (#674359) + +* Mon Jan 31 2011 Cosimo Cecchi - 2.91.8-2 +- Update selinux patch + +* Mon Jan 31 2011 Cosimo Cecchi - 2.91.8-1 +- Update to 2.91.8 + +* Wed Jan 12 2011 Matthias Clasen - 2.91.7-2 +- Drop explicit gnome-desktop dependency +- Drop some no-longer-required tweaks + +* Tue Jan 11 2011 Cosimo Cecchi - 2.91.7-1 +- Update to 2.91.7 + +* Fri Jan 7 2011 Matthias Clasen - 2.91.6-1 +- Update to 2.91.6 + +* Fri Dec 3 2010 Matthias Clasen - 2.91.3-2 +- Rebuild against new gtk + +* Mon Nov 29 2010 Cosimo Cecchi - 2.91.3-1 +- Update to 2.91.3 +- Drop unnecessary patches + +* Wed Nov 10 2010 Tomas Bzatek - 2.91.2-1 +- Update to 2.91.2 + +* Mon Nov 1 2010 Matthias Clasen - 2.91.1-1 +- Update to 2.91.1 + +* Wed Oct 6 2010 Matthias Clasen - 2.91.0-1 +- Update to 2.91.0 + +* Wed Sep 29 2010 jkeating - 2.90.1-6.gitf3bbee7 +- Rebuilt for gcc bug 634757 + +* Sat Sep 25 2010 Owen Taylor - 2.90.1-5.gitf3bbee7 +- Bump and rebuild for gtk3 ABI changes + +* Tue Sep 21 2010 Matthias Clasen - 2.90.1-4.gitf3bbee7 +- git snapshot +- Rebuild against newer gobject-introspection + +* Mon Aug 30 2010 Tomas Bzatek - 2.90.1-2 +- Require gsettings-desktop-schemas (#628273) + +* Tue Aug 24 2010 Matthias Clasen - 2.90.1-1 +- Update to 2.31.91 + +* Wed Aug 18 2010 Tomas Bzatek - 2.31.90-1 +- Update to 2.31.90 + +* Thu Aug 12 2010 Tomas Bzatek - 2.31.6-1 +- Update to 2.31.6 + +* Fri Aug 6 2010 Tomas Bzatek - 2.31.5-3.really.2.30.1 +- Revert back (temporarily) to 2.30.1 and mask it as 2.31.5 due to recent gnome3 changes + +* Thu Jul 15 2010 Colin Walters - 2.31.5-2 +- Rebuild with new gobject-introspection + +* Mon Jul 12 2010 Matthias Clasen 2.31.5-1 +- Update to 2.31.5 + +* Mon Jun 28 2010 Matthias Clasen 2.31.4-1 +- Update to 2.31.4 + +* Wed Jun 23 2010 Bastien Nocera 2.31.3-4.20100618git +- Fix libnautilus-extensions pkg-config files + +* Wed Jun 23 2010 Matthias Clasen - 2.31.3-3.20100618git +- Rebuild to get rid of mixed gtk deps + +* Fri Jun 18 2010 Matthias Clasen - 2.31.3-2.20100618git +- git snapshot that builds against GLib 2.25.9 and GTK+ 2.90.3 + +* Tue Jun 8 2010 Matthias Clasen - 2.31.3-1 +- Update to 2.31.3 + +* Mon May 24 2010 Tomas Bzatek - 2.31.2-1 +- Update to 2.31.2 + +* Tue May 4 2010 Tomas Bzatek - 2.31.1-1 +- Update to 2.31.1 + +* Tue May 4 2010 Tomas Bzatek - 2.30.1-3 +- Remove .desktop entry in applications > system tools (#583790) + +* Mon Apr 26 2010 Tomas Bzatek - 2.30.1-2 +- Do not show Unmount when showing Eject/Safe removal + +* Mon Apr 26 2010 Tomas Bzatek - 2.30.1-1 +- Update to 2.30.1 + +* Sat Apr 24 2010 Matthias Clasen - 2.30.0-3 +- Also obsolete eel2-devel (#583722) + +* Tue Apr 13 2010 Seth Vidal - 2.30.0-2 +- fix obsoletes/provides for eel2 to not include pkg name in ver/rel + +* Mon Mar 29 2010 Tomas Bzatek - 2.30.0-1 +- Update to 2.30.0 + +* Mon Mar 15 2010 Tomas Bzatek - 2.29.92.1-1 +- Update to 2.29.92.1 +- Fix eel2 obsoletion + +* Mon Mar 8 2010 Tomas Bzatek - 2.29.92-1 +- Update to 2.29.92 + +* Mon Feb 22 2010 Matthias Clasen - 2.29.91-1 +- Update to 2.29.91 + +* Wed Feb 17 2010 Tomas Bzatek - 2.29.90-2 +- Explicitly require exact nautilus-extensions package (#565802) + +* Tue Feb 9 2010 Tomas Bzatek - 2.29.90-1 +- Update to 2.29.90 + +* Thu Jan 28 2010 Jesse Keating - 2.29.2-2 +- Add a requires to keep nautilus-extensions updated if nautilus gets updated + +* Mon Jan 25 2010 Tomas Bzatek - 2.29.2-1 +- Update to 2.29.2 + +* Sun Jan 17 2010 Matthias Clasen - 2.29.1-2 +- Rebuild + +* Fri Dec 18 2009 Tomas Bzatek - 2.29.1-1 +- Update to 2.29.1 + +* Thu Dec 10 2009 Jon McCann - 2.28.2-3 +- Update the monitor changes patch (gnome #147808) + +* Tue Dec 8 2009 Tomas Bzatek - 2.28.2-2 +- Fix some memory leaks + +* Mon Nov 30 2009 Alexander Larsson - 2.28.2-1 +- Update to 2.28.2 + +* Wed Nov 18 2009 Tomas Bzatek - 2.28.1-4 +- Proper fix for crash in the infopanel (#531826) + +* Mon Nov 9 2009 Matthias Clasen - 2.28.1-3 +- Handle monitor changes when drawing the background (gnome #147808) + +* Mon Nov 2 2009 Tomas Bzatek - 2.28.1-2 +- Don't crash in infopanel on invalid selection (#531826) + +* Wed Oct 21 2009 Tomas Bzatek - 2.28.1-1 +- Update to 2.28.1 + +* Thu Sep 24 2009 Matthias Clasen - 2.28.0-3 +- Avoid lingering menuitems (#518570) + +* Wed Sep 23 2009 Ray Strode 2.28.0-2 +- Fix crossfade + +* Mon Sep 21 2009 Tomas Bzatek - 2.28.0-1 +- Update to 2.28.0 + +* Wed Sep 9 2009 Matthias Clasen - 2.27.92-2 +- Fix desktop files to be valid + +* Mon Sep 7 2009 Tomas Bzatek - 2.27.92-1 +- Update to 2.27.92 + +* Sun Sep 6 2009 Matthias Clasen - 2.27.91-3 +- Fix uninhibiting when long-running operations are over + +* Wed Aug 26 2009 Matthias Clasen - 2.27.91-2 +- Make nautilus-file-management-properties not crash on start + +* Mon Aug 24 2009 Matthias Clasen - 2.27.91-1 +- Update to 2.27.91 + +* Wed Aug 12 2009 Matthias Clasen - 2.27.4-5 +- Turn off autorun for x-content/software + +* Mon Aug 3 2009 Matthias Clasen - 2.27.4-4 +- Show icons for bookmarks and similar in menus + +* Sun Aug 2 2009 Matthias Clasen - 2.27.4-3 +- Drop desktop-backgrounds-basic dep that we've carried for 9 years + without ever making use of it + +* Sat Jul 25 2009 Fedora Release Engineering - 2.27.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Jul 14 2009 Matthias Clasen - 2.27.4-1 +- Update to 2.27.4 + +* Mon Jun 15 2009 Tomas Bzatek - 2.27.2-1 +- Update to 2.27.2 + +* Tue May 5 2009 Tomas Bzatek - 2.27.1-1 +- Update to 2.27.1 + +* Mon Apr 27 2009 Matthias Clasen - 2.26.2-3 +- Don't drop schemas translations from po files anymore + +* Thu Apr 16 2009 Alexander Larsson - 2.26.2-2 +- Fix whitespace on the right in icon view when zooming + +* Mon Apr 13 2009 Alexander Larsson - 2.26.2-1 +- Update to 2.26.2 + +* Mon Apr 6 2009 Tomas Bzatek - 2.26.1-2 +- Fix dragging files via NFS moves instead of copy (#456515) + +* Thu Apr 2 2009 Tomas Bzatek - 2.26.1-1 +- Update to 2.26.1 + +* Mon Mar 16 2009 Tomas Bzatek - 2.26.0-1 +- Update to 2.26.0 + +* Thu Mar 12 2009 Matthias Clasen - 2.25.93-2 +- Avoid respawning in a loop when not showing the desktop (#485375) + +* Wed Mar 11 2009 Tomas Bzatek - 2.25.93-1 +- Update to 2.25.93 + +* Mon Mar 2 2009 Tomas Bzatek - 2.25.92-1 +- Update to 2.25.92 + +* Wed Feb 25 2009 Fedora Release Engineering - 2.25.91-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Feb 19 2009 Tomas Bzatek - 2.25.91-2 +- Workaround for broken gcc optimization (#486088) + +* Mon Feb 16 2009 Tomas Bzatek - 2.25.91-1 +- Update to 2.25.91 + +* Mon Feb 2 2009 Tomas Bzatek - 2.25.4-1 +- Update to 2.25.4 + +* Tue Jan 20 2009 Matthias Clasen - 2.25.3-2 +- Reenable the translation size reduction + +* Tue Jan 20 2009 Tomas Bzatek - 2.25.3-1 +- Update to 2.25.3 + +* Mon Jan 19 2009 Ray Strode - 2.25.2-7 +- Update fade patch to work with updated gnome-desktop api +- Fix fade start pixmap + +* Wed Jan 7 2009 Ray Strode - 2.25.2-6 +- Don't crash when closing spatial window very quickly after + opening it (gnome bug 552859) + +* Thu Dec 18 2008 Matthias Clasen - 2.25.2-5 +- Fix spec + +* Thu Dec 18 2008 - Ray Strode - 2.25.2-4 +- Add eel crossfade patch + +* Wed Dec 17 2008 - Bastien Nocera - 2.25.2-3 +- Rebuild for new libgnome-desktop + +* Tue Dec 16 2008 Matthias Clasen - 2.25.2-2 +- Drop the eel2 Obsoletes temporarily to give people some time + to port away + +* Tue Dec 16 2008 Matthias Clasen - 2.25.2-1 +- Update to 2.25.2 +- Clean up Requires +- Obsolete eel2 +- Drop hard dependency on gvfs backends. + These are pulled in by comps, anyway + +* Fri Dec 5 2008 Matthias Clasen - 2.25.1-5 +- Obsolete gnome-volume-manager + +* Fri Dec 5 2008 Tomas Bzatek - 2.25.1-4 +- Properly open new windows after long mount operation +- Fix callback connection to the GtkMountOperation dialog + +* Thu Dec 4 2008 Tomas Bzatek - 2.25.1-3 +- Fix BuildRequires + +* Thu Dec 4 2008 Tomas Bzatek - 2.25.1-2 +- Rediff the XDS patch + +* Tue Dec 2 2008 Tomas Bzatek - 2.25.1-1 +- Update to 2.25.1 + +* Wed Nov 26 2008 Tomas Bzatek - 2.24.2-1 +- Update to 2.24.2 + +* Fri Nov 21 2008 Matthias Clasen - 2.24.1-5 +- Better URL +- Tweak %%description + +* Thu Nov 13 2008 Matthias Clasen - 2.24.1-4 +- Rebuild + +* Mon Oct 27 2008 Tomas Bzatek - 2.24.1-3 +- Updated XDS support in tree view patch (sync with gnomebz #171655) + +* Fri Oct 24 2008 Alexander Larsson - 2.24.1-2 +- Manually check for fallback file icon since we're not + always returning that from gio anymore (from upstream) + +* Mon Oct 20 2008 Tomas Bzatek - 2.24.1-1 +- Update to 2.24.1 + +* Tue Oct 14 2008 Matthias Clasen - 2.24.0-3 +- Remove debug flags + +* Thu Sep 25 2008 Matthias Clasen - 2.24.0-2 +- Save some space + +* Sun Sep 21 2008 Matthias Clasen - 2.24.0-1 +- Update to 2.24.0 + +* Sat Sep 20 2008 Matthias Clasen - 2.23.92-3 +- Plug some memory leaks + +* Fri Sep 19 2008 Matthias Clasen - 2.23.92-2 +- Plug some memory leaks + +* Mon Sep 8 2008 Matthias Clasen - 2.23.92-1 +- Update to 2.23.92 + +* Tue Sep 02 2008 Tomas Bzatek - 2.23.91-1 +- Update to 2.23.91 + +* Sat Aug 30 2008 Matthias Clasen - 2.23.90-4 +- Plug a few small memory leaks + +* Thu Aug 28 2008 Matthias Clasen - 2.23.90-3 +- Pull in split-off gvfs backends + +* Wed Aug 27 2008 - Bastien Nocera - 2.23.90-2 +- Fix typo in the schemas file + +* Sat Aug 23 2008 Matthias Clasen - 2.23.90-1 +- Update to 2.23.90 + +* Mon Aug 4 2008 Tomas Bzatek - 2.23.6.1-1 +- Update to 2.23.6.1 +- Dropped upstreamed patches + +* Mon Aug 4 2008 Tomas Bzatek - 2.23.6-1 +- Update to 2.23.6 + +* Sun Jul 27 2008 Matthias Clasen - 2.23.5-3 +- More icon name fixes + +* Sun Jul 27 2008 Matthias Clasen - 2.23.5-2 +- Use standard icon names + +* Tue Jul 22 2008 Tomas Bzatek - 2.23.5.1-1 +- Update to 2.23.5.1 + +* Tue Jul 22 2008 Matthias Clasen - 2.23.5-1 +- Update to 2.23.5 + +* Tue Jun 17 2008 Tomas Bzatek - 2.23.4-1 +- Update to 2.23.4 + +* Thu Jun 12 2008 Tomas Bzatek - 2.23.3-2 +- Fix DnD segfaults (#450416, #450449) + +* Wed Jun 4 2008 Tomas Bzatek - 2.23.3-1 +- Update to 2.23.3 + +* Fri May 30 2008 Tomas Bzatek - 2.23.2-3 +- Add DnD support to drop files onto archive files with help + of file-roller (gnomebz #377157) +- Add fix preventing crash on bad GFileInfos (gnomebz #519743) + +* Fri May 16 2008 Tomas Bzatek - 2.23.2-2 +- Add treeview XDS drag&drop support (#446760) + +* Tue May 13 2008 Tomas Bzatek - 2.23.2-1 +- Update to 2.23.2 + +* Fri May 2 2008 David Zeuthen - 2.23.1-4 +- Default to "Ask what to do" for all actions (#444639) + +* Fri May 2 2008 Tomas Bzatek - 2.23.1-3 +- Mask file moving to nautilus-cd-burner window as copy operation (#443944) +- Don't allow recursive move/copy into itself (gnomebz #530720) + +* Thu Apr 24 2008 Tomas Bzatek - 2.23.1-2 +- Add SELinux patch (gnomebz #529694) + +* Wed Apr 23 2008 Tomas Bzatek - 2.23.1-1 +- Update to 2.23.1 + +* Thu Apr 17 2008 Matthias Clasen - 2.22.2-5 +- Make "Open Folder" work as expected for media handling + +* Thu Apr 17 2008 David Zeuthen - 2.22.2-4 +- Put X-Gnome-Vfs-System=gio into desktop files (See #442835) + +* Wed Apr 16 2008 David Zeuthen - 2.22.2-3 +- Revert Fedora livecd mount (fix is in latest gvfs packages) and + add a patch to avoid trying to autorun mounts that are mounted + from outside Nautilus (#442189) + +* Fri Apr 11 2008 Tomas Bzatek - 2.22.2-2 +- Hide Fedora livecd mount (#439166) + +* Mon Apr 7 2008 Matthias Clasen - 2.22.2-1 +- Update to 2.22.2 + +* Sun Apr 6 2008 Matthias Clasen - 2.22.1-6 +- Backport a patch from upstream svn thats needed for file-roller + +* Fri Apr 4 2008 Matthias Clasen - 2.22.1-5 +- Fix beagle support some more + +* Thu Apr 3 2008 Tomas Bzatek - 2.22.1-4 +- Fix SELinux attributes display issue (#439686) + +* Wed Apr 2 2008 Matthias Clasen - 2.22.1-3 +- Fix the build to include tracker and beagle support again + +* Mon Mar 31 2008 Ray Strode - 2.22.1-2 +- Over the releases we've accumulated default.png, default-wide.png default-5_4.png + and default.jpg. We haven't been able to drop them because it would leave some + users with white backgrounds on upgrade. This patch just falls back to the + default image if the user's background doesn't exist. + + +* Fri Mar 28 2008 Tomas Bzatek - 2.22.1-1 +- Update to 2.22.1 + +* Thu Mar 13 2008 Tomas Bzatek - 2.22.0-2 +- Don't create application/x-ext- types for known mimetypes (patch from head) +- Fix a crash in the Properties dialog while changing owner (patch from head) + +* Mon Mar 10 2008 Matthias Clasen - 2.22.0-1 +- Update to 2.22.0 + +* Tue Feb 26 2008 Tomas Bzatek - 2.21.92-2 +- Change libbeagle .so name for libbeagle-0.3.0 in nautilus-2.21.1-dynamic-search-r2.patch (#434722) + +* Tue Feb 26 2008 Tomas Bzatek - 2.21.92-1 +- Update to 2.21.92 + +* Tue Feb 12 2008 Matthias Clasen - 2.21.91-1 +- Update to 2.21.91 + +* Tue Jan 29 2008 Matthias Clasen - 2.21.90-1 +- Update to 2.21.90 + +* Mon Jan 21 2008 Matthias Clasen - 2.21.6-1 +- Update to 2.21.6 + +* Mon Jan 14 2008 Matthias Clasen - 2.21.5-1 +- Update to 2.21.5 + +* Tue Jan 8 2008 Matthias Clasen - 2.21.2-1 +- Update to 2.21.2 + +* Sun Dec 23 2007 Matthias Clasen - 2.21.1-2 +- Fix extensiondir + +* Fri Dec 21 2007 Matthias Clasen - 2.21.1-1 +- Upodate to 2.21.1 + +* Wed Dec 19 2007 - Bastien Nocera - 2.20.0-7 +- Update audio preview patch to check for aliases (#381401) + +* Tue Oct 30 2007 - Bastien Nocera - 2.20.0-6 +- Fix audio preview command-line to use decodebin so playbin doesn't + pop up a window for videos detected as audio + +* Tue Oct 16 2007 - Bastien Nocera - 2.20.0-5 +- Add patch from upstream to get audio preview working again + (#332251) + +* Wed Oct 3 2007 Matthias Clasen - 2.20.0-4 +- Move /usr/lib/nautilus/extensions-1.0 to the extensions package + +* Tue Oct 2 2007 Matthias Clasen - 2.20.0-3 +- Fix a crash with small fonts (#242350) + +* Tue Oct 2 2007 Alexander Larsson - 2.20.0-1 +- Backport fixes for async thumbnail loading from svn + +* Fri Sep 28 2007 Ray Strode - 2.20.0-2 +- drop redhat-artwork dep. Alex says we don't need it anymore + +* Tue Sep 18 2007 Matthias Clasen - 2.20.0-1 +- Update to 2.20.0 + +* Mon Sep 3 2007 Matthias Clasen - 2.19.91-1 +- Update to 2.19.91 + +* Mon Aug 13 2007 Matthias Clasen - 2.19.90-1 +- Update to 2.19.90 + +* Fri Aug 10 2007 Matthias Clasen - 2.19.6-3 +- Bump gnome-vfs requirement (#251306) + +* Fri Aug 3 2007 Matthias Clasen - 2.19.6-2 +- Update license field + +* Mon Jul 30 2007 Matthias Clasen - 2.19.6-1 +- Update to 2.19.6 + +* Wed Jul 25 2007 Jesse Keating - 2.19.5-3 +- Rebuild for RH #249435 + +* Mon Jul 23 2007 Matthias Clasen - 2.19.5-2 +- Port to new GTK+ tooltips API + +* Tue Jul 10 2007 Matthias Clasen - 2.19.5-1 +- Update to 2.19.5 + +* Fri Jul 6 2007 Matthias Clasen - 2.19.4-2 +- Fix directory ownership issues + +* Mon Jun 18 2007 Matthias Clasen - 2.19.4-1 +- Update to 2.19.4 + +* Tue Jun 5 2007 Matthias Clasen - 2.19.3-1 +- Update to 2.19.3 + +* Sat May 19 2007 Matthias Clasen - 2.19.2-1 +- Update to 2.19.2 + +* Wed Apr 11 2007 Alexander Larsson - 2.18.1-2 +- Fix memleak (#235696) + +* Wed Apr 11 2007 Alexander Larsson - 2.18.1-1 +- Update to 2.18.1 + +* Mon Mar 26 2007 Matthias Clasen - 2.18.0.1-2 +- Update icon caches (#234020) + +* Mon Mar 12 2007 Alexander Larsson - 2.18.0.1-1 +- Update to 2.18.0.1 + +* Tue Mar 6 2007 Alexander Larsson - 2.17.92-3 +- Update xdg-user-dirs patch, now handle renaming desktop dir + +* Thu Mar 1 2007 Alexander Larsson - 2.17.92-2 +- Add xdg-user-dirs patch + +* Tue Feb 27 2007 Matthias Clasen - 2.17.92-1 +- Update to 2.17.92 + +* Tue Feb 13 2007 Matthias Clasen - 2.17.91-1 +- Update to 2.17.91 + +* Wed Feb 7 2007 Matthias Clasen - 2.17.90-4 +- Add DesktopSettings category to nautilus-file-management-properties.desktop + +* Tue Feb 6 2007 Alexander Larsson - 2.17.90-3 +- update tracker dynamic search patch to new .so name + +* Tue Jan 23 2007 Alexander Larsson - 2.17.90-2 +- Fix gnome bug #362302 in selinux patch + +* Mon Jan 22 2007 Matthias Clasen - 2.17.90-1 +- Update to 2.17.90 + +* Tue Dec 19 2006 Matthias Clasen - 2.17.1-1 +- Update to 2.17.1 + +* Wed Nov 22 2006 Alexander Larsson - 2.16.2-7 +- Look for beagle before tracker, because tracker autostarts + This lets us support having both installed at the same time. +- Remove buildreqs for beagle, as they are not necessary with + the dynamic work. + +* Tue Nov 14 2006 Matthias Clasen - 2.16.2-6 +- Detect tracker dynamically, too + +* Mon Nov 13 2006 Alexander Larsson - 2.16.2-5.fc7 +- Fix commonly reported NautilusDirectory crash + +* Wed Nov 8 2006 Alexander Larsson - 2.16.2-4.fc7 +- Revert upstream icon placement patch as it seems broken + +* Tue Nov 7 2006 Alexander Larsson - 2.16.2-2.fc7 +- Update to 2.16.2 + +* Sat Oct 21 2006 Matthias Clasen - 2.16.1-1 +- Update to 2.16.1 + +* Wed Oct 18 2006 Matthias Clasen - 2.16.0-6 +- Fix scripts according to the packaging guidelines +- Require GConf2 for the scripts +- Require pkgconfig for the -devel package + +* Sun Oct 01 2006 Jesse Keating - 2.16.0-5 +- rebuilt for unwind info generation, broken in gcc-4.1.1-21 + +* Tue Sep 19 2006 Alexander Larsson - 2.16.0-4 +- Support changing selinux contexts (#204030) + +* Thu Sep 14 2006 Alexander Larsson - 2.16.0-3 +- Fix crash when opening custom icon dialog (#205352) + +* Tue Sep 5 2006 Matthias Clasen - 2.16.0-2 +- Add a %%preun script (#205260) + +* Mon Sep 4 2006 Alexander Larsson - 2.16.0-1 +- Update to 2.16.0 + +* Fri Aug 25 2006 Alexander Larsson - 2.15.92.1-2 +- Omit self check code in build + +* Tue Aug 22 2006 Alexander Larsson - 2.15.92.1-1 +- update to 2.15.92.1 + +* Mon Aug 21 2006 Matthias Clasen - 2.15.92-1.fc6 +- Update to 2.15.92 + +* Sat Aug 12 2006 Matthias Clasen - 2.15.91-2.fc6 +- Don't Provide/Obsolete nautilus-devel from the main package (#202322) + +* Thu Aug 10 2006 Alexander Larsson - 2.15.91-1.fc6 +- Update to 2.15.91 +- Split package into devel and extensions (#201967) + +* Thu Aug 3 2006 Matthias Clasen - 2.15.90-1.fc6 +- Update to 2.15.90 + +* Tue Jul 18 2006 Matthias Clasen - 2.15.4-3 +- Spec file cleanups + +* Wed Jul 12 2006 Matthias Clasen - 2.15.4-2 +- Don't require nautilus-cd-burner, to avoid a + BuildRequires-Requires loop + +* Wed Jul 12 2006 Matthias Clasen - 2.15.4-1 +- Update to 2.15.4 + +* Wed Jul 12 2006 Jesse Keating - 2.15.2-1.1 +- rebuild + +* Tue Jun 13 2006 Matthias Clasen - 2.15.2-1 +- Update to 2.15.1 + +* Sun May 21 2006 Matthias Clasen - 2.15.1-2 +- Add missing BuildRequires (#129184) + +* Wed May 17 2006 Matthias Clasen - 2.15.1-1 +- Update to 2.15.1 + +* Fri May 12 2006 Matthias Clasen - 2.14.1-3 +- Close the about dialog + +* Tue Apr 11 2006 Matthias Clasen - 2.14.1-2 +- Update to 2.14.1 + +* Mon Mar 13 2006 Matthias Clasen - 2.14.0-1 +- Update to 2.14.0 + +* Mon Mar 6 2006 Matthias Clasen - 2.13.92-2 +- Reinstate the format patch which was accidentally dropped + +* Mon Feb 27 2006 Matthias Clasen - 2.13.92-1 +- Update to 2.13.92 + +* Mon Feb 13 2006 Matthias Clasen - 2.13.91-1 +- Update to 2.13.91 + +* Fri Feb 10 2006 Jesse Keating - 2.13.90-2.2 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 2.13.90-2.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Mon Feb 6 2006 Matthias Clasen - 2.13.90-2 +- Avoid delays in rendering the background + +* Tue Jan 31 2006 Matthias Clasen - 2.13.90-1 +- Update to 2.13.90 + +* Tue Jan 17 2006 Matthias Clasen - 2.13.4-1 +- Update to 2.13.4 + +* Mon Jan 9 2006 Alexander Larsson - 2.13.3-2 +- Buildrequire libbeagle + +* Tue Dec 13 2005 Alexander Larsson 2.13.3-1 +- Update to 2.13.3 + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Fri Dec 2 2005 Matthias Clasen 2.13.2-1 +- Update to 2.13.2 +- Update patches + +* Tue Nov 1 2005 Alexander Larsson - 2.12.1-6 +- Switch XFree86-devel buildrequirement to libX11-devel + +* Sat Oct 28 2005 Matthias Clasen 2.12.1-5 +- Implement icon stretching keynav +- Support formatting non-floppy devices + +* Sat Oct 22 2005 Matthias Clasen 2.12.1-4 +- Improve icon stretching ui + +* Fri Oct 21 2005 Matthias Clasen 2.12.1-3 +- Only show the "Format menu item if gfloppy is present + +* Fri Oct 21 2005 Matthias Clasen 2.12.1-2 +- Add a "Format" context menu item to the floppy in "Computer" + +* Thu Oct 6 2005 Matthias Clasen 2.12.1-1 +- Update to 2.12.1 + +* Wed Sep 7 2005 Matthias Clasen 2.12.0-1 +- Update to 2.12.0 + +* Tue Aug 16 2005 Matthias Clasen +- New upstream release + +* Wed Aug 3 2005 Matthias Clasen 2.11.90-1 +- New upstream release + +* Mon Jul 11 2005 Matthias Clasen 2.11.3-1 +- Update to 2.11.3 + +* Wed May 11 2005 David Zeuthen 2.10.0-4 +- Fix default font for zh_TW (#154185) + +* Sun Apr 3 2005 David Zeuthen 2.10.0-3 +- Include patches for desktop background memory saving (GNOME bug #169347) +- Obsoletes: nautilus-media (#153223) + +* Mon Mar 28 2005 Matthias Clasen 2.10.0-2 +- Rebuild against newer libexif + +* Mon Mar 21 2005 David Zeuthen 2.10.0-1 +- Update to latest upstream version; tweak requires + +* Thu Mar 3 2005 Alex Larsson 2.9.91-2 +- Rebuild + +* Fri Feb 11 2005 Matthias Clasen - 2.9.91-1 +- Update to 2.9.91 + +* Tue Nov 9 2004 Marco Pesenti Gritti - 2.8.1-5 +- Remove eog dependency. The bonobo component is no more used. + +* Mon Oct 18 2004 Marco Pesenti Gritti - 2.8.1-4 +- #135824 Fix throbber position + +* Fri Oct 15 2004 Alexander Larsson - 2.8.1-3 +- Slightly less bad error dialog when there is no handler for a file. + Not ideal, but this change doesn't change any strings. + +* Tue Oct 12 2004 Alexander Larsson - 2.8.1-2 +- Fix open with menu on mime mismatch +- Create desktop links ending with .desktop (#125104) +- Remove old cruft from specfile + +* Mon Oct 11 2004 Alexander Larsson - 2.8.1-1 +- update to 2.8.1 + +* Fri Oct 8 2004 Alexander Larsson - 2.8.0-3 +- Backport more fixes from cvs + +* Mon Oct 4 2004 Alexander Larsson - 2.8.0-2 +- Backport various bugfixes from HEAD + +* Mon Sep 13 2004 Alexander Larsson - 2.8.0-1 +- Update to 2.8.0 + +* Fri Sep 10 2004 Alexander Larsson - 2.7.92-3 +- Don't require eject on s390(x), since there is none (#132228) + +* Tue Sep 7 2004 Alexander Larsson - 2.7.92-2 +- Add patch to fix desktop keynav (#131894) + +* Tue Aug 31 2004 Alex Larsson 2.7.92-1 +- update to 2.7.92 + +* Thu Aug 26 2004 Alexander Larsson - 2.7.4-3 +- Added requires eject +- Depend on gnome-vfs2-smb instead of -extras + +* Tue Aug 24 2004 Alexander Larsson - 2.7.4-2 +- backport cvs fixes, including default view fix + +* Thu Aug 19 2004 Alex Larsson 2.7.4-1 +- update to 2.7.4 + +* Fri Aug 6 2004 Ray Strode 2.7.2-1 +- update to 2.7.2 + +* Tue Aug 3 2004 Matthias Clasen 2.6.0-7 +- rebuilt + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri May 21 2004 Matthias Clasen 2.6.0-5 +- rebuild + +* Wed Apr 14 2004 Alexander Larsson 2.6.0-4 +- update cvs backport, now handles kde trash dir better + +* Wed Apr 14 2004 Alexander Larsson 2.6.0-3 +- add cvs backport + +* Wed Apr 7 2004 Alex Larsson 2.6.0-2 +- Make network servers go to network:// again + +* Thu Apr 1 2004 Alex Larsson 2.6.0-1 +- update to 2.6.0 + +* Tue Mar 16 2004 Mike A. Harrisn 2.5.91-2 +- Changed BuildRequires: XFree86-libs >= 4.2.99 to BuildRequires: XFree86-devel +- Fixed BuildRoot to use _tmppath instead of /var/tmp + +* Mon Mar 15 2004 Alex Larsson 2.5.91-1 +- update to 2.5.91 + +* Mon Mar 8 2004 Alexander Larsson 2.5.90-1 +- update to 2.5.90 + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Wed Feb 25 2004 Alexander Larsson +- update libgnomeui required version to 2.5.3 (#116229) + +* Tue Feb 24 2004 Alexander Larsson 2.5.8-1 +- update to 2.5.8 + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Alexander Larsson 2.5.7-1 +- update to 2.5.7 + +* Fri Jan 30 2004 Alexander Larsson 2.5.6-1 +- update to 2.5.6 + +* Tue Jan 27 2004 Alexander Larsson 2.5.5-1 +- update to 2.5.5 + +* Tue Oct 28 2003 Than Ngo 2.4.0-7 +- fix start-here desktop file + +* Mon Oct 27 2003 Than Ngo 2.4.0-6 +- rebuild against new librsvg2 + +* Fri Oct 3 2003 Alexander Larsson 2.4.0-5 +- Update cvs backport, now have the better desktop icon layout + +* Mon Sep 29 2003 Alexander Larsson 2.4.0-4 +- Update cvs backport, fixes #105869 + +* Fri Sep 19 2003 Alexander Larsson 2.4.0-3 +- Backport bugfixes from the gnome-2-4 branch + +* Tue Sep 16 2003 Alexander Larsson 2.4.0-2 +- Add patch that fixes crash when deleting in listview + +* Tue Sep 9 2003 Alexander Larsson 2.4.0-1 +- 2.4.0 + +* Thu Sep 4 2003 Alexander Larsson 2.3.90-2 +- Add desktop icons patch + +* Tue Sep 2 2003 Alexander Larsson 2.3.90-1 +- update to 2.3.90 + +* Tue Aug 26 2003 Alexander Larsson 2.3.9-1 +- update +- Add patch to ignore kde desktop links +- Re-enable kdesktop detection hack. + kde doesn't seem to support the manager selection yet + +* Wed Aug 20 2003 Alexander Larsson 2.3.8-2 +- don't require fontilus + +* Mon Aug 18 2003 Alexander Larsson 2.3.8-1 +- update to gnome 2.3 + +* Wed Aug 6 2003 Elliot Lee 2.2.4-5 +- Fix libtool + +* Tue Jul 8 2003 Alexander Larsson 2.2.4-4.E +- Rebuild + +* Tue Jul 8 2003 Alexander Larsson 2.2.4-4 +- Backport fixes from cvs +- Change some default configurations + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Tue May 27 2003 Alexander Larsson 2.2.4-2 +- Add performance increase backport +- Add desktop manager selection backport + +* Mon May 19 2003 Alexander Larsson 2.2.4-1 +- update to 2.2.4 + +* Tue May 6 2003 Alexander Larsson 2.2.3-2 +- Fix scrollkeeper pre-requires + +* Mon Mar 31 2003 Alexander Larsson 2.2.3-1 +- Update to 2.2.3 + +* Tue Feb 25 2003 Alexander Larsson 2.2.1-5 +- Change the default new window size to fit in 800x600 (#85037) + +* Thu Feb 20 2003 Alexander Larsson +- Require gnome-vfs2-extras, since network menu item uses it (#84145) + +* Tue Feb 18 2003 Alexander Larsson +- Update to the latest bugfixes from cvs. +- Fixes #84291 for nautilus, context menu duplication and some other small bugs. + +* Thu Feb 13 2003 Alexander Larsson 2.2.1-2 +- Add a patch to fix the forkbomb-under-kde bug (#81520) +- Add a patch to fix thumbnail memory leak +- require libXft.so.2 instead of Xft, since that changed in the XFree86 package + +* Tue Feb 11 2003 Alexander Larsson 2.2.1-1 +- 2.2.1, lots of bugfixes + +* Fri Jan 31 2003 Alexander Larsson 2.2.0.2-2 +- remove nautilus-server-connect since it broke without editable vfolders + +* Fri Jan 31 2003 Alexander Larsson 2.2.0.2-1 +- Update to 2.2.0.2, fixes bg crasher +- parallelize build +- Added patch from cvs that fixes password hang w/ smb + +* Thu Jan 23 2003 Alexander Larsson 2.2.0.1-1 +- Update to 2.2.0.1 + +* Wed Jan 22 2003 Tim Powers 2.2.0-2 +- rebuilt + +* Tue Jan 21 2003 Alexander Larsson 2.2.0-1 +- update to 2.2.0 + +* Fri Jan 17 2003 Alexander Larsson 2.1.91-8 +- Add requirement on fontilus and nautilus-cd-burner to get them + on an upgrade. + +* Fri Jan 17 2003 Alexander Larsson 2.1.91-7 +- Added patch to enable the look for kde desktop hack +- Removed patches that were fixed upstream + +* Fri Jan 17 2003 Alexander Larsson 2.1.91-6 +- Removed the requirement of nautilus-cd-burner, since + that is now on by default in comps + +* Thu Jan 16 2003 Alexander Larsson 2.1.91-5 +- Require(post,postun) scrollkeeper (#67340) +- Add dot to end of summary + +* Tue Jan 14 2003 Havoc Pennington 2.1.91-4 +- use system-group.png not network-server.png for "Network Servers" + +* Tue Jan 14 2003 Alexander Larsson 2.1.91-3 +- Correct filename in last change + +* Tue Jan 14 2003 Alexander Larsson 2.1.91-2 +- change the network menu item to go to smb: + +* Tue Jan 14 2003 Alexander Larsson 2.1.91-1 +- Update to 2.1.91 +- Updated URL + +* Tue Jan 14 2003 Havoc Pennington +- perl-munge the icon names in a couple desktop files + to find redhat-network-server.png and redhat-file-manager.png. + Upstream icon names here were weird and seem broken. + +* Thu Jan 9 2003 Alexander Larsson +- 2.1.6 +- Removed mp3 stripping script. Thats gone upstream now. + +* Wed Dec 18 2002 Alexander Larsson 2.1.5-2 +- Add cdburn patch. +- Remove nautilus-1.1.19-starthere-hang-hackaround.patch +- Require nautilus-cd-burner + +* Mon Dec 16 2002 Alexander Larsson 2.1.5-1 +- Update to 2.1.5. Require gnome-icon-theme >= 0.1.5, gnome-vfs >= 2.1.5 + +* Tue Dec 3 2002 Havoc Pennington +- add explicit startup-notification dependency because build system is + dumb +- 2.1.3 + +* Wed Nov 13 2002 Havoc Pennington +- 2.1.2 + +* Thu Oct 10 2002 Havoc Pennington +- 2.0.7 +- remove patches that are upstream + +* Tue Sep 3 2002 Alexander Larsson 2.0.6-6 +- Add badhack to make weblinks on desktop work + +* Mon Sep 2 2002 Havoc Pennington +- fix #70667 assertion failures +- fix triple click patch + +* Mon Sep 2 2002 Jonathan Blandford +- don't activate on double click + +* Sat Aug 31 2002 Havoc Pennington +- put button press mask in triple-click patch, maybe it will work +- remove html-hack patch as it does nothing useful + +* Sat Aug 31 2002 Havoc Pennington +- require newer redhat-artwork, -menus, eel2, gnome-vfs2 to avoid + bogus bug reports +- add hack for HTML mime type handling in a web browser, not + nautilus + +* Thu Aug 29 2002 Alexander Larsson +- Updated to 2.0.6. Removed the patches I put upstream. +- Added patch that fixes #72410 + +* Wed Aug 28 2002 Owen Taylor +- Add a simple patch so that redhat-config-packages can disable + the new window behavior for mounted CDs behavior. + +* Wed Aug 28 2002 Alexander Larsson 2.0.5-4 +- Add patch to fix bug #70667 + +* Sun Aug 25 2002 Havoc Pennington +- remove mp3 + +* Fri Aug 23 2002 Havoc Pennington +- ignore the "add_to_session" preference as it only broke stuff +- pad the left margin a bit to cope with poor word wrapping + +* Fri Aug 23 2002 Alexander Larsson 2.0.5-1 +- Update to 2.0.5, remove topleft icon patch + +* Thu Aug 15 2002 Alexander Larsson 2.0.4-2 +- Add patch to fix the bug where desktop icons get + stuck in the top left corner on startup + +* Wed Aug 14 2002 Alexander Larsson 2.0.4-1 +- 2.0.4 + +* Tue Aug 13 2002 Havoc Pennington +- obsolete nautilus-mozilla < 2.0 #69839 + +* Mon Aug 12 2002 Havoc Pennington +- add rhconfig patch to Bluecurve theme and disable sidebar by default + +* Wed Aug 7 2002 Havoc Pennington +- drop start here files, require redhat-menus that has them + +* Tue Aug 6 2002 Havoc Pennington +- 2.0.3 + +* Sat Jul 27 2002 Havoc Pennington +- build for new eel2, gail + +* Wed Jul 24 2002 Havoc Pennington +- and add the libexec components, mumble + +* Wed Jul 24 2002 Havoc Pennington +- put the components in the file list, were moved upstream + +* Tue Jul 23 2002 Havoc Pennington +- 2.0.1 + +* Thu Jun 27 2002 Owen Taylor +- Relibtoolize to fix relink problems for solib components +- Add LANG=en_US to %%makeinstall as well +- Back out previous change, force locale to en_US to prevent UTF-8 problems +- Add workaround for intltool-merge bug on ia64 + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Sun Jun 16 2002 Havoc Pennington +- 2.0.0 +- use desktop-file-install +- require desktop-backgrounds-basic + +* Wed Jun 12 2002 Havoc Pennington +- add wacky hack in hopes of fixing the hang-on-login thing + +* Sat Jun 8 2002 Havoc Pennington +- add build requires on new gail +- rebuild to try to lose broken libgailutil.so.13 dependency + +* Sat Jun 08 2002 Havoc Pennington +- rebuild in different environment + +* Wed Jun 5 2002 Havoc Pennington +- 1.1.19 + +* Fri May 31 2002 Havoc Pennington +- rebuild in different environment + +* Thu May 30 2002 Havoc Pennington +- really remove nautilus-devel if we are going to obsolete it +- don't require hwbrowser + +* Sun May 26 2002 Tim Powers +- automated rebuild + +* Tue May 21 2002 Havoc Pennington +- rebuild in different environment + +* Tue May 21 2002 Havoc Pennington +- 1.1.17 + +* Fri May 3 2002 Havoc Pennington +- 1.1.14 + +* Thu Apr 25 2002 Havoc Pennington +- require eog +- obsolete nautilus-devel +- fix name of schemas file in post + +* Mon Apr 22 2002 Alex Larsson +- Update to 1.1.13 + +* Fri Apr 19 2002 Havoc Pennington +- put tree view in file list + +* Thu Apr 18 2002 Havoc Pennington +- nautilus for gnome 2 +- clean up the spec file and file list a bit + +* Mon Apr 15 2002 Havoc Pennington +- merge translations + +* Thu Apr 4 2002 Alex Larsson +- Add patch to fix trash crash + +* Mon Apr 1 2002 Havoc Pennington +- fix for metadata tmp race +- backport thumbnail speed fix and thumbnail inf. loop fix + +* Mon Mar 25 2002 Havoc Pennington +- add some fixes from CVS version, including one for #61819 and a couple segfaults + +* Wed Mar 20 2002 Havoc Pennington +- fix thumbnails for files with future timestamp, #56862 + +* Mon Mar 11 2002 Havoc Pennington +- buildrequires intltool #60633 +- apply Alex's pixbuf cache patch to save a few megs #60581 + +* Wed Feb 27 2002 Havoc Pennington +- drop Milan-specific features, including png10 and ac25 patches +- copy in 1.0.5 help component to avoid large risky patch +- remove .la files +- drop mozilla from ia64 again +- remove oaf file from nautilus-mozilla that was also in the base + package + +* Mon Jan 28 2002 Bill Nottingham +- enable mozilla support on ia64 + +* Fri Dec 28 2001 Christopher Blizzard +- require Mozilla 0.9.7 +- Add patch that puts mozilla profile startup before embedding is initialized + +* Tue Nov 20 2001 Havoc Pennington +- 1.0.6, require Mozilla 0.9.6 + +* Tue Oct 23 2001 Alex Larsson +- Update to 1.0.5 + +* Thu Sep 6 2001 Owen Taylor +- Fix handling of GnomeVFSFileInfo structure (#53315) + +* Wed Sep 5 2001 Owen Taylor +- Change handling of names on unmount to fix #52325 + +* Tue Sep 4 2001 Havoc Pennington +- put nautilus-help.desktop in file list; #53109 + +* Fri Aug 31 2001 Havoc Pennington +- Add po files from sources.redhat.com + +* Mon Aug 27 2001 Havoc Pennington +- Add po files from sources.redhat.com + +* Thu Aug 23 2001 Alex Larsson 1.0.4-38 +- Added patch to fix the .directory issuer + +* Thu Aug 23 2001 Havoc Pennington +- I screwed up the build yesterday, so it didn't actually contain the + fixes mentioned. This build should contain them. + +* Wed Aug 22 2001 Havoc Pennington +- fix bug causing 32000 stats or so in large directories, + should speed things up somewhat +- fix #52104 via gruesome kdesktop-detection hack and setting + window type hint on our desktop window +- fix so Start Here icon displays in sidebar +- don't load non-local .desktop files + +* Mon Aug 20 2001 Havoc Pennington +- make Programs icon into a link, to match the other .desktop files +- own various directories #51164 +- web page titles in Japanese, #51709 +- tree defaults to only directories #51850 + +* Wed Aug 15 2001 Havoc Pennington +- make start here icon work again +- kill some warning spew, #51661 +- cache getpwnam() results to speed things up a bit + +* Tue Aug 14 2001 Owen Taylor +- Fix problem with missing desktop starthere.desktop file +- New snapshot from our branch, fixes: + - On upgrade, icons migrated from GNOME desktop are not properly lined up + (#51436) + - icons dropped on the desktop don't end up where dropped. (#51441) + - Nautilus shouldn't have fam monitor read-only windows. This + keeps CDROMS from being unmounted until you close all + + nautilus windows pointing to them. (#51442) + - Warnings about 'cannot statfs...' when moving items to trash. +- Use separate start-here.desktop for panel, since the one used + for the root window only works from Nautilus. + +* Fri Aug 10 2001 Alexander Larsson +- Changed starthere .desktop files to be links instead +- of spawning a new nautilus. This makes start-here: +- much faster. + +* Thu Aug 9 2001 Alexander Larsson +- Added hwbrowser dependency +- New snapshot, fixes the mozilla-view submit form problem + +* Wed Aug 8 2001 Jonathan Blandford +- Rebuild with new xml-i18n-tools +- fix crash in creating new desktop files + +* Tue Aug 7 2001 Jonathan Blandford +- Fix up DnD code some more + +* Thu Aug 02 2001 Havoc Pennington +- Sync our CVS version; fixes some MUSTFIX + (the one about drawing background on startup, + properly translate desktop files, etc.) + +* Wed Aug 1 2001 Alexander Larsson 1.0.4-24 +- Fix 64bit cleanness issue +- Fix NULL mimetype crash +- Disable additional_text for .desktop files + +* Tue Jul 31 2001 Alexander Larsson 1.0.4-23 +- Fix unmounting devices. + +* Tue Jul 31 2001 Alexander Larsson 1.0.4-22 +- Make it depend on gnome-vfs-1.0.1-13. Needed for .desktop +- mimetype sniffing. + +* Mon Jul 30 2001 Alexander Larsson 1.0.4-21 +- Remove the "don't run as root" warning. +- Remove eazel from bookmarks +- langified (again? did someone change it?) + +* Fri Jul 27 2001 Alexander Larsson +- Apply a patch that makes nautilus dnd reset work with the latest +- eel release. + +* Thu Jul 26 2001 Alexander Larsson +- Build on ia64 without the mozilla component. + +* Wed Jul 25 2001 Havoc Pennington +- Fix crash-on-startup showstopper +- Fix can't-find-images bug (this one was only showing up + when built with debug symbols, since it was an uninitialized memory + read) + +* Tue Jul 24 2001 Havoc Pennington +- sync new tarball from our CVS branch, + fixes some drag-and-drop, changes URI scheme names, + etc. + +* Tue Jul 24 2001 Owen Taylor +- Add BuildRequires (#49539, 49537) +- Fix %%post, %%postun (#49720) +- Background efficiency improvements and hacks + +* Fri Jul 13 2001 Alexander Larsson +- Don't launch esd on each mouseover. + +* Wed Jul 11 2001 Havoc Pennington +- move first time druid patch into my "CVS outstanding" patch +- try to really remove Help/Feedback +- try to really fix Help/Community Support +- try again to get Start Here in the Go menu +- try again to get Start Here on the desktop +- don't show file sizes for .desktop files + +* Tue Jul 10 2001 Havoc Pennington +- add newline to ends of .desktop files that were missing them + +* Tue Jul 10 2001 Havoc Pennington +- update to my latest 'cvs diff -u' (adds default + Start Here link, displays .directory name in sidebar) +- include /etc/X11/* links (starthere, sysconfig, serverconfig) + +* Tue Jul 10 2001 Jonathan Blandford +- Patch to remove firsttime druid and flash + +* Mon Jul 09 2001 Havoc Pennington +- add hacks for displaying desktop files +- add hack to turn off the "unwriteable" emblem + +* Sun Jul 8 2001 Tim Powers +- added defattr to the files lists to be (-,root,root) +- languified + +* Sat Jul 7 2001 Alexander Larsson +- Need to run autoheader too. + +* Fri Jul 6 2001 Alexander Larsson +- Make the fam dependency a real runtime dependency +- by linking to libfam (nautilus-1.0.4-fam-lib.patch) +- Cleaned up specfile. + +* Fri Jul 6 2001 Alexander Larsson +- Change default background and rubberband color. +- Use the sidebar tabs from the default theme +- BuildDepend on fam-devel, depend on fam +- Disable the eazel update pages in the first-time druid. +- Remove the eazel logo from the first-time druid + +* Thu Jul 05 2001 Havoc Pennington +- 1.0.4, removes eazel services icon and wizard page +- Eazel logo is still in startup wizard for now, needs fixing + +* Tue Jul 03 2001 Havoc Pennington +- fix group (s/Desktop/Desktops/) #47134 +- remove ammonite dependency + +* Wed Jun 27 2001 Havoc Pennington +- add a different default theme +- clean up file list overspecificity a bit + +* Tue Jun 26 2001 Havoc Pennington +- move to a CVS snapshot of nautilus for now + (Darin is my hero for having distcheck work out of CVS) + +* Thu May 10 2001 Jonathan Blandford +- clean up defaults a bit + +* Wed May 9 2001 Jonathan Blandford +- New version + +* Tue Apr 17 2001 Gregory Leblanc +- Added BuildRequires lines +- Changed Source to point to ftp.gnome.org instead of just the tarball name +- Moved %%description sections closer to their %%package sections +- Moved %%changelog to the end, where so that it's not in the way +- Changed configure and make install options to allow moving of + libraries, includes, binaries more easily +- Removed hard-coded paths (don't define %%prefix or %%docdir) +- replace %%{prefix}/bin with %%{_bindir} +- replace %%{prefix}/share with %%{_datadir} +- replace %%{prefix}/lib with %%{_libdir} +- replace %%{prefix}/include with %%{_includedir} + +* Tue Oct 10 2000 Robin Slomkowski +- removed obsoletes from sub packages and added mozilla and trilobite +subpackages + +* Wed Apr 26 2000 Ramiro Estrugo +- created this thing